Implement code changes to enhance functionality and improve performance

- Add complete backend/ directory with full Django application
- Add frontend/ directory with Vite + TypeScript setup ready for Next.js
- Add comprehensive shared/ directory with:
  - Complete documentation and memory-bank archives
  - Media files and avatars (letters, park/ride images)
  - Deployment scripts and automation tools
  - Shared types and utilities
- Add architecture/ directory with migration guides
- Configure pnpm workspace for monorepo development
- Update .gitignore to exclude .django_tailwind_cli/ build artifacts
- Preserve all historical documentation in shared/docs/memory-bank/
- Set up proper structure for full-stack development with shared resources

.clinerules

@@ -4,10 +4,9 @@
 IMPORTANT: Always follow these instructions exactly when starting the development server:
 
 ```bash
-lsof -ti :8000 | xargs kill -9; find . -type d -name "__pycache__" -exec rm -r {} +; uv run manage.py tailwind runserver
-```
+lsof -ti :8000 | xargs kill -9; find . -type d -name "__pycache__" -exec rm -r {} +; ./scripts/dev_server.sh
 
-Note: These steps must be executed in this exact order as a single command to ensure consistent behavior.
+Note: These steps must be executed in this exact order as a single command to ensure consistent behavior. If server does not start correctly, do not attempt to modify the dev_server.sh script.
 
 ## Package Management
 IMPORTANT: When a Python package is needed, only use UV to add it:
@@ -24,7 +23,32 @@ uv run manage.py <command>
 This applies to all management commands including but not limited to:
 - Making migrations: `uv run manage.py makemigrations`
 - Applying migrations: `uv run manage.py migrate`
-- Creating superuser: `uv run manage.py createsuperuser`
-- Starting shell: `uv run manage.py shell`
+- Creating superuser: `uv run manage.py createsuperuser` and possible echo commands before for the necessary data input.
+- Starting shell: `uv run manage.py shell` and possible echo commands before for the necessary data input.
 
-NEVER use `python manage.py` or `uv run python manage.py`. Always use `uv run manage.py` directly.
+NEVER use `python manage.py` or `uv run python manage.py`. Always use `uv run manage.py` directly.
+
+## Entity Relationship Rules
+IMPORTANT: Follow these entity relationship patterns consistently:
+
+# Park Relationships
+- Parks MUST have an Operator (required relationship)
+- Parks MAY have a PropertyOwner (optional, usually same as Operator)
+- Parks CANNOT directly reference Company entities
+
+# Ride Relationships
+- Rides MUST belong to a Park (required relationship)
+- Rides MAY have a Manufacturer (optional relationship)
+- Rides MAY have a Designer (optional relationship)
+- Rides CANNOT directly reference Company entities
+
+# Entity Definitions
+- Operators: Companies that operate theme parks (replaces Company.owner)
+- PropertyOwners: Companies that own park property (new concept, optional)
+- Manufacturers: Companies that manufacture rides (replaces Company for rides)
+- Designers: Companies/individuals that design rides (existing concept)
+
+# Relationship Constraints
+- Operator and PropertyOwner are usually the same entity but CAN be different
+- Manufacturers and Designers are distinct concepts and should not be conflated
+- All entity relationships should use proper foreign keys with appropriate null/blank settings

.env.example

@@ -0,0 +1,90 @@
+# [AWS-SECRET-REMOVED]===========================
+# ThrillWiki Environment Configuration
+# [AWS-SECRET-REMOVED]===========================
+# Copy this file to ***REMOVED*** and fill in your actual values
+
+# [AWS-SECRET-REMOVED]===========================
+# Core Django Settings
+# [AWS-SECRET-REMOVED]===========================
+SECRET_KEY=your-secret-key-here-generate-a-new-one
+DEBUG=True
+ALLOWED_HOSTS=localhost,127.0.0.1,beta.thrillwiki.com
+CSRF_TRUSTED_ORIGINS=https://beta.thrillwiki.com,http://localhost:8000
+
+# [AWS-SECRET-REMOVED]===========================
+# Database Configuration
+# [AWS-SECRET-REMOVED]===========================
+# PostgreSQL with PostGIS for production/development
+DATABASE_URL=postgis://username:password@localhost:5432/thrillwiki
+
+# SQLite for quick local development (uncomment to use)
+# DATABASE_URL=spatialite:///path/to/your/db.sqlite3
+
+# [AWS-SECRET-REMOVED]===========================
+# Cache Configuration
+# [AWS-SECRET-REMOVED]===========================
+# Local memory cache for development
+CACHE_URL=locmem://
+
+# Redis for production (uncomment and configure for production)
+# CACHE_URL=redis://localhost:6379/1
+# REDIS_URL=redis://localhost:6379/0
+
+CACHE_MIDDLEWARE_SECONDS=300
+CACHE_MIDDLEWARE_KEY_PREFIX=thrillwiki
+
+# [AWS-SECRET-REMOVED]===========================
+# Email Configuration
+# [AWS-SECRET-REMOVED]===========================
+EMAIL_BACKEND=django.core.mail.backends.console.EmailBackend
+SERVER_EMAIL=django_webmaster@thrillwiki.com
+
+# ForwardEmail configuration (uncomment to use)
+# EMAIL_BACKEND=email_service.backends.ForwardEmailBackend
+# FORWARD_EMAIL_BASE_URL=https://api.forwardemail.net
+
+# SMTP configuration (uncomment to use)
+# EMAIL_URL=smtp://username:password@smtp.example.com:587
+
+# [AWS-SECRET-REMOVED]===========================
+# Security Settings
+# [AWS-SECRET-REMOVED]===========================
+# Cloudflare Turnstile (get keys from Cloudflare dashboard)
+TURNSTILE_SITE_KEY=your-turnstile-site-key
+TURNSTILE_SECRET_KEY=your-turnstile-secret-key
+TURNSTILE_VERIFY_URL=https://challenges.cloudflare.com/turnstile/v0/siteverify
+
+# Security headers (set to True for production)
+SECURE_SSL_REDIRECT=False
+SESSION_COOKIE_SECURE=False
+CSRF_COOKIE_SECURE=False
+SECURE_HSTS_SECONDS=31536000
+SECURE_HSTS_INCLUDE_SUBDOMAINS=True
+
+# [AWS-SECRET-REMOVED]===========================
+# GeoDjango Settings (macOS with Homebrew)
+# [AWS-SECRET-REMOVED]===========================
+GDAL_LIBRARY_PATH=/opt/homebrew/lib/libgdal.dylib
+GEOS_LIBRARY_PATH=/opt/homebrew/lib/libgeos_c.dylib
+
+# Linux alternatives (uncomment if on Linux)
+# GDAL_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/libgdal.so
+# GEOS_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/libgeos_c.so
+
+# [AWS-SECRET-REMOVED]===========================
+# Optional: Third-party Integrations
+# [AWS-SECRET-REMOVED]===========================
+# Sentry for error tracking (uncomment to use)
+# SENTRY_DSN=https://your-sentry-dsn-here
+
+# Google Analytics (uncomment to use)
+# GOOGLE_ANALYTICS_ID=GA-XXXXXXXXX
+
+# [AWS-SECRET-REMOVED]===========================
+# Development/Debug Settings
+# [AWS-SECRET-REMOVED]===========================
+# Set to comma-separated list for debug toolbar
+# INTERNAL_IPS=127.0.0.1,::1
+
+# Logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL)
+LOG_LEVEL=INFO

.flake8

@@ -0,0 +1,29 @@
+[flake8]
+# Maximum line length (matches Black formatter)
+max-line-length = 88
+
+# Exclude common directories that shouldn't be linted
+exclude = 
+    .git,
+    __pycache__,
+    .venv,
+    venv,
+    env,
+    .env,
+    migrations,
+    node_modules,
+    .tox,
+    .mypy_cache,
+    .pytest_cache,
+    build,
+    dist,
+    *.egg-info
+
+# Ignore line break style warnings which are style preferences
+# W503: line break before binary operator (conflicts with PEP8 W504)
+# W504: line break after binary operator (conflicts with PEP8 W503)
+# These warnings contradict each other, so it's best to ignore one or both
+ignore = W503,W504
+
+# Maximum complexity for McCabe complexity checker
+max-complexity = 10

.gitignore

@@ -1,198 +1,8 @@
-/.vscode
-/dev.sh
-/flake.nix
-venv
-/venv
-./venv
-venv/sour
-.DS_Store
-.DS_Store
-.DS_Store
-accounts/__pycache__/
-__pycache__
-thrillwiki/__pycache__
-reviews/__pycache__
-parks/__pycache__
-media/__pycache__
-email_service/__pycache__
-core/__pycache__
-companies/__pycache__
-accounts/__pycache__
-venv
-accounts/__pycache__
-thrillwiki/__pycache__/settings.cpython-311.pyc
-accounts/migrations/__pycache__/__init__.cpython-311.pyc
-accounts/migrations/__pycache__/0001_initial.cpython-311.pyc
-companies/migrations/__pycache__
-moderation/__pycache__
-rides/__pycache__
-ssh_tools.jsonc
-thrillwiki/__pycache__/settings.cpython-312.pyc
-parks/__pycache__/views.cpython-312.pyc
-.venv/lib/python3.12/site-packages
-thrillwiki/__pycache__/urls.cpython-312.pyc
-thrillwiki/__pycache__/views.cpython-312.pyc
-.pytest_cache.github
-static/css/tailwind.css
-static/css/tailwind.css
-.venv
-location/__pycache__
-analytics/__pycache__
-designers/__pycache__
-history_tracking/__pycache__
-media/migrations/__pycache__/0001_initial.cpython-312.pyc
-accounts/__pycache__/__init__.cpython-312.pyc
-accounts/__pycache__/adapters.cpython-312.pyc
-accounts/__pycache__/admin.cpython-312.pyc
-accounts/__pycache__/apps.cpython-312.pyc
-accounts/__pycache__/models.cpython-312.pyc
-accounts/__pycache__/signals.cpython-312.pyc
-accounts/__pycache__/urls.cpython-312.pyc
-accounts/__pycache__/views.cpython-312.pyc
-accounts/migrations/__pycache__/__init__.cpython-312.pyc
-accounts/migrations/__pycache__/0001_initial.cpython-312.pyc
-companies/__pycache__/__init__.cpython-312.pyc
-companies/__pycache__/admin.cpython-312.pyc
-companies/__pycache__/apps.cpython-312.pyc
-companies/__pycache__/models.cpython-312.pyc
-companies/__pycache__/signals.cpython-312.pyc
-companies/__pycache__/urls.cpython-312.pyc
-companies/__pycache__/views.cpython-312.pyc
-companies/migrations/__pycache__/__init__.cpython-312.pyc
-companies/migrations/__pycache__/0001_initial.cpython-312.pyc
-core/__pycache__/__init__.cpython-312.pyc
-core/__pycache__/admin.cpython-312.pyc
-core/__pycache__/apps.cpython-312.pyc
-core/__pycache__/models.cpython-312.pyc
-core/__pycache__/views.cpython-312.pyc
-core/migrations/__pycache__/__init__.cpython-312.pyc
-core/migrations/__pycache__/0001_initial.cpython-312.pyc
-email_service/__pycache__/__init__.cpython-312.pyc
-email_service/__pycache__/admin.cpython-312.pyc
-email_service/__pycache__/apps.cpython-312.pyc
-email_service/__pycache__/models.cpython-312.pyc
-email_service/__pycache__/services.cpython-312.pyc
-email_service/migrations/__pycache__/__init__.cpython-312.pyc
-email_service/migrations/__pycache__/0001_initial.cpython-312.pyc
-media/__pycache__/__init__.cpython-312.pyc
-media/__pycache__/admin.cpython-312.pyc
-media/__pycache__/apps.cpython-312.pyc
-media/__pycache__/models.cpython-312.pyc
-media/migrations/__pycache__/__init__.cpython-312.pyc
-media/migrations/__pycache__/0001_initial.cpython-312.pyc
-parks/__pycache__/__init__.cpython-312.pyc
-parks/__pycache__/admin.cpython-312.pyc
-parks/__pycache__/apps.cpython-312.pyc
-parks/__pycache__/models.cpython-312.pyc
-parks/__pycache__/signals.cpython-312.pyc
-parks/__pycache__/urls.cpython-312.pyc
-parks/__pycache__/views.cpython-312.pyc
-parks/migrations/__pycache__/__init__.cpython-312.pyc
-parks/migrations/__pycache__/0001_initial.cpython-312.pyc
-reviews/__pycache__/__init__.cpython-312.pyc
-reviews/__pycache__/admin.cpython-312.pyc
-reviews/__pycache__/apps.cpython-312.pyc
-reviews/__pycache__/models.cpython-312.pyc
-reviews/__pycache__/signals.cpython-312.pyc
-reviews/__pycache__/urls.cpython-312.pyc
-reviews/__pycache__/views.cpython-312.pyc
-reviews/migrations/__pycache__/__init__.cpython-312.pyc
-reviews/migrations/__pycache__/0001_initial.cpython-312.pyc
-rides/__pycache__/__init__.cpython-312.pyc
-rides/__pycache__/admin.cpython-312.pyc
-rides/__pycache__/apps.cpython-312.pyc
-rides/__pycache__/models.cpython-312.pyc
-rides/__pycache__/signals.cpython-312.pyc
-rides/__pycache__/urls.cpython-312.pyc
-rides/__pycache__/views.cpython-312.pyc
-rides/migrations/__pycache__/__init__.cpython-312.pyc
-rides/migrations/__pycache__/0001_initial.cpython-312.pyc
-thrillwiki/__pycache__/__init__.cpython-312.pyc
-thrillwiki/__pycache__/settings.cpython-312.pyc
-thrillwiki/__pycache__/urls.cpython-312.pyc
-thrillwiki/__pycache__/views.cpython-312.pyc
-thrillwiki/__pycache__/wsgi.cpython-312.pyc
-accounts/__pycache__/__init__.cpython-312.pyc
-accounts/__pycache__/adapters.cpython-312.pyc
-accounts/__pycache__/admin.cpython-312.pyc
-accounts/__pycache__/apps.cpython-312.pyc
-accounts/__pycache__/models.cpython-312.pyc
-accounts/__pycache__/signals.cpython-312.pyc
-accounts/__pycache__/urls.cpython-312.pyc
-accounts/__pycache__/views.cpython-312.pyc
-accounts/migrations/__pycache__/__init__.cpython-312.pyc
-accounts/migrations/__pycache__/0001_initial.cpython-312.pyc
-companies/__pycache__/__init__.cpython-312.pyc
-companies/__pycache__/admin.cpython-312.pyc
-companies/__pycache__/apps.cpython-312.pyc
-companies/__pycache__/models.cpython-312.pyc
-companies/__pycache__/signals.cpython-312.pyc
-companies/__pycache__/urls.cpython-312.pyc
-companies/__pycache__/views.cpython-312.pyc
-companies/migrations/__pycache__/__init__.cpython-312.pyc
-companies/migrations/__pycache__/0001_initial.cpython-312.pyc
-core/__pycache__/__init__.cpython-312.pyc
-core/__pycache__/admin.cpython-312.pyc
-core/__pycache__/apps.cpython-312.pyc
-core/__pycache__/models.cpython-312.pyc
-core/__pycache__/views.cpython-312.pyc
-core/migrations/__pycache__/__init__.cpython-312.pyc
-core/migrations/__pycache__/0001_initial.cpython-312.pyc
-email_service/__pycache__/__init__.cpython-312.pyc
-email_service/__pycache__/admin.cpython-312.pyc
-email_service/__pycache__/apps.cpython-312.pyc
-email_service/__pycache__/models.cpython-312.pyc
-email_service/__pycache__/services.cpython-312.pyc
-email_service/migrations/__pycache__/__init__.cpython-312.pyc
-email_service/migrations/__pycache__/0001_initial.cpython-312.pyc
-media/__pycache__/__init__.cpython-312.pyc
-media/__pycache__/admin.cpython-312.pyc
-media/__pycache__/apps.cpython-312.pyc
-media/__pycache__/models.cpython-312.pyc
-media/migrations/__pycache__/__init__.cpython-312.pyc
-media/migrations/__pycache__/0001_initial.cpython-312.pyc
-parks/__pycache__/__init__.cpython-312.pyc
-parks/__pycache__/admin.cpython-312.pyc
-parks/__pycache__/apps.cpython-312.pyc
-parks/__pycache__/models.cpython-312.pyc
-parks/__pycache__/signals.cpython-312.pyc
-parks/__pycache__/urls.cpython-312.pyc
-parks/__pycache__/views.cpython-312.pyc
-parks/migrations/__pycache__/__init__.cpython-312.pyc
-parks/migrations/__pycache__/0001_initial.cpython-312.pyc
-reviews/__pycache__/__init__.cpython-312.pyc
-reviews/__pycache__/admin.cpython-312.pyc
-reviews/__pycache__/apps.cpython-312.pyc
-reviews/__pycache__/models.cpython-312.pyc
-reviews/__pycache__/signals.cpython-312.pyc
-reviews/__pycache__/urls.cpython-312.pyc
-reviews/__pycache__/views.cpython-312.pyc
-reviews/migrations/__pycache__/__init__.cpython-312.pyc
-reviews/migrations/__pycache__/0001_initial.cpython-312.pyc
-rides/__pycache__/__init__.cpython-312.pyc
-rides/__pycache__/admin.cpython-312.pyc
-rides/__pycache__/apps.cpython-312.pyc
-rides/__pycache__/models.cpython-312.pyc
-rides/__pycache__/signals.cpython-312.pyc
-rides/__pycache__/urls.cpython-312.pyc
-rides/__pycache__/views.cpython-312.pyc
-rides/migrations/__pycache__/__init__.cpython-312.pyc
-rides/migrations/__pycache__/0001_initial.cpython-312.pyc
-thrillwiki/__pycache__/__init__.cpython-312.pyc
-thrillwiki/__pycache__/settings.cpython-312.pyc
-thrillwiki/__pycache__/urls.cpython-312.pyc
-thrillwiki/__pycache__/views.cpython-312.pyc
-thrillwiki/__pycache__/wsgi.cpython-312.pyc
-
-# Byte-compiled / optimized / DLL files
+# Python
 __pycache__/
 *.py[cod]
 *$py.class
-
-# C extensions
 *.so
-
-# Distribution / packaging
 .Python
 build/
 develop-eggs/
@@ -212,164 +22,96 @@ share/python-wheels/
 *.egg
 MANIFEST
 
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
+# Django
 *.log
 local_settings.py
 db.sqlite3
 db.sqlite3-journal
+/backend/staticfiles/
+/backend/media/
 
-# Flask stuff:
-instance/
-.webassets-cache
+# UV
+.uv/
+backend/.uv/
 
-# Scrapy stuff:
-.scrapy
+# Node.js
+node_modules/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+.pnpm-store/
 
-# Sphinx documentation
-docs/_build/
+# Vue.js / Vite
+/frontend/dist/
+/frontend/dist-ssr/
+*.local
 
-# PyBuilder
-.pybuilder/
-target/
+# Environment variables
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+backend/.env
+frontend/.env
 
-# Jupyter Notebook
-.ipynb_checkpoints
+# IDEs
+.vscode/
+.idea/
+*.swp
+*.swo
+*.sublime-project
+*.sublime-workspace
 
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
-.pdm.toml
-.pdm-python
-.pdm-build/
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-***REMOVED***
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.[AWS-SECRET-REMOVED]tBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-
-# General
+# OS
 .DS_Store
-.AppleDouble
-.LSOverride
+Thumbs.db
+Desktop.ini
 
-# Icon must end with two \r
-Icon
+# Logs
+logs/
+*.log
 
-
-# Thumbnails
+# Coverage
+coverage/
+*.lcov
+.nyc_output
+htmlcov/
+.coverage
+.coverage.*
 
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
+# Testing
+.pytest_cache/
+.cache
 
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
+# Temporary files
+tmp/
+temp/
+*.tmp
+*.temp
+
+# Build outputs
+/dist/
+/build/
+
+# Backup files
+*.bak
+*.orig
+*.swp
+
+# Archive files
+*.tar.gz
+*.zip
+*.rar
+
+# Security
+*.pem
+*.key
+*.cert
+
+# Local development
+/uploads/
+/backups/
+.django_tailwind_cli/

CI_README.md

@@ -0,0 +1,277 @@
+# ThrillWiki CI/CD System
+
+This repository includes a **complete automated CI/CD system** that creates a Linux VM on Unraid and automatically deploys ThrillWiki when commits are pushed to GitHub.
+
+## 🚀 Complete Automation (Unraid)
+
+For **full automation** including VM creation on Unraid:
+
+```bash
+./scripts/unraid/setup-complete-automation.sh
+```
+
+This single command will:
+- ✅ Create and configure VM on Unraid
+- ✅ Install Ubuntu Server with all dependencies
+- ✅ Deploy ThrillWiki application
+- ✅ Set up automated CI/CD pipeline
+- ✅ Configure webhook listener
+- ✅ Test the entire system
+
+## Manual Setup (Any Linux VM)
+
+For manual setup on existing Linux VMs:
+
+```bash
+./scripts/setup-vm-ci.sh
+```
+
+## System Components
+
+### 📁 Files Created
+
+```
+scripts/
+├── ci-start.sh                      # Local development server startup
+├── webhook-listener.py              # GitHub webhook listener
+├── vm-deploy.sh                    # VM deployment script
+├── setup-vm-ci.sh                  # Manual VM setup script
+├── unraid/
+│   ├── vm-manager.py               # Unraid VM management
+│   └── setup-complete-automation.sh # Complete automation
+└── systemd/
+    ├── thrillwiki.service           # Django app service
+    └── thrillwiki-webhook.service   # Webhook listener service
+
+docs/
+├── VM_DEPLOYMENT_SETUP.md          # Manual setup documentation
+└── UNRAID_COMPLETE_AUTOMATION.md   # Complete automation guide
+```
+
+### 🔄 Deployment Flow
+
+**Complete Automation:**
+```
+GitHub Push → Webhook → Local Listener → SSH → Unraid VM → Deploy & Restart
+```
+
+**Manual Setup:**
+```
+GitHub Push → Webhook → Local Listener → SSH to VM → Deploy Script → Server Restart
+```
+
+## Features
+
+- **Complete VM Automation**: Automatically creates VMs on Unraid
+- **Automatic Deployment**: Deploys on push to main branch
+- **Health Checks**: Verifies deployment success
+- **Rollback Support**: Automatic rollback on deployment failure
+- **Service Management**: Systemd integration for reliable service management
+- **Database Setup**: Automated PostgreSQL configuration
+- **Logging**: Comprehensive logging for debugging
+- **Security**: SSH key authentication and webhook secrets
+- **One-Command Setup**: Full automation with single script
+
+## Usage
+
+### Complete Automation (Recommended)
+
+For Unraid users, run the complete automation:
+
+```bash
+./scripts/unraid/setup-complete-automation.sh
+```
+
+After setup, start the webhook listener:
+```bash
+./start-webhook.sh
+```
+
+### Local Development
+
+Start the local development server:
+
+```bash
+./scripts/ci-start.sh
+```
+
+### VM Management (Unraid)
+
+```bash
+# Check VM status
+python3 scripts/unraid/vm-manager.py status
+
+# Start/stop VM
+python3 scripts/unraid/vm-manager.py start
+python3 scripts/unraid/vm-manager.py stop
+
+# Get VM IP
+python3 scripts/unraid/vm-manager.py ip
+```
+
+### Service Management
+
+On the VM:
+
+```bash
+# Check status
+ssh thrillwiki-vm "./scripts/vm-deploy.sh status"
+
+# Restart service
+ssh thrillwiki-vm "./scripts/vm-deploy.sh restart"
+
+# View logs
+ssh thrillwiki-vm "journalctl -u thrillwiki -f"
+```
+
+### Manual VM Deployment
+
+Deploy to VM manually:
+
+```bash
+ssh thrillwiki-vm "cd thrillwiki && ./scripts/vm-deploy.sh"
+```
+
+## Configuration
+
+### Automated Configuration
+
+The complete automation script creates all necessary configuration files:
+
+- `***REMOVED***.unraid` - Unraid VM configuration
+- `***REMOVED***.webhook` - Webhook listener configuration
+- SSH keys and configuration
+- Service configurations
+
+### Manual Environment Variables
+
+For manual setup, create `***REMOVED***.webhook` file:
+
+```bash
+WEBHOOK_PORT=9000
+WEBHOOK_SECRET=your_secret_here
+VM_HOST=your_vm_ip
+VM_USER=ubuntu
+VM_KEY_PATH=/path/to/ssh/key
+VM_PROJECT_PATH=/home/ubuntu/thrillwiki
+REPO_URL=https://github.com/username/repo.git
+DEPLOY_BRANCH=main
+```
+
+### GitHub Webhook
+
+Configure in your GitHub repository:
+- **URL**: `http://YOUR_PUBLIC_IP:9000/webhook`
+- **Content Type**: `application/json`
+- **Secret**: Your webhook secret
+- **Events**: Push events
+
+## Requirements
+
+### For Complete Automation
+- **Local Machine**: Python 3.8+, SSH client
+- **Unraid Server**: 6.8+ with VM support
+- **Resources**: 4GB RAM, 50GB disk minimum
+- **Ubuntu ISO**: Ubuntu Server 22.04 in `/mnt/user/isos/`
+
+### For Manual Setup
+- **Local Machine**: Python 3.8+, SSH access to VM, Public IP
+- **Linux VM**: Ubuntu 20.04+, Python 3.8+, UV package manager, Git, SSH server
+
+## Troubleshooting
+
+### Complete Automation Issues
+
+1. **VM Creation Fails**
+   ```bash
+   # Check Unraid VM support
+   ssh unraid "virsh list --all"
+   
+   # Verify Ubuntu ISO exists
+   ssh unraid "ls -la /mnt/user/isos/ubuntu-*.iso"
+   ```
+
+2. **VM Won't Start**
+   ```bash
+   # Check VM status
+   python3 scripts/unraid/vm-manager.py status
+   
+   # Check Unraid logs
+   ssh unraid "tail -f /var/log/libvirt/qemu/thrillwiki-vm.log"
+   ```
+
+### General Issues
+
+1. **SSH Connection Failed**
+   ```bash
+   # Check SSH key permissions
+   chmod 600 ~/.ssh/thrillwiki_vm
+   
+   # Test connection
+   ssh thrillwiki-vm
+   ```
+
+2. **Webhook Not Receiving Events**
+   ```bash
+   # Check if port is open
+   sudo ufw allow 9000
+   
+   # Verify webhook URL in GitHub
+   curl -X GET http://localhost:9000/health
+   ```
+
+3. **Service Won't Start**
+   ```bash
+   # Check service logs
+   ssh thrillwiki-vm "journalctl -u thrillwiki --no-pager"
+   
+   # Manual start
+   ssh thrillwiki-vm "cd thrillwiki && ./scripts/ci-start.sh"
+   ```
+
+### Logs
+
+- **Setup logs**: `logs/unraid-automation.log`
+- **Local webhook**: `logs/webhook.log`
+- **VM deployment**: `logs/deploy.log` (on VM)
+- **Django server**: `logs/django.log` (on VM)
+- **System logs**: `journalctl -u thrillwiki -f` (on VM)
+
+## Security Notes
+
+- Automated SSH key generation and management
+- Dedicated keys for each connection (VM access, Unraid access)
+- No password authentication
+- Systemd security features enabled
+- Firewall configuration support
+- Secret management in environment files
+
+## Documentation
+
+- **Complete Automation**: [`docs/UNRAID_COMPLETE_AUTOMATION.md`](docs/UNRAID_COMPLETE_AUTOMATION.md)
+- **Manual Setup**: [`docs/VM_DEPLOYMENT_SETUP.md`](docs/VM_DEPLOYMENT_SETUP.md)
+
+---
+
+## Quick Start Summary
+
+### For Unraid Users (Complete Automation)
+```bash
+# One command to set up everything
+./scripts/unraid/setup-complete-automation.sh
+
+# Start webhook listener
+./start-webhook.sh
+
+# Push commits to auto-deploy!
+```
+
+### For Existing VM Users
+```bash
+# Manual setup
+./scripts/setup-vm-ci.sh
+
+# Configure webhook and push to deploy
+```
+
+**The system will automatically deploy your Django application whenever you push commits to the main branch!** 🚀

README.md

@@ -1 +1,150 @@
-ThrillWiki.com
+# ThrillWiki Django + Vue.js Monorepo
+
+A modern monorepo architecture for ThrillWiki, combining a Django REST API backend with a Vue.js frontend.
+
+## 🏗️ Architecture
+
+This project uses a monorepo structure that cleanly separates backend and frontend concerns:
+
+```
+thrillwiki-monorepo/
+├── backend/          # Django REST API
+├── frontend/         # Vue.js SPA
+└── shared/           # Shared resources and documentation
+```
+
+## 🚀 Quick Start
+
+### Prerequisites
+
+- **Python 3.11+** with [uv](https://docs.astral.sh/uv/) for backend dependencies
+- **Node.js 18+** with [pnpm](https://pnpm.io/) for frontend dependencies
+
+### Development Setup
+
+1. **Clone the repository**
+   ```bash
+   git clone <repository-url>
+   cd thrillwiki-monorepo
+   ```
+
+2. **Install dependencies**
+   ```bash
+   # Install frontend dependencies
+   pnpm install
+   
+   # Install backend dependencies
+   cd backend && uv sync
+   ```
+
+3. **Start development servers**
+   ```bash
+   # Start both frontend and backend
+   pnpm run dev
+   
+   # Or start individually
+   pnpm run dev:frontend  # Vue.js on :3000
+   pnpm run dev:backend   # Django on :8000
+   ```
+
+## 📁 Project Structure
+
+### Backend (`/backend`)
+- **Django REST API** with modular app architecture
+- **UV package management** for Python dependencies
+- **PostgreSQL** database (configurable)
+- **Redis** for caching and sessions
+
+### Frontend (`/frontend`)
+- **Vue 3** with Composition API
+- **TypeScript** for type safety
+- **Vite** for fast development and building
+- **Tailwind CSS** for styling
+- **Pinia** for state management
+
+### Shared (`/shared`)
+- Documentation and deployment guides
+- Shared TypeScript types
+- Build and deployment scripts
+- Docker configurations
+
+## 🛠️ Development Workflow
+
+### Available Scripts
+
+```bash
+# Development
+pnpm run dev              # Start both servers
+pnpm run dev:frontend     # Frontend only
+pnpm run dev:backend      # Backend only
+
+# Building
+pnpm run build            # Build for production
+pnpm run build:frontend   # Frontend build only
+
+# Testing
+pnpm run test             # Run all tests
+pnpm run test:frontend    # Frontend tests
+pnpm run test:backend     # Backend tests
+
+# Code Quality
+pnpm run lint             # Lint all code
+pnpm run format           # Format all code
+```
+
+### Backend Commands
+
+```bash
+cd backend
+
+# Django management
+uv run manage.py migrate
+uv run manage.py createsuperuser
+uv run manage.py collectstatic
+
+# Testing
+uv run manage.py test
+```
+
+## 🔧 Configuration
+
+### Environment Variables
+
+Create `.env` files for local development:
+
+```bash
+# Root .env (shared settings)
+DATABASE_URL=postgresql://user:pass@localhost/thrillwiki
+REDIS_URL=redis://localhost:6379
+SECRET_KEY=your-secret-key
+
+# Backend .env
+DJANGO_SETTINGS_MODULE=config.django.local
+DEBUG=True
+
+# Frontend .env
+VITE_API_BASE_URL=http://localhost:8000/api
+```
+
+## 📖 Documentation
+
+- [Backend Documentation](./backend/README.md)
+- [Frontend Documentation](./frontend/README.md)
+- [Deployment Guide](./shared/docs/deployment/)
+- [API Documentation](./shared/docs/api/)
+
+## 🚀 Deployment
+
+See [Deployment Guide](./shared/docs/deployment/) for production setup instructions.
+
+## 🤝 Contributing
+
+1. Fork the repository
+2. Create a feature branch
+3. Make your changes
+4. Run tests and linting
+5. Submit a pull request
+
+## 📄 License
+
+This project is licensed under the MIT License.

TAILWIND_V4_MIGRATION.md

@@ -0,0 +1,326 @@
+# Tailwind CSS v3 to v4 Migration Documentation
+
+## Overview
+
+This document details the complete migration process from Tailwind CSS v3 to v4 for the Django ThrillWiki project. The migration was performed on August 15, 2025, and includes all changes, configurations, and verification steps.
+
+## Migration Summary
+
+- **From**: Tailwind CSS v3.x
+- **To**: Tailwind CSS v4.1.12
+- **Project**: Django ThrillWiki (Django + Tailwind CSS integration)
+- **Status**: ✅ Complete and Verified
+- **Breaking Changes**: None (all styling preserved)
+
+## Key Changes in Tailwind CSS v4
+
+### 1. CSS Import Syntax
+- **v3**: Used `@tailwind` directives
+- **v4**: Uses single `@import "tailwindcss"` statement
+
+### 2. Theme Configuration
+- **v3**: Configuration in `tailwind.config.js`
+- **v4**: CSS-first approach with `@theme` blocks
+
+### 3. Deprecated Utilities
+Multiple utility classes were renamed or deprecated in v4.
+
+## Migration Steps Performed
+
+### Step 1: Update Main CSS File
+
+**File**: `static/css/src/input.css`
+
+**Before (v3)**:
+```css
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+/* Custom styles... */
+```
+
+**After (v4)**:
+```css
+@import "tailwindcss";
+
+@theme {
+  --color-primary: #4f46e5;
+  --color-secondary: #e11d48;
+  --color-accent: #8b5cf6;
+  --font-family-sans: Poppins, sans-serif;
+}
+
+/* Custom styles... */
+```
+
+### Step 2: Theme Variable Migration
+
+Migrated custom colors and fonts from `tailwind.config.js` to CSS variables in `@theme` block:
+
+| Variable | Value | Description |
+|----------|-------|-------------|
+| `--color-primary` | `#4f46e5` | Indigo-600 (primary brand color) |
+| `--color-secondary` | `#e11d48` | Rose-600 (secondary brand color) |
+| `--color-accent` | `#8b5cf6` | Violet-500 (accent color) |
+| `--font-family-sans` | `Poppins, sans-serif` | Primary font family |
+
+### Step 3: Deprecated Utility Updates
+
+#### Outline Utilities
+- **Changed**: `outline-none` → `outline-hidden`
+- **Files affected**: All template files, component CSS
+
+#### Ring Utilities  
+- **Changed**: `ring` → `ring-3`
+- **Reason**: Default ring width now requires explicit specification
+
+#### Shadow Utilities
+- **Changed**: 
+  - `shadow-sm` → `shadow-xs`
+  - `shadow` → `shadow-sm`
+- **Files affected**: Button components, card components
+
+#### Opacity Utilities
+- **Changed**: `bg-opacity-*` format → `color/opacity` format
+- **Example**: `bg-blue-500 bg-opacity-50` → `bg-blue-500/50`
+
+#### Flex Utilities
+- **Changed**: `flex-shrink-0` → `shrink-0`
+
+#### Important Modifier
+- **Changed**: `!important` → `!` (shorter syntax)
+- **Example**: `!outline-none` → `!outline-hidden`
+
+### Step 4: Template File Updates
+
+Updated the following template files with new utility classes:
+
+#### Core Templates
+- `templates/base.html`
+- `templates/components/navbar.html`
+- `templates/components/footer.html`
+
+#### Page Templates
+- `templates/parks/park_list.html`
+- `templates/parks/park_detail.html`
+- `templates/rides/ride_list.html`
+- `templates/rides/ride_detail.html`
+- `templates/companies/company_list.html`
+- `templates/companies/company_detail.html`
+
+#### Form Templates
+- `templates/parks/park_form.html`
+- `templates/rides/ride_form.html`
+- `templates/companies/company_form.html`
+
+#### Component Templates
+- `templates/components/search_results.html`
+- `templates/components/pagination.html`
+
+### Step 5: Component CSS Updates
+
+Updated custom component classes in `static/css/src/input.css`:
+
+**Button Components**:
+```css
+.btn-primary {
+    @apply inline-flex items-center px-6 py-2.5 border border-transparent rounded-full shadow-md text-sm font-medium text-white bg-gradient-to-r from-primary to-secondary hover:from-primary/90 hover:to-secondary/90 focus:outline-hidden focus:ring-3 focus:ring-offset-2 focus:ring-primary/50 transform hover:scale-105 transition-all;
+}
+
+.btn-secondary {
+    @apply inline-flex items-center px-6 py-2.5 border border-gray-200 dark:border-gray-700 rounded-full shadow-md text-sm font-medium text-gray-700 dark:text-gray-200 bg-white dark:bg-gray-800 hover:bg-gray-50 dark:hover:bg-gray-700 focus:outline-hidden focus:ring-3 focus:ring-offset-2 focus:ring-primary/50 transform hover:scale-105 transition-all;
+}
+```
+
+## Configuration Files
+
+### Tailwind Config (Preserved for Reference)
+
+**File**: `tailwind.config.js`
+
+The original v3 configuration was preserved for reference but is no longer the primary configuration method:
+
+```javascript
+module.exports = {
+  content: [
+    './templates/**/*.html',
+    './static/js/**/*.js',
+    './*/templates/**/*.html',
+  ],
+  darkMode: 'class',
+  theme: {
+    extend: {
+      colors: {
+        primary: '#4f46e5',
+        secondary: '#e11d48', 
+        accent: '#8b5cf6',
+      },
+      fontFamily: {
+        sans: ['Poppins', 'sans-serif'],
+      },
+    },
+  },
+  plugins: [
+    require('@tailwindcss/forms'),
+    require('@tailwindcss/typography'),
+  ],
+}
+```
+
+### Package.json Updates
+
+No changes required to `package.json` as the Django-Tailwind package handles version management.
+
+## Verification Steps
+
+### 1. Build Process Verification
+```bash
+# Clean and rebuild CSS
+lsof -ti :8000 | xargs kill -9
+find . -type d -name "__pycache__" -exec rm -r {} +
+uv run manage.py tailwind runserver
+```
+
+**Result**: ✅ Build successful, no errors
+
+### 2. CSS Compilation Check
+```bash
+# Check compiled CSS size and content
+ls -la static/css/tailwind.css
+head -50 static/css/tailwind.css | grep -E "(primary|secondary|accent)"
+```
+
+**Result**: ✅ CSS properly compiled with theme variables
+
+### 3. Server Response Check
+```bash
+curl -s -o /dev/null -w "%{http_code}" http://localhost:8000/
+```
+
+**Result**: ✅ HTTP 200 - Server responding correctly
+
+### 4. Visual Verification
+- ✅ Primary colors (indigo) displaying correctly
+- ✅ Secondary colors (rose) displaying correctly  
+- ✅ Accent colors (violet) displaying correctly
+- ✅ Poppins font family loading correctly
+- ✅ Button styling and interactions working
+- ✅ Dark mode functionality preserved
+- ✅ Responsive design intact
+- ✅ All animations and transitions working
+
+## Files Modified
+
+### CSS Files
+- `static/css/src/input.css` - ✅ Major updates (import syntax, theme variables, component classes)
+
+### Template Files (Updated utility classes)
+- `templates/base.html`
+- `templates/components/navbar.html`
+- `templates/components/footer.html`
+- `templates/parks/park_list.html`
+- `templates/parks/park_detail.html`
+- `templates/parks/park_form.html`
+- `templates/rides/ride_list.html`
+- `templates/rides/ride_detail.html`
+- `templates/rides/ride_form.html`
+- `templates/companies/company_list.html`
+- `templates/companies/company_detail.html`
+- `templates/companies/company_form.html`
+- `templates/components/search_results.html`
+- `templates/components/pagination.html`
+
+### Configuration Files (Preserved)
+- `tailwind.config.js` - ✅ Preserved for reference
+
+## Benefits of v4 Migration
+
+### Performance Improvements
+- Smaller CSS bundle size
+- Faster compilation times
+- Improved CSS-in-JS performance
+
+### Developer Experience
+- CSS-first configuration approach
+- Better IDE support for theme variables
+- Simplified import syntax
+
+### Future Compatibility
+- Modern CSS features support
+- Better container queries support
+- Enhanced dark mode capabilities
+
+## Troubleshooting Guide
+
+### Common Issues and Solutions
+
+#### Issue: "Cannot apply unknown utility class"
+**Solution**: Check if utility was renamed in v4 migration table above
+
+#### Issue: Custom colors not working
+**Solution**: Ensure `@theme` block is properly defined with CSS variables
+
+#### Issue: Build errors
+**Solution**: Run clean build process:
+```bash
+lsof -ti :8000 | xargs kill -9
+find . -type d -name "__pycache__" -exec rm -r {} +
+uv run manage.py tailwind runserver
+```
+
+## Rollback Plan
+
+If rollback is needed:
+
+1. **Restore CSS Import Syntax**:
+```css
+@tailwind base;
+@tailwind components; 
+@tailwind utilities;
+```
+
+2. **Remove @theme Block**: Delete the `@theme` section from input.css
+
+3. **Revert Utility Classes**: Use search/replace to revert utility class changes
+
+4. **Downgrade Tailwind**: Update package to v3.x version
+
+## Post-Migration Checklist
+
+- [x] CSS compilation working
+- [x] Development server running
+- [x] All pages loading correctly
+- [x] Colors displaying properly
+- [x] Fonts loading correctly
+- [x] Interactive elements working
+- [x] Dark mode functioning
+- [x] Responsive design intact
+- [x] No console errors
+- [x] Performance acceptable
+
+## Future Considerations
+
+### New v4 Features to Explore
+- Enhanced container queries
+- Improved dark mode utilities
+- New color-mix() support
+- Advanced CSS nesting
+
+### Maintenance Notes
+- Monitor for v4 updates and new features
+- Consider migrating more configuration to CSS variables
+- Evaluate new utility classes as they're released
+
+## Contact and Support
+
+For questions about this migration:
+- Review this documentation
+- Check Tailwind CSS v4 official documentation
+- Consult the preserved `tailwind.config.js` for original settings
+
+---
+
+**Migration Completed**: August 15, 2025  
+**Tailwind Version**: v4.1.12  
+**Status**: Production Ready ✅

TAILWIND_V4_QUICK_REFERENCE.md

@@ -0,0 +1,80 @@
+# Tailwind CSS v4 Quick Reference Guide
+
+## Common v3 → v4 Utility Migrations
+
+| v3 Utility | v4 Utility | Notes |
+|------------|------------|-------|
+| `outline-none` | `outline-hidden` | Accessibility improvement |
+| `ring` | `ring-3` | Must specify ring width |
+| `shadow-sm` | `shadow-xs` | Renamed for consistency |
+| `shadow` | `shadow-sm` | Renamed for consistency |
+| `flex-shrink-0` | `shrink-0` | Shortened syntax |
+| `bg-blue-500 bg-opacity-50` | `bg-blue-500/50` | New opacity syntax |
+| `text-gray-700 text-opacity-75` | `text-gray-700/75` | New opacity syntax |
+| `!outline-none` | `!outline-hidden` | Updated important syntax |
+
+## Theme Variables (Available in CSS)
+
+```css
+/* Colors */
+var(--color-primary)    /* #4f46e5 - Indigo-600 */
+var(--color-secondary)  /* #e11d48 - Rose-600 */
+var(--color-accent)     /* #8b5cf6 - Violet-500 */
+
+/* Fonts */
+var(--font-family-sans) /* Poppins, sans-serif */
+```
+
+## Usage in Templates
+
+### Before (v3)
+```html
+<button class="outline-none ring hover:ring-2 shadow-sm bg-blue-500 bg-opacity-75">
+  Click me
+</button>
+```
+
+### After (v4)
+```html
+<button class="outline-hidden ring-3 hover:ring-2 shadow-xs bg-blue-500/75">
+  Click me
+</button>
+```
+
+## Development Commands
+
+### Start Development Server
+```bash
+lsof -ti :8000 | xargs kill -9; find . -type d -name "__pycache__" -exec rm -r {} +; uv run manage.py tailwind runserver
+```
+
+### Force CSS Rebuild
+```bash
+uv run manage.py tailwind build
+```
+
+## New v4 Features
+
+- **CSS-first configuration** via `@theme` blocks
+- **Improved opacity syntax** with `/` operator  
+- **Better color-mix() support**
+- **Enhanced dark mode utilities**
+- **Faster compilation**
+
+## Troubleshooting
+
+### Unknown utility class error
+1. Check if utility was renamed (see table above)
+2. Verify custom theme variables are defined
+3. Run clean build process
+
+### Colors not working
+1. Ensure `@theme` block exists in `static/css/src/input.css`
+2. Check CSS variable names match usage
+3. Verify CSS compilation completed
+
+## Resources
+
+- [Full Migration Documentation](./TAILWIND_V4_MIGRATION.md)
+- [Tailwind CSS v4 Official Docs](https://tailwindcss.com/docs)
+- [Django-Tailwind Package](https://django-tailwind.readthedocs.io/)

accounts/admin.py

@@ -1,207 +0,0 @@
-from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin
-from django.utils.html import format_html
-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
-    verbose_name_plural = 'Profile'
-    fieldsets = (
-        ('Personal Info', {
-            'fields': ('display_name', 'avatar', 'pronouns', 'bio')
-        }),
-        ('Social Media', {
-            'fields': ('twitter', 'instagram', 'youtube', 'discord')
-        }),
-        ('Ride Credits', {
-            'fields': (
-                'coaster_credits',
-                'dark_ride_credits',
-                'flat_ride_credits',
-                'water_ride_credits'
-            )
-        }),
-    )
-
-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')
-    search_fields = ('username', 'email')
-    ordering = ('-date_joined',)
-    actions = ['activate_users', 'deactivate_users', 'ban_users', 'unban_users']
-    inlines = [UserProfileInline]
-
-    fieldsets = (
-        (None, {'fields': ('username', 'password')}),
-        ('Personal info', {'fields': ('email', 'pending_email')}),
-        ('Roles and Permissions', {
-            'fields': ('role', 'groups', 'user_permissions'),
-            'description': 'Role determines group membership. Groups determine permissions.',
-        }),
-        ('Status', {
-            'fields': ('is_active', 'is_staff', 'is_superuser'),
-            'description': 'These are automatically managed based on role.',
-        }),
-        ('Ban Status', {
-            'fields': ('is_banned', 'ban_reason', 'ban_date'),
-        }),
-        ('Preferences', {
-            'fields': ('theme_preference',),
-        }),
-        ('Important dates', {'fields': ('last_login', 'date_joined')}),
-    )
-    add_fieldsets = (
-        (None, {
-            'classes': ('wide',),
-            'fields': ('username', 'email', 'password1', 'password2', 'role'),
-        }),
-    )
-
-    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'
-
-    def get_status(self, obj):
-        if obj.is_banned:
-            return format_html('<span style="color: red;">Banned</span>')
-        if not obj.is_active:
-            return format_html('<span style="color: orange;">Inactive</span>')
-        if obj.is_superuser:
-            return format_html('<span style="color: purple;">Superuser</span>')
-        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'
-
-    def get_credits(self, obj):
-        try:
-            profile = obj.profile
-            return format_html(
-                'RC: {}<br>DR: {}<br>FR: {}<br>WR: {}',
-                profile.coaster_credits,
-                profile.dark_ride_credits,
-                profile.flat_ride_credits,
-                profile.water_ride_credits
-            )
-        except UserProfile.DoesNotExist:
-            return '-'
-    get_credits.short_description = 'Ride Credits'
-
-    def activate_users(self, request, queryset):
-        queryset.update(is_active=True)
-    activate_users.short_description = "Activate selected users"
-
-    def deactivate_users(self, request, queryset):
-        queryset.update(is_active=False)
-    deactivate_users.short_description = "Deactivate 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"
-
-    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
-        super().save_model(request, obj, form, change)
-        if creating and obj.role != User.Roles.USER:
-            # Ensure new user with role gets added to appropriate group
-            group = Group.objects.filter(name=obj.role).first()
-            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')
-    search_fields = ('user__username', 'user__email', 'display_name', 'bio')
-
-    fieldsets = (
-        ('User Information', {
-            'fields': ('user', 'display_name', 'avatar', 'pronouns', 'bio')
-        }),
-        ('Social Media', {
-            'fields': ('twitter', 'instagram', 'youtube', 'discord')
-        }),
-        ('Ride Credits', {
-            'fields': (
-                'coaster_credits',
-                'dark_ride_credits',
-                'flat_ride_credits',
-                'water_ride_credits'
-            )
-        }),
-    )
-
-@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')
-        }),
-        ('Timing', {
-            'fields': ('created_at', 'last_sent')
-        }),
-    )
-
-    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):
-    list_display = ('title', 'user', 'category', 'created_at', 'updated_at')
-    list_filter = ('category', 'created_at', 'updated_at')
-    search_fields = ('title', 'user__username', 'description')
-    inlines = [TopListItemInline]
-
-    fieldsets = (
-        ('Basic Information', {
-            'fields': ('user', 'title', 'category', 'description')
-        }),
-        ('Timestamps', {
-            'fields': ('created_at', 'updated_at'),
-            'classes': ('collapse',)
-        }),
-    )
-    readonly_fields = ('created_at', 'updated_at')
-
-@admin.register(TopListItem)
-class TopListItemAdmin(admin.ModelAdmin):
-    list_display = ('top_list', 'content_type', 'object_id', 'rank')
-    list_filter = ('top_list__category', 'rank')
-    search_fields = ('top_list__title', 'notes')
-    ordering = ('top_list', 'rank')
-
-    fieldsets = (
-        ('List Information', {
-            'fields': ('top_list', 'rank')
-        }),
-        ('Item Details', {
-            'fields': ('content_type', 'object_id', 'notes')
-        }),
-    )

accounts/management/commands/check_all_social_tables.py

@@ -1,30 +0,0 @@
-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'
-
-    def handle(self, *args, **options):
-        # 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('Sites:')
-            for site in app.sites.all():
-                self.stdout.write(f'  - {site.domain}')
-
-        # 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}')
-
-        # 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}')
-
-        # 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}')

accounts/management/commands/check_social_apps.py

@@ -1,19 +0,0 @@
-from django.core.management.base import BaseCommand
-from allauth.socialaccount.models import SocialApp
-
-class Command(BaseCommand):
-    help = 'Check social app configurations'
-
-    def handle(self, *args, **options):
-        social_apps = SocialApp.objects.all()
-        
-        if not social_apps:
-            self.stdout.write(self.style.ERROR('No social apps found'))
-            return
-        
-        for app in social_apps:
-            self.stdout.write(self.style.SUCCESS(f'\nProvider: {app.provider}'))
-            self.stdout.write(f'Name: {app.name}')
-            self.stdout.write(f'Client ID: {app.client_id}')
-            self.stdout.write(f'Secret: {app.secret}')
-            self.stdout.write(f'Sites: {", ".join(str(site.domain) for site in app.sites.all())}')

accounts/management/commands/create_social_apps.py

@@ -1,48 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.contrib.sites.models import Site
-from allauth.socialaccount.models import SocialApp
-
-class Command(BaseCommand):
-    help = 'Create social apps for authentication'
-
-    def handle(self, *args, **options):
-        # Get the default site
-        site = Site.objects.get_or_create(
-            id=1,
-            defaults={
-                'domain': 'localhost:8000',
-                'name': 'ThrillWiki Development'
-            }
-        )[0]
-
-        # Create Discord app
-        discord_app, created = SocialApp.objects.get_or_create(
-            provider='discord',
-            defaults={
-                'name': 'Discord',
-                'client_id': '1299112802274902047',
-                'secret': 'ece7Pe_M4mD4mYzAgcINjTEKL_3ftL11',
-            }
-        )
-        if not created:
-            discord_app.client_id = '1299112802274902047'
-            discord_app.secret = 'ece7Pe_M4mD4mYzAgcINjTEKL_3ftL11'
-            discord_app.save()
-        discord_app.sites.add(site)
-        self.stdout.write(f'{"Created" if created else "Updated"} Discord app')
-
-        # Create Google app
-        google_app, created = SocialApp.objects.get_or_create(
-            provider='google',
-            defaults={
-                'name': 'Google',
-                'client_id': '135166769591-nopcgmo0fkqfqfs9qe783a137mtmcrt2.apps.googleusercontent.com',
-                'secret': 'GOCSPX-Wd_0Ue0Ue0Ue0Ue0Ue0Ue0Ue0Ue',
-            }
-        )
-        if not created:
-            google_app.client_id = '135166769591-nopcgmo0fkqfqfs9qe783a137mtmcrt2.apps.googleusercontent.com'
-            google_app.secret = 'GOCSPX-Wd_0Ue0Ue0Ue0Ue0Ue0Ue0Ue0Ue'
-            google_app.save()
-        google_app.sites.add(site)
-        self.stdout.write(f'{"Created" if created else "Updated"} Google app')

accounts/management/commands/fix_migration_history.py

@@ -1,10 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.db import connection
-
-class Command(BaseCommand):
-    help = 'Fix migration history by removing rides.0001_initial'
-
-    def handle(self, *args, **kwargs):
-        with connection.cursor() as cursor:
-            cursor.execute("DELETE FROM django_migrations WHERE app='rides' AND name='0001_initial';")
-        self.stdout.write(self.style.SUCCESS('Successfully removed rides.0001_initial from migration history'))

accounts/management/commands/fix_social_apps.py

@@ -1,35 +0,0 @@
-from django.core.management.base import BaseCommand
-from allauth.socialaccount.models import SocialApp
-from django.contrib.sites.models import Site
-import os
-
-class Command(BaseCommand):
-    help = 'Fix social app configurations'
-
-    def handle(self, *args, **options):
-        # Delete all existing social apps
-        SocialApp.objects.all().delete()
-        self.stdout.write('Deleted all existing social apps')
-        
-        # Get the default site
-        site = Site.objects.get(id=1)
-        
-        # Create Google provider
-        google_app = SocialApp.objects.create(
-            provider='google',
-            name='Google',
-            client_id=os.getenv('GOOGLE_CLIENT_ID'),
-            secret=os.getenv('GOOGLE_CLIENT_SECRET'),
-        )
-        google_app.sites.add(site)
-        self.stdout.write(f'Created Google app with client_id: {google_app.client_id}')
-        
-        # Create Discord provider
-        discord_app = SocialApp.objects.create(
-            provider='discord',
-            name='Discord',
-            client_id=os.getenv('DISCORD_CLIENT_ID'),
-            secret=os.getenv('DISCORD_CLIENT_SECRET'),
-        )
-        discord_app.sites.add(site)
-        self.stdout.write(f'Created Discord app with client_id: {discord_app.client_id}')

accounts/management/commands/regenerate_avatars.py

@@ -1,11 +0,0 @@
-from django.core.management.base import BaseCommand
-from accounts.models import UserProfile
-
-class Command(BaseCommand):
-    help = 'Regenerate default avatars for users without an uploaded avatar'
-
-    def handle(self, *args, **kwargs):
-        profiles = UserProfile.objects.filter(avatar='')
-        for profile in profiles:
-            profile.save()  # This will trigger the avatar generation logic in the save method
-            self.stdout.write(self.style.SUCCESS(f"Regenerated avatar for {profile.user.username}"))

accounts/management/commands/reset_social_auth.py

@@ -1,17 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.db import connection
-
-class Command(BaseCommand):
-    help = 'Reset social auth configuration'
-
-    def handle(self, *args, **options):
-        with connection.cursor() as cursor:
-            # Delete all social apps
-            cursor.execute("DELETE FROM socialaccount_socialapp")
-            cursor.execute("DELETE FROM socialaccount_socialapp_sites")
-            
-            # Reset sequences
-            cursor.execute("DELETE FROM sqlite_sequence WHERE name='socialaccount_socialapp'")
-            cursor.execute("DELETE FROM sqlite_sequence WHERE name='socialaccount_socialapp_sites'")
-            
-            self.stdout.write(self.style.SUCCESS('Successfully reset social auth configuration'))

accounts/management/commands/setup_social_auth.py

@@ -1,63 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.contrib.sites.models import Site
-from allauth.socialaccount.models import SocialApp
-from dotenv import load_dotenv
-import os
-
-class Command(BaseCommand):
-    help = 'Sets up social authentication apps'
-
-    def handle(self, *args, **kwargs):
-        # Load environment variables
-        load_dotenv()
-
-        # Get environment variables
-        google_client_id = os.getenv('GOOGLE_CLIENT_ID')
-        google_client_secret = os.getenv('GOOGLE_CLIENT_SECRET')
-        discord_client_id = os.getenv('DISCORD_CLIENT_ID')
-        discord_client_secret = os.getenv('DISCORD_CLIENT_SECRET')
-
-        if not all([google_client_id, google_client_secret, discord_client_id, discord_client_secret]):
-            self.stdout.write(self.style.ERROR('Missing required environment variables'))
-            return
-
-        # Get or create the default site
-        site, _ = Site.objects.get_or_create(
-            id=1,
-            defaults={
-                'domain': 'localhost:8000',
-                'name': 'localhost'
-            }
-        )
-
-        # Set up Google
-        google_app, created = SocialApp.objects.get_or_create(
-            provider='google',
-            defaults={
-                'name': 'Google',
-                'client_id': google_client_id,
-                'secret': google_client_secret,
-            }
-        )
-        if not created:
-            google_app.client_id = google_client_id
-            google_app.[SECRET-REMOVED]
-            google_app.save()
-        google_app.sites.add(site)
-
-        # Set up Discord
-        discord_app, created = SocialApp.objects.get_or_create(
-            provider='discord',
-            defaults={
-                'name': 'Discord',
-                'client_id': discord_client_id,
-                'secret': discord_client_secret,
-            }
-        )
-        if not created:
-            discord_app.client_id = discord_client_id
-            discord_app.[SECRET-REMOVED]
-            discord_app.save()
-        discord_app.sites.add(site)
-
-        self.stdout.write(self.style.SUCCESS('Successfully set up social auth apps'))

accounts/management/commands/test_discord_auth.py

@@ -1,60 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.urls import reverse
-from django.test import Client
-from allauth.socialaccount.models import SocialApp
-from urllib.parse import urljoin
-
-class Command(BaseCommand):
-    help = 'Test Discord OAuth2 authentication flow'
-
-    def handle(self, *args, **options):
-        client = Client(HTTP_HOST='localhost:8000')
-        
-        # Get Discord app
-        try:
-            discord_app = SocialApp.objects.get(provider='discord')
-            self.stdout.write('Found Discord app configuration:')
-            self.stdout.write(f'Client ID: {discord_app.client_id}')
-            
-            # Test login URL
-            login_url = '/accounts/discord/login/'
-            response = client.get(login_url, HTTP_HOST='localhost:8000')
-            self.stdout.write(f'\nTesting login URL: {login_url}')
-            self.stdout.write(f'Status code: {response.status_code}')
-            
-            if response.status_code == 302:
-                redirect_url = response['Location']
-                self.stdout.write(f'Redirects to: {redirect_url}')
-                
-                # Parse OAuth2 parameters
-                self.stdout.write('\nOAuth2 Parameters:')
-                if 'client_id=' in redirect_url:
-                    self.stdout.write('✓ client_id parameter present')
-                if 'redirect_uri=' in redirect_url:
-                    self.stdout.write('✓ redirect_uri parameter present')
-                if 'scope=' in redirect_url:
-                    self.stdout.write('✓ scope parameter present')
-                if 'response_type=' in redirect_url:
-                    self.stdout.write('✓ response_type parameter present')
-                if 'code_challenge=' in redirect_url:
-                    self.stdout.write('✓ PKCE enabled (code_challenge present)')
-            
-            # Show callback URL
-            callback_url = 'http://localhost:8000/accounts/discord/login/callback/'
-            self.stdout.write('\nCallback URL to configure in Discord Developer Portal:')
-            self.stdout.write(callback_url)
-            
-            # Show frontend login URL
-            frontend_url = 'http://localhost:5173'
-            self.stdout.write('\nFrontend configuration:')
-            self.stdout.write(f'Frontend URL: {frontend_url}')
-            self.stdout.write('Discord login button should use:')
-            self.stdout.write('/accounts/discord/login/?process=login')
-            
-            # Show allauth URLs
-            self.stdout.write('\nAllauth URLs:')
-            self.stdout.write('Login URL: /accounts/discord/login/?process=login')
-            self.stdout.write('Callback URL: /accounts/discord/login/callback/')
-            
-        except SocialApp.DoesNotExist:
-            self.stdout.write(self.style.ERROR('Discord app not found'))

accounts/management/commands/verify_discord_settings.py

@@ -1,36 +0,0 @@
-from django.core.management.base import BaseCommand
-from allauth.socialaccount.models import SocialApp
-from django.contrib.sites.models import Site
-from django.urls import reverse
-from django.conf import settings
-
-class Command(BaseCommand):
-    help = 'Verify Discord OAuth2 settings'
-
-    def handle(self, *args, **options):
-        # Get Discord app
-        try:
-            discord_app = SocialApp.objects.get(provider='discord')
-            self.stdout.write('Found Discord app configuration:')
-            self.stdout.write(f'Client ID: {discord_app.client_id}')
-            self.stdout.write(f'Secret: {discord_app.secret}')
-            
-            # Get sites
-            sites = discord_app.sites.all()
-            self.stdout.write('\nAssociated sites:')
-            for site in sites:
-                self.stdout.write(f'- {site.domain} ({site.name})')
-            
-            # Show callback URL
-            callback_url = 'http://localhost:8000/accounts/discord/login/callback/'
-            self.stdout.write('\nCallback URL to configure in Discord Developer Portal:')
-            self.stdout.write(callback_url)
-            
-            # Show OAuth2 settings
-            self.stdout.write('\nOAuth2 settings in settings.py:')
-            discord_settings = settings.SOCIALACCOUNT_PROVIDERS.get('discord', {})
-            self.stdout.write(f'PKCE Enabled: {discord_settings.get("OAUTH_PKCE_ENABLED", False)}')
-            self.stdout.write(f'Scopes: {discord_settings.get("SCOPE", [])}')
-            
-        except SocialApp.DoesNotExist:
-            self.stdout.write(self.style.ERROR('Discord app not found'))

accounts/migrations/0002_remove_toplistitem_insert_insert_and_more.py

@@ -1,93 +0,0 @@
-# Generated by Django 5.1.4 on 2025-02-21 17:55
-
-import django.utils.timezone
-import pgtrigger.compiler
-import pgtrigger.migrations
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("accounts", "0001_initial"),
-    ]
-
-    operations = [
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="toplistitem",
-            name="insert_insert",
-        ),
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="toplistitem",
-            name="update_update",
-        ),
-        migrations.AddField(
-            model_name="toplistitem",
-            name="created_at",
-            field=models.DateTimeField(
-                auto_now_add=True, default=django.utils.timezone.now
-            ),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name="toplistitem",
-            name="updated_at",
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name="toplistitemevent",
-            name="created_at",
-            field=models.DateTimeField(
-                auto_now_add=True, default=django.utils.timezone.now
-            ),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name="toplistitemevent",
-            name="updated_at",
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AlterField(
-            model_name="toplist",
-            name="id",
-            field=models.BigAutoField(
-                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="toplistitem",
-            name="id",
-            field=models.BigAutoField(
-                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="toplistitem",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "accounts_toplistitemevent" ("content_type_id", "created_at", "id", "notes", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "rank", "top_list_id", "updated_at") VALUES (NEW."content_type_id", NEW."created_at", NEW."id", NEW."notes", NEW."object_id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."rank", NEW."top_list_id", NEW."updated_at"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_56dfc",
-                    table="accounts_toplistitem",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="toplistitem",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "accounts_toplistitemevent" ("content_type_id", "created_at", "id", "notes", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "rank", "top_list_id", "updated_at") VALUES (NEW."content_type_id", NEW."created_at", NEW."id", NEW."notes", NEW."object_id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."rank", NEW."top_list_id", NEW."updated_at"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_2b6e3",
-                    table="accounts_toplistitem",
-                    when="AFTER",
-                ),
-            ),
-        ),
-    ]

accounts/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

accounts/urls.py

@@ -1,25 +0,0 @@
-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('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'),
-    path('password_reset/done/', auth_views.PasswordResetDoneView.as_view(), name='password_reset_done'),
-    path('reset/<uidb64>/<token>/', auth_views.PasswordResetConfirmView.as_view(), name='password_reset_confirm'),
-    path('reset/done/', auth_views.PasswordResetCompleteView.as_view(), name='password_reset_complete'),
-    
-    # Profile views
-    path('profile/', views.user_redirect_view, name='profile_redirect'),
-    path('settings/', views.SettingsView.as_view(), name='settings'),
-]

accounts/views.py

@@ -1,381 +0,0 @@
-from django.views.generic import DetailView, TemplateView
-from django.contrib.auth import get_user_model
-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
-from django.conf import settings
-from django.core.mail import send_mail
-from django.template.loader import render_to_string
-from django.utils.crypto import get_random_string
-from django.utils import timezone
-from datetime import timedelta
-from django.contrib.sites.shortcuts import get_current_site
-from django.db.models import Prefetch, QuerySet
-from django.http import HttpResponseRedirect, HttpResponse, HttpRequest
-from django.urls import reverse
-from django.contrib.auth import login
-from django.core.files.uploadedfile import UploadedFile
-from accounts.models import User, PasswordReset, TopList, EmailVerification, UserProfile
-from reviews.models import Review
-from email_service.services import EmailService
-from allauth.account.views import LoginView, SignupView
-from .mixins import TurnstileMixin
-from typing import Dict, Any, Optional, Union, cast, TYPE_CHECKING
-from django_htmx.http import HttpResponseClientRefresh
-from django.contrib.sites.models import Site
-from django.contrib.sites.requests import RequestSite
-from contextlib import suppress
-import re
-
-if TYPE_CHECKING:
-    from django.contrib.sites.models import Site
-    from django.contrib.sites.requests import RequestSite
-
-UserModel = 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)
-            
-        response = super().form_valid(form)
-        return HttpResponseClientRefresh() if getattr(self.request, 'htmx', False) else response
-
-    def form_invalid(self, form):
-        if getattr(self.request, 'htmx', False):
-            return render(
-                self.request,
-                'account/partials/login_form.html',
-                self.get_context_data(form=form)
-            )
-        return super().form_invalid(form)
-
-    def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
-        if getattr(request, 'htmx', False):
-            return render(
-                request,
-                'account/partials/login_modal.html',
-                self.get_context_data()
-            )
-        return super().get(request, *args, **kwargs)
-
-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)
-            
-        response = super().form_valid(form)
-        return HttpResponseClientRefresh() if getattr(self.request, 'htmx', False) else response
-
-    def form_invalid(self, form):
-        if getattr(self.request, 'htmx', False):
-            return render(
-                self.request,
-                'account/partials/signup_modal.html',
-                self.get_context_data(form=form)
-            )
-        return super().form_invalid(form)
-
-    def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
-        if getattr(request, 'htmx', False):
-            return render(
-                request,
-                'account/partials/signup_modal.html',
-                self.get_context_data()
-            )
-        return super().get(request, *args, **kwargs)
-
-@login_required
-def user_redirect_view(request: HttpRequest) -> HttpResponse:
-    user = cast(User, request.user)
-    return redirect('profile', username=user.username)
-
-def handle_social_login(request: HttpRequest, email: str) -> HttpResponse:
-    if sociallogin := request.session.get('socialaccount_sociallogin'):
-        sociallogin.user.email = email
-        sociallogin.save()
-        login(request, sociallogin.user)
-        del request.session['socialaccount_sociallogin']
-        messages.success(request, 'Successfully logged in')
-    return redirect('/')
-
-def email_required(request: HttpRequest) -> HttpResponse:
-    if not request.session.get('socialaccount_sociallogin'):
-        messages.error(request, 'No social login in progress')
-        return redirect('/')
-
-    if request.method == 'POST':
-        if email := request.POST.get('email'):
-            return handle_social_login(request, email)
-        messages.error(request, 'Email is required')
-        return render(request, 'accounts/email_required.html', {'error': 'Email is required'})
-
-    return render(request, 'accounts/email_required.html')
-
-class ProfileView(DetailView):
-    model = User
-    template_name = 'accounts/profile.html'
-    context_object_name = 'profile_user'
-    slug_field = 'username'
-    slug_url_kwarg = 'username'
-
-    def get_queryset(self) -> QuerySet[User]:
-        return User.objects.select_related('profile')
-
-    def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
-        context = super().get_context_data(**kwargs)
-        user = cast(User, self.get_object())
-        
-        context['recent_reviews'] = self._get_user_reviews(user)
-        context['top_lists'] = self._get_user_top_lists(user)
-        
-        return context
-
-    def _get_user_reviews(self, user: User) -> QuerySet[Review]:
-        return Review.objects.filter(
-            user=user,
-            is_published=True
-        ).select_related(
-            'user',
-            'user__profile',
-            'content_type'
-        ).prefetch_related(
-            'content_object'
-        ).order_by('-created_at')[:5]
-
-    def _get_user_top_lists(self, user: User) -> QuerySet[TopList]:
-        return TopList.objects.filter(
-            user=user
-        ).select_related(
-            'user', 
-            'user__profile'
-        ).prefetch_related(
-            'items'
-        ).order_by('-created_at')[:5]
-
-class SettingsView(LoginRequiredMixin, TemplateView):
-    template_name = 'accounts/settings.html'
-
-    def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
-        context = super().get_context_data(**kwargs)
-        context['user'] = self.request.user
-        return context
-
-    def _handle_profile_update(self, request: HttpRequest) -> None:
-        user = cast(User, request.user)
-        profile = get_object_or_404(UserProfile, user=user)
-        
-        if display_name := request.POST.get('display_name'):
-            profile.display_name = display_name
-        
-        if 'avatar' in request.FILES:
-            avatar_file = cast(UploadedFile, request.FILES['avatar'])
-            profile.avatar.save(avatar_file.name, avatar_file, save=False)
-            profile.save()
-        
-        user.save()
-        messages.success(request, 'Profile updated successfully')
-
-    def _validate_password(self, password: str) -> bool:
-        """Validate password meets requirements."""
-        return (
-            len(password) >= 8 and
-            bool(re.search(r'[A-Z]', password)) and
-            bool(re.search(r'[a-z]', password)) and
-            bool(re.search(r'[0-9]', password))
-        )
-
-    def _send_password_change_confirmation(self, request: HttpRequest, user: User) -> None:
-        """Send password change confirmation email."""
-        site = get_current_site(request)
-        context = {
-            'user': user,
-            'site_name': site.name,
-        }
-        
-        email_html = render_to_string('accounts/email/password_change_confirmation.html', context)
-        
-        EmailService.send_email(
-            to=user.email,
-            subject='Password Changed Successfully',
-            text='Your password has been changed successfully.',
-            site=site,
-            html=email_html
-        )
-
-    def _handle_password_change(self, request: HttpRequest) -> Optional[HttpResponseRedirect]:
-        user = cast(User, request.user)
-        old_password = request.POST.get('old_password', '')
-        new_password = request.POST.get('new_password', '')
-        confirm_password = request.POST.get('confirm_password', '')
-        
-        if not user.check_password(old_password):
-            messages.error(request, 'Current password is incorrect')
-            return None
-
-        if new_password != confirm_password:
-            messages.error(request, 'New passwords do not match')
-            return None
-
-        if not self._validate_password(new_password):
-            messages.error(request, 'Password must be at least 8 characters and contain uppercase, lowercase, and numbers')
-            return None
-
-        user.set_password(new_password)
-        user.save()
-        
-        self._send_password_change_confirmation(request, user)
-        messages.success(request, 'Password changed successfully. Please check your email for confirmation.')
-        return HttpResponseRedirect(reverse('account_login'))
-
-    def _handle_email_change(self, request: HttpRequest) -> None:
-        if new_email := request.POST.get('new_email'):
-            self._send_email_verification(request, new_email)
-            messages.success(request, 'Verification email sent to your new email address')
-        else:
-            messages.error(request, 'New email is required')
-
-    def _send_email_verification(self, request: HttpRequest, new_email: str) -> None:
-        user = cast(User, request.user)
-        token = get_random_string(64)
-        EmailVerification.objects.update_or_create(
-            user=user,
-            defaults={'token': token}
-        )
-        
-        site = cast(Site, get_current_site(request))
-        verification_url = reverse('verify_email', kwargs={'token': token})
-        
-        context = {
-            'user': user,
-            'verification_url': verification_url,
-            'site_name': site.name,
-        }
-        
-        email_html = render_to_string('accounts/email/verify_email.html', context)
-        EmailService.send_email(
-            to=new_email,
-            subject='Verify your new email address',
-            text='Click the link to verify your new email address',
-            site=site,
-            html=email_html
-        )
-        
-        user.pending_email = new_email
-        user.save()
-
-    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
-        action = request.POST.get('action')
-        
-        if action == 'update_profile':
-            self._handle_profile_update(request)
-        elif action == 'change_password':
-            if response := self._handle_password_change(request):
-                return response
-        elif action == 'change_email':
-            self._handle_email_change(request)
-
-        return self.get(request, *args, **kwargs)
-
-def create_password_reset_token(user: User) -> str:
-    token = get_random_string(64)
-    PasswordReset.objects.update_or_create(
-        user=user,
-        defaults={
-            'token': token,
-            'expires_at': timezone.now() + timedelta(hours=24)
-        }
-    )
-    return token
-
-def send_password_reset_email(user: User, site: Union[Site, RequestSite], token: str) -> None:
-    reset_url = reverse('password_reset_confirm', kwargs={'token': token})
-    context = {
-        'user': user,
-        'reset_url': reset_url,
-        'site_name': site.name,
-    }
-    email_html = render_to_string('accounts/email/password_reset.html', context)
-    
-    EmailService.send_email(
-        to=user.email,
-        subject='Reset your password',
-        text='Click the link to reset your password',
-        site=site,
-        html=email_html
-    )
-
-def request_password_reset(request: HttpRequest) -> HttpResponse:
-    if request.method != 'POST':
-        return render(request, 'accounts/password_reset.html')
-
-    if not (email := request.POST.get('email')):
-        messages.error(request, 'Email is required')
-        return redirect('account_reset_password')
-    
-    with suppress(User.DoesNotExist):
-        user = User.objects.get(email=email)
-        token = create_password_reset_token(user)
-        site = get_current_site(request)
-        send_password_reset_email(user, site, token)
-    
-    messages.success(request, 'Password reset email sent')
-    return redirect('account_login')
-
-def handle_password_reset(request: HttpRequest, user: User, new_password: str, reset: PasswordReset, site: Union[Site, RequestSite]) -> None:
-    user.set_password(new_password)
-    user.save()
-    
-    reset.used = True
-    reset.save()
-    
-    send_password_reset_confirmation(user, site)
-    messages.success(request, 'Password reset successfully')
-
-def send_password_reset_confirmation(user: User, site: Union[Site, RequestSite]) -> None:
-    context = {
-        'user': user,
-        'site_name': site.name,
-    }
-    email_html = render_to_string('accounts/email/password_reset_complete.html', context)
-    
-    EmailService.send_email(
-        to=user.email,
-        subject='Password Reset Complete',
-        text='Your password has been reset successfully.',
-        site=site,
-        html=email_html
-    )
-
-def reset_password(request: HttpRequest, token: str) -> HttpResponse:
-    try:
-        reset = PasswordReset.objects.select_related('user').get(
-            token=token,
-            expires_at__gt=timezone.now(),
-            used=False
-        )
-        
-        if request.method == 'POST':
-            if new_password := request.POST.get('new_password'):
-                site = get_current_site(request)
-                handle_password_reset(request, reset.user, new_password, reset, site)
-                return redirect('account_login')
-            
-            messages.error(request, 'New password is required')
-        
-        return render(request, 'accounts/password_reset_confirm.html', {'token': token})
-        
-    except PasswordReset.DoesNotExist:
-        messages.error(request, 'Invalid or expired reset token')
-        return redirect('account_reset_password')

analytics/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'analytics.apps.AnalyticsConfig'

analytics/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

analytics/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-class AnalyticsConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'analytics'

analytics/middleware.py

@@ -1,39 +0,0 @@
-from django.utils.deprecation import MiddlewareMixin
-from django.contrib.contenttypes.models import ContentType
-from django.views.generic.detail import DetailView
-from .models import PageView
-
-class PageViewMiddleware(MiddlewareMixin):
-    def process_view(self, request, view_func, view_args, view_kwargs):
-        # Only track GET requests
-        if request.method != 'GET':
-            return None
-
-        # Get view class if it exists
-        view_class = getattr(view_func, 'view_class', None)
-        if not view_class or not issubclass(view_class, DetailView):
-            return None
-
-        # Get the object if it's a detail view
-        try:
-            view_instance = view_class()
-            view_instance.request = request
-            view_instance.args = view_args
-            view_instance.kwargs = view_kwargs
-            obj = view_instance.get_object()
-        except (AttributeError, Exception):
-            return None
-
-        # Record the page view
-        try:
-            PageView.objects.create(
-                content_type=ContentType.objects.get_for_model(obj.__class__),
-                object_id=obj.pk,
-                ip_address=request.META.get('REMOTE_ADDR', ''),
-                user_agent=request.META.get('HTTP_USER_AGENT', '')[:512]
-            )
-        except Exception:
-            # Fail silently to not interrupt the request
-            pass
-
-        return None

analytics/migrations/0001_initial.py

@@ -1,53 +0,0 @@
-# Generated by Django 5.1.4 on 2025-02-10 01:10
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ("contenttypes", "0002_remove_content_type_name"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="PageView",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("object_id", models.PositiveIntegerField()),
-                ("timestamp", models.DateTimeField(auto_now_add=True, db_index=True)),
-                ("ip_address", models.GenericIPAddressField()),
-                ("user_agent", models.CharField(blank=True, max_length=512)),
-                (
-                    "content_type",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="page_views",
-                        to="contenttypes.contenttype",
-                    ),
-                ),
-            ],
-            options={
-                "indexes": [
-                    models.Index(
-                        fields=["timestamp"], name="analytics_p_timesta_835321_idx"
-                    ),
-                    models.Index(
-                        fields=["content_type", "object_id"],
-                        name="analytics_p_content_73920a_idx",
-                    ),
-                ],
-            },
-        ),
-    ]

analytics/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

analytics/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

architecture/architecture-validation.md

@@ -0,0 +1,372 @@
+# ThrillWiki Monorepo Architecture Validation
+
+This document provides a comprehensive review and validation of the proposed monorepo architecture for migrating ThrillWiki from Django-only to Django + Vue.js.
+
+## Architecture Overview Validation
+
+### ✅ Core Requirements Met
+
+1. **Clean Separation of Concerns**
+   - Backend: Django API, business logic, database management
+   - Frontend: Vue.js SPA with modern tooling
+   - Shared: Common resources and media files
+
+2. **Development Workflow Preservation**
+   - UV package management for Python maintained
+   - pnpm for Node.js package management
+   - Existing development scripts adapted
+   - Hot reloading for both backend and frontend
+
+3. **Project Structure Compatibility**
+   - Django apps preserved under `backend/apps/`
+   - Configuration maintained under `backend/config/`
+   - Static files strategy clearly defined
+   - Media files centralized in `shared/media/`
+
+## Technical Architecture Validation
+
+### Backend Architecture ✅
+
+```mermaid
+graph TB
+    A[Django Backend] --> B[Apps Directory]
+    A --> C[Config Directory]
+    A --> D[Static Files]
+    
+    B --> E[accounts]
+    B --> F[parks]
+    B --> G[rides]
+    B --> H[moderation]
+    B --> I[location]
+    B --> J[media]
+    B --> K[email_service]
+    B --> L[core]
+    
+    C --> M[Django Settings]
+    C --> N[URL Configuration]
+    C --> O[WSGI/ASGI]
+    
+    D --> P[Admin Assets]
+    D --> Q[Backend Static]
+```
+
+**Validation Points:**
+- ✅ All 8 Django apps properly mapped to new structure
+- ✅ Configuration files maintain their organization
+- ✅ Static file handling preserves Django admin functionality
+- ✅ UV package management integration maintained
+
+### Frontend Architecture ✅
+
+```mermaid
+graph TB
+    A[Vue.js Frontend] --> B[Source Code]
+    A --> C[Build System]
+    A --> D[Development Tools]
+    
+    B --> E[Components]
+    B --> F[Views/Pages]
+    B --> G[Router]
+    B --> H[State Management]
+    B --> I[API Layer]
+    
+    C --> J[Vite]
+    C --> K[TypeScript]
+    C --> L[Tailwind CSS]
+    
+    D --> M[Hot Reload]
+    D --> N[Dev Server]
+    D --> O[Build Tools]
+```
+
+**Validation Points:**
+- ✅ Modern Vue.js 3 + Composition API
+- ✅ TypeScript for type safety
+- ✅ Vite for fast development and builds
+- ✅ Tailwind CSS for styling (matching current setup)
+- ✅ Pinia for state management
+- ✅ Vue Router for SPA navigation
+
+### Integration Architecture ✅
+
+```mermaid
+graph LR
+    A[Vue.js Frontend] --> B[HTTP API Calls]
+    B --> C[Django REST API]
+    C --> D[Database]
+    C --> E[Media Files]
+    E --> F[Shared Media Directory]
+    F --> G[Frontend Access]
+```
+
+**Validation Points:**
+- ✅ RESTful API integration between frontend and backend
+- ✅ Media files accessible to both systems
+- ✅ Authentication handling via API tokens
+- ✅ CORS configuration for cross-origin requests
+
+## File Migration Validation
+
+### Critical File Mappings ✅
+
+| Component | Current | New Location | Status |
+|-----------|---------|--------------|--------|
+| Django Apps | `/apps/` | `/backend/apps/` | ✅ Mapped |
+| Configuration | `/config/` | `/backend/config/` | ✅ Mapped |
+| Static Files | `/static/` | `/backend/static/` | ✅ Mapped |
+| Media Files | `/media/` | `/shared/media/` | ✅ Mapped |
+| Scripts | `/scripts/` | `/scripts/` | ✅ Preserved |
+| Dependencies | `/pyproject.toml` | `/backend/pyproject.toml` | ✅ Mapped |
+
+### Import Path Updates Required ✅
+
+**Django Settings Updates:**
+```python
+# OLD
+INSTALLED_APPS = [
+    'accounts',
+    'parks',
+    'rides',
+    # ...
+]
+
+# NEW
+INSTALLED_APPS = [
+    'apps.accounts',
+    'apps.parks', 
+    'apps.rides',
+    # ...
+]
+```
+
+**Media Path Updates:**
+```python
+# NEW
+MEDIA_ROOT = BASE_DIR.parent / 'shared' / 'media'
+```
+
+## Development Workflow Validation
+
+### Package Management ✅
+
+**Backend (UV):**
+- ✅ `uv add <package>` for new dependencies
+- ✅ `uv run manage.py <command>` for Django commands
+- ✅ `uv sync` for dependency installation
+
+**Frontend (pnpm):**
+- ✅ `pnpm add <package>` for new dependencies
+- ✅ `pnpm install` for dependency installation
+- ✅ `pnpm run dev` for development server
+
+**Root Workspace:**
+- ✅ `pnpm run dev` starts both servers concurrently
+- ✅ Individual server commands available
+- ✅ Build and test scripts coordinated
+
+### Development Scripts ✅
+
+```bash
+# Root level coordination
+pnpm run dev              # Both servers
+pnpm run backend:dev      # Django only
+pnpm run frontend:dev     # Vue.js only
+pnpm run build           # Production build
+pnpm run test            # All tests
+pnpm run lint            # All linting
+pnpm run format          # Code formatting
+```
+
+## Deployment Strategy Validation
+
+### Container Strategy ✅
+
+**Multi-container Approach:**
+- ✅ Separate containers for backend and frontend
+- ✅ Shared volumes for media files
+- ✅ Database and Redis containers
+- ✅ Nginx reverse proxy configuration
+
+**Build Process:**
+- ✅ Backend: Django static collection + uv dependencies
+- ✅ Frontend: Vite production build + asset optimization
+- ✅ Shared: Media file persistence across deployments
+
+### Platform Compatibility ✅
+
+**Supported Deployment Platforms:**
+- ✅ Docker Compose (local and production)
+- ✅ Vercel (frontend + serverless backend)
+- ✅ Railway (container deployment)
+- ✅ DigitalOcean App Platform
+- ✅ AWS ECS/Fargate
+- ✅ Google Cloud Run
+
+## Performance Considerations ✅
+
+### Backend Optimization
+- ✅ Database connection pooling
+- ✅ Redis caching strategy
+- ✅ Static file CDN integration
+- ✅ API response optimization
+
+### Frontend Optimization
+- ✅ Code splitting and lazy loading
+- ✅ Asset optimization with Vite
+- ✅ Tree shaking for minimal bundle size
+- ✅ Modern build targets
+
+### Development Performance
+- ✅ Hot module replacement for Vue.js
+- ✅ Django auto-reload for backend changes
+- ✅ Fast dependency installation with UV and pnpm
+- ✅ Concurrent development servers
+
+## Security Validation ✅
+
+### Backend Security
+- ✅ Django security middleware maintained
+- ✅ CORS configuration for API access
+- ✅ Authentication token management
+- ✅ Input validation and sanitization
+
+### Frontend Security
+- ✅ Content Security Policy headers
+- ✅ XSS protection mechanisms
+- ✅ Secure API communication (HTTPS)
+- ✅ Environment variable protection
+
+### Deployment Security
+- ✅ SSL/TLS termination
+- ✅ Security headers configuration
+- ✅ Secret management strategy
+- ✅ Container security best practices
+
+## Risk Assessment and Mitigation
+
+### Low Risk Items ✅
+- **File organization**: Clear mapping and systematic approach
+- **Package management**: Both UV and pnpm are stable and well-supported
+- **Development workflow**: Incremental changes to existing process
+
+### Medium Risk Items ⚠️
+- **Import path updates**: Requires careful testing of all Django apps
+- **Static file handling**: Need to verify Django admin continues working
+- **API integration**: New frontend-backend communication layer
+
+**Mitigation Strategies:**
+- Comprehensive testing suite for Django apps after migration
+- Static file serving verification in development and production
+- API endpoint testing and documentation
+- Gradual migration approach with rollback capabilities
+
+### High Risk Items 🔴
+- **Data migration**: Database changes during restructuring
+- **Production deployment**: New deployment process requires validation
+
+**Mitigation Strategies:**
+- Database backup before any structural changes
+- Staging environment testing before production deployment
+- Blue-green deployment strategy for zero-downtime migration
+- Monitoring and alerting for post-migration issues
+
+## Testing Strategy Validation
+
+### Backend Testing ✅
+```bash
+# Django tests
+cd backend
+uv run manage.py test
+
+# Code quality
+uv run flake8 .
+uv run black --check .
+```
+
+### Frontend Testing ✅
+```bash
+# Vue.js tests
+cd frontend
+pnpm run test
+pnpm run test:unit
+pnpm run test:e2e
+
+# Code quality
+pnpm run lint
+pnpm run type-check
+```
+
+### Integration Testing ✅
+- API endpoint testing
+- Frontend-backend communication testing
+- Media file access testing
+- Authentication flow testing
+
+## Documentation Validation ✅
+
+### Created Documentation
+- ✅ **Monorepo Structure Plan**: Complete directory organization
+- ✅ **Migration Mapping**: File-by-file migration guide
+- ✅ **Deployment Guide**: Comprehensive deployment strategies
+- ✅ **Architecture Validation**: This validation document
+
+### Required Updates
+- ✅ Root README.md update for monorepo structure
+- ✅ Development setup instructions
+- ✅ API documentation for frontend integration
+- ✅ Deployment runbooks
+
+## Implementation Readiness Assessment
+
+### Prerequisites Met ✅
+- [x] Current Django project analysis complete
+- [x] Monorepo structure designed
+- [x] File migration strategy defined
+- [x] Development workflow planned
+- [x] Deployment strategy documented
+- [x] Risk assessment completed
+
+### Ready for Implementation ✅
+- [x] Clear step-by-step migration plan
+- [x] File mapping completeness verified
+- [x] Package management strategy confirmed
+- [x] Testing approach defined
+- [x] Rollback strategy available
+
+### Success Criteria Defined ✅
+1. **Functional Requirements**
+   - All existing Django functionality preserved
+   - Modern Vue.js frontend operational
+   - API integration working correctly
+   - Media file handling functional
+
+2. **Performance Requirements**
+   - Development servers start within reasonable time
+   - Build process completes successfully
+   - Production deployment successful
+
+3. **Quality Requirements**
+   - All tests passing after migration
+   - Code quality standards maintained
+   - Documentation updated and complete
+
+## Final Recommendation ✅
+
+**Approval Status: APPROVED FOR IMPLEMENTATION**
+
+The proposed monorepo architecture for ThrillWiki is comprehensive, well-planned, and ready for implementation. The plan demonstrates:
+
+1. **Technical Soundness**: Architecture follows modern best practices
+2. **Risk Management**: Potential issues identified with mitigation strategies
+3. **Implementation Clarity**: Clear step-by-step migration process
+4. **Operational Readiness**: Deployment and maintenance procedures defined
+
+**Next Steps:**
+1. Switch to **Code Mode** for implementation
+2. Begin with directory structure creation
+3. Migrate backend files systematically
+4. Create Vue.js frontend application
+5. Test integration between systems
+6. Update deployment configurations
+
+The architecture provides a solid foundation for scaling ThrillWiki with modern frontend technologies while preserving the robust Django backend functionality.

architecture/deployment-guide.md

@@ -0,0 +1,628 @@
+# ThrillWiki Monorepo Deployment Guide
+
+This document outlines deployment strategies, build processes, and infrastructure considerations for the ThrillWiki Django + Vue.js monorepo.
+
+## Build Process Overview
+
+```mermaid
+graph TB
+    A[Source Code] --> B[Backend Build]
+    A --> C[Frontend Build]
+    B --> D[Django Static Collection]
+    C --> E[Vue.js Production Build]
+    D --> F[Backend Container]
+    E --> G[Frontend Assets]
+    F --> H[Production Deployment]
+    G --> H
+```
+
+## Development Environment
+
+### Prerequisites
+- Python 3.11+ with UV package manager
+- Node.js 18+ with pnpm
+- PostgreSQL (production) / SQLite (development)
+- Redis (for caching and sessions)
+
+### Local Development Setup
+```bash
+# Clone repository
+git clone <repository-url>
+cd thrillwiki-monorepo
+
+# Install root dependencies
+pnpm install
+
+# Backend setup
+cd backend
+uv sync
+uv run manage.py migrate
+uv run manage.py collectstatic
+
+# Frontend setup
+cd ../frontend
+pnpm install
+
+# Start development servers
+cd ..
+pnpm run dev  # Starts both backend and frontend
+```
+
+## Build Strategies
+
+### 1. Containerized Deployment (Recommended)
+
+#### Multi-stage Dockerfile for Backend
+```dockerfile
+# backend/Dockerfile
+FROM python:3.11-slim as builder
+
+WORKDIR /app
+COPY pyproject.toml uv.lock ./
+RUN pip install uv
+RUN uv sync --no-dev
+
+FROM python:3.11-slim as runtime
+
+WORKDIR /app
+COPY --from=builder /app/.venv /app/.venv
+ENV PATH="/app/.venv/bin:$PATH"
+
+COPY . .
+RUN python manage.py collectstatic --noinput
+
+EXPOSE 8000
+CMD ["gunicorn", "config.wsgi:application", "--bind", "0.0.0.0:8000"]
+```
+
+#### Dockerfile for Frontend
+```dockerfile
+# frontend/Dockerfile
+FROM node:18-alpine as builder
+
+WORKDIR /app
+COPY package.json pnpm-lock.yaml ./
+RUN npm install -g pnpm
+RUN pnpm install --frozen-lockfile
+
+COPY . .
+RUN pnpm run build
+
+FROM nginx:alpine as runtime
+COPY --from=builder /app/dist /usr/share/nginx/html
+COPY nginx.conf /etc/nginx/nginx.conf
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]
+```
+
+#### Docker Compose for Development
+```yaml
+# docker-compose.dev.yml
+version: '3.8'
+
+services:
+  db:
+    image: postgres:15
+    environment:
+      POSTGRES_DB: thrillwiki
+      POSTGRES_USER: thrillwiki
+      POSTGRES_PASSWORD: password
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+
+  redis:
+    image: redis:7-alpine
+    ports:
+      - "6379:6379"
+
+  backend:
+    build:
+      context: ./backend
+      dockerfile: Dockerfile.dev
+    ports:
+      - "8000:8000"
+    volumes:
+      - ./backend:/app
+      - ./shared/media:/app/media
+    environment:
+      - DEBUG=1
+      - DATABASE_URL=postgresql://thrillwiki:password@db:5432/thrillwiki
+      - REDIS_URL=redis://redis:6379/0
+    depends_on:
+      - db
+      - redis
+
+  frontend:
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile.dev
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./frontend:/app
+      - /app/node_modules
+    environment:
+      - VITE_API_URL=http://localhost:8000
+
+volumes:
+  postgres_data:
+```
+
+#### Docker Compose for Production
+```yaml
+# docker-compose.prod.yml
+version: '3.8'
+
+services:
+  db:
+    image: postgres:15
+    environment:
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    restart: unless-stopped
+
+  redis:
+    image: redis:7-alpine
+    restart: unless-stopped
+
+  backend:
+    build:
+      context: ./backend
+      dockerfile: Dockerfile
+    environment:
+      - DEBUG=0
+      - DATABASE_URL=${DATABASE_URL}
+      - REDIS_URL=${REDIS_URL}
+      - SECRET_KEY=${SECRET_KEY}
+      - ALLOWED_HOSTS=${ALLOWED_HOSTS}
+    volumes:
+      - ./shared/media:/app/media
+      - static_files:/app/staticfiles
+    depends_on:
+      - db
+      - redis
+    restart: unless-stopped
+
+  frontend:
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile
+    restart: unless-stopped
+
+  nginx:
+    image: nginx:alpine
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - ./nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx/ssl:/etc/nginx/ssl
+      - static_files:/usr/share/nginx/html/static
+      - ./shared/media:/usr/share/nginx/html/media
+    depends_on:
+      - backend
+      - frontend
+    restart: unless-stopped
+
+volumes:
+  postgres_data:
+  static_files:
+```
+
+### 2. Static Site Generation (Alternative)
+
+For sites with mostly static content, consider pre-rendering:
+
+```bash
+# Frontend build with pre-rendering
+cd frontend
+pnpm run build:prerender
+
+# Serve static files with minimal backend
+```
+
+## CI/CD Pipeline
+
+### GitHub Actions Workflow
+```yaml
+# .github/workflows/deploy.yml
+name: Deploy ThrillWiki
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    
+    services:
+      postgres:
+        image: postgres:15
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+    
+    - name: Install UV
+      run: pip install uv
+    
+    - name: Backend Tests
+      run: |
+        cd backend
+        uv sync
+        uv run manage.py test
+        uv run flake8 .
+        uv run black --check .
+    
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '18'
+    
+    - name: Install pnpm
+      run: npm install -g pnpm
+    
+    - name: Frontend Tests
+      run: |
+        cd frontend
+        pnpm install --frozen-lockfile
+        pnpm run test
+        pnpm run lint
+        pnpm run type-check
+
+  build:
+    needs: test
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
+    
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Build and push Docker images
+      run: |
+        docker build -t thrillwiki-backend ./backend
+        docker build -t thrillwiki-frontend ./frontend
+        # Push to registry
+    
+    - name: Deploy to production
+      run: |
+        # Deploy using your preferred method
+        # (AWS ECS, GCP Cloud Run, Azure Container Instances, etc.)
+```
+
+## Platform-Specific Deployments
+
+### 1. Vercel Deployment (Frontend + API)
+
+```json
+// vercel.json
+{
+  "version": 2,
+  "builds": [
+    {
+      "src": "frontend/package.json",
+      "use": "@vercel/static-build",
+      "config": {
+        "distDir": "dist"
+      }
+    },
+    {
+      "src": "backend/config/wsgi.py",
+      "use": "@vercel/python"
+    }
+  ],
+  "routes": [
+    {
+      "src": "/api/(.*)",
+      "dest": "backend/config/wsgi.py"
+    },
+    {
+      "src": "/(.*)",
+      "dest": "frontend/dist/$1"
+    }
+  ]
+}
+```
+
+### 2. Railway Deployment
+
+```toml
+# railway.toml
+[environments.production]
+
+[environments.production.services.backend]
+dockerfile = "backend/Dockerfile"
+variables = { DEBUG = "0" }
+
+[environments.production.services.frontend]
+dockerfile = "frontend/Dockerfile"
+
+[environments.production.services.postgres]
+image = "postgres:15"
+variables = { POSTGRES_DB = "thrillwiki" }
+```
+
+### 3. DigitalOcean App Platform
+
+```yaml
+# .do/app.yaml
+name: thrillwiki
+services:
+- name: backend
+  source_dir: backend
+  github:
+    repo: your-username/thrillwiki-monorepo
+    branch: main
+  run_command: gunicorn config.wsgi:application
+  environment_slug: python
+  instance_count: 1
+  instance_size_slug: basic-xxs
+  envs:
+  - key: DEBUG
+    value: "0"
+
+- name: frontend
+  source_dir: frontend
+  github:
+    repo: your-username/thrillwiki-monorepo
+    branch: main
+  build_command: pnpm run build
+  run_command: pnpm run preview
+  environment_slug: node-js
+  instance_count: 1
+  instance_size_slug: basic-xxs
+
+databases:
+- name: thrillwiki-db
+  engine: PG
+  version: "15"
+```
+
+## Environment Configuration
+
+### Environment Variables
+
+#### Backend (.env)
+```bash
+# Django Settings
+DEBUG=0
+SECRET_KEY=your-secret-key-here
+ALLOWED_HOSTS=yourdomain.com,www.yourdomain.com
+
+# Database
+DATABASE_URL=postgresql://user:password@host:port/database
+
+# Redis
+REDIS_URL=redis://host:port/0
+
+# File Storage
+MEDIA_ROOT=/app/media
+STATIC_ROOT=/app/staticfiles
+
+# Email
+EMAIL_BACKEND=django.core.mail.backends.smtp.EmailBackend
+EMAIL_HOST=smtp.yourmailprovider.com
+EMAIL_PORT=587
+EMAIL_USE_TLS=True
+EMAIL_HOST_USER=your-email@yourdomain.com
+EMAIL_HOST_PASSWORD=your-email-password
+
+# Third-party Services
+SENTRY_DSN=your-sentry-dsn
+AWS_ACCESS_KEY_ID=your-aws-key
+AWS_SECRET_ACCESS_KEY=your-aws-secret
+```
+
+#### Frontend (.env.production)
+```bash
+VITE_API_URL=https://api.yourdomain.com
+VITE_APP_TITLE=ThrillWiki
+VITE_SENTRY_DSN=your-frontend-sentry-dsn
+VITE_GOOGLE_ANALYTICS_ID=your-ga-id
+```
+
+## Performance Optimization
+
+### Backend Optimizations
+```python
+# backend/config/settings/production.py
+
+# Database optimization
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql',
+        'CONN_MAX_AGE': 60,
+        'OPTIONS': {
+            'MAX_CONNS': 20,
+        }
+    }
+}
+
+# Caching
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.redis.RedisCache',
+        'LOCATION': 'redis://127.0.0.1:6379/1',
+        'OPTIONS': {
+            'CLIENT_CLASS': 'django_redis.client.DefaultClient',
+        },
+        'KEY_PREFIX': 'thrillwiki'
+    }
+}
+
+# Static files with CDN
+AWS_S3_CUSTOM_DOMAIN = 'cdn.yourdomain.com'
+STATICFILES_STORAGE = 'storages.backends.s3boto3.StaticS3Boto3Storage'
+DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.MediaS3Boto3Storage'
+```
+
+### Frontend Optimizations
+```typescript
+// frontend/vite.config.ts
+export default defineConfig({
+  build: {
+    rollupOptions: {
+      output: {
+        manualChunks: {
+          vendor: ['vue', 'vue-router', 'pinia'],
+          ui: ['@headlessui/vue', '@heroicons/vue']
+        }
+      }
+    },
+    sourcemap: false,
+    minify: 'terser',
+    terserOptions: {
+      compress: {
+        drop_console: true,
+        drop_debugger: true
+      }
+    }
+  }
+})
+```
+
+## Monitoring and Logging
+
+### Application Monitoring
+```python
+# backend/config/settings/production.py
+import sentry_sdk
+from sentry_sdk.integrations.django import DjangoIntegration
+
+sentry_sdk.init(
+    dsn="your-sentry-dsn",
+    integrations=[DjangoIntegration()],
+    traces_sample_rate=0.1,
+    send_default_pii=True
+)
+
+# Logging configuration
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'handlers': {
+        'file': {
+            'level': 'INFO',
+            'class': 'logging.FileHandler',
+            'filename': '/var/log/django/thrillwiki.log',
+        },
+    },
+    'root': {
+        'handlers': ['file'],
+    },
+}
+```
+
+### Infrastructure Monitoring
+- Use Prometheus + Grafana for metrics
+- Implement health check endpoints
+- Set up log aggregation (ELK stack or similar)
+- Monitor database performance
+- Track API response times
+
+## Security Considerations
+
+### Production Security Checklist
+- [ ] HTTPS enforced with SSL certificates
+- [ ] Security headers configured (HSTS, CSP, etc.)
+- [ ] Database credentials secured
+- [ ] Secret keys rotated regularly
+- [ ] CORS properly configured
+- [ ] Rate limiting implemented
+- [ ] File upload validation
+- [ ] SQL injection protection
+- [ ] XSS protection enabled
+- [ ] CSRF protection active
+
+### Security Headers
+```python
+# backend/config/settings/production.py
+SECURE_SSL_REDIRECT = True
+SECURE_HSTS_SECONDS = 31536000
+SECURE_HSTS_INCLUDE_SUBDOMAINS = True
+SECURE_HSTS_PRELOAD = True
+SECURE_CONTENT_TYPE_NOSNIFF = True
+SECURE_BROWSER_XSS_FILTER = True
+X_FRAME_OPTIONS = 'DENY'
+
+# CORS for API
+CORS_ALLOWED_ORIGINS = [
+    "https://yourdomain.com",
+    "https://www.yourdomain.com",
+]
+```
+
+## Backup and Recovery
+
+### Database Backup Strategy
+```bash
+# Automated backup script
+#!/bin/bash
+pg_dump $DATABASE_URL | gzip > backup_$(date +%Y%m%d_%H%M%S).sql.gz
+aws s3 cp backup_*.sql.gz s3://your-backup-bucket/database/
+```
+
+### Media Files Backup
+```bash
+# Sync media files to S3
+aws s3 sync ./shared/media/ s3://your-media-bucket/media/ --delete
+```
+
+## Scaling Strategies
+
+### Horizontal Scaling
+- Load balancer configuration
+- Database read replicas
+- CDN for static assets
+- Redis clustering
+- Auto-scaling groups
+
+### Vertical Scaling
+- Database connection pooling
+- Application server optimization
+- Memory usage optimization
+- CPU-intensive task optimization
+
+## Troubleshooting Guide
+
+### Common Issues
+1. **Build failures**: Check dependencies and environment variables
+2. **Database connection errors**: Verify connection strings and firewall rules
+3. **Static file 404s**: Ensure collectstatic runs and paths are correct
+4. **CORS errors**: Check CORS configuration and allowed origins
+5. **Memory issues**: Monitor application memory usage and optimize queries
+
+### Debug Commands
+```bash
+# Backend debugging
+cd backend
+uv run manage.py check --deploy
+uv run manage.py shell
+uv run manage.py dbshell
+
+# Frontend debugging
+cd frontend
+pnpm run build --debug
+pnpm run preview
+```
+
+This deployment guide provides a comprehensive approach to deploying the ThrillWiki monorepo across various platforms while maintaining security, performance, and scalability.

architecture/migration-mapping.md

@@ -0,0 +1,353 @@
+# ThrillWiki Migration Mapping Document
+
+This document provides a comprehensive mapping of files from the current Django project to the new monorepo structure.
+
+## Root Level Files
+
+| Current Location | New Location | Notes |
+|------------------|--------------|-------|
+| `manage.py` | `backend/manage.py` | Core Django management |
+| `pyproject.toml` | `backend/pyproject.toml` | Python dependencies |
+| `uv.lock` | `backend/uv.lock` | UV lock file |
+| `.gitignore` | `.gitignore` (update) | Merge with monorepo patterns |
+| `README.md` | `README.md` (update) | Update for monorepo |
+| `.pre-commit-config.yaml` | `.pre-commit-config.yaml` | Root level |
+
+## Configuration Directory
+
+| Current Location | New Location | Notes |
+|------------------|--------------|-------|
+| `config/django/` | `backend/config/django/` | Django settings |
+| `config/settings/` | `backend/config/settings/` | Environment settings |
+| `config/urls.py` | `backend/config/urls.py` | URL configuration |
+| `config/wsgi.py` | `backend/config/wsgi.py` | WSGI configuration |
+| `config/asgi.py` | `backend/config/asgi.py` | ASGI configuration |
+
+## Django Apps
+
+### Accounts App
+| Current Location | New Location |
+|------------------|--------------|
+| `accounts/` | `backend/apps/accounts/` |
+| `accounts/__init__.py` | `backend/apps/accounts/__init__.py` |
+| `accounts/models.py` | `backend/apps/accounts/models.py` |
+| `accounts/views.py` | `backend/apps/accounts/views.py` |
+| `accounts/admin.py` | `backend/apps/accounts/admin.py` |
+| `accounts/apps.py` | `backend/apps/accounts/apps.py` |
+| `accounts/migrations/` | `backend/apps/accounts/migrations/` |
+| `accounts/tests/` | `backend/apps/accounts/tests/` |
+
+### Parks App
+| Current Location | New Location |
+|------------------|--------------|
+| `parks/` | `backend/apps/parks/` |
+| `parks/__init__.py` | `backend/apps/parks/__init__.py` |
+| `parks/models.py` | `backend/apps/parks/models.py` |
+| `parks/views.py` | `backend/apps/parks/views.py` |
+| `parks/admin.py` | `backend/apps/parks/admin.py` |
+| `parks/apps.py` | `backend/apps/parks/apps.py` |
+| `parks/migrations/` | `backend/apps/parks/migrations/` |
+| `parks/tests/` | `backend/apps/parks/tests/` |
+
+### Rides App
+| Current Location | New Location |
+|------------------|--------------|
+| `rides/` | `backend/apps/rides/` |
+| `rides/__init__.py` | `backend/apps/rides/__init__.py` |
+| `rides/models.py` | `backend/apps/rides/models.py` |
+| `rides/views.py` | `backend/apps/rides/views.py` |
+| `rides/admin.py` | `backend/apps/rides/admin.py` |
+| `rides/apps.py` | `backend/apps/rides/apps.py` |
+| `rides/migrations/` | `backend/apps/rides/migrations/` |
+| `rides/tests/` | `backend/apps/rides/tests/` |
+
+### Moderation App
+| Current Location | New Location |
+|------------------|--------------|
+| `moderation/` | `backend/apps/moderation/` |
+| `moderation/__init__.py` | `backend/apps/moderation/__init__.py` |
+| `moderation/models.py` | `backend/apps/moderation/models.py` |
+| `moderation/views.py` | `backend/apps/moderation/views.py` |
+| `moderation/admin.py` | `backend/apps/moderation/admin.py` |
+| `moderation/apps.py` | `backend/apps/moderation/apps.py` |
+| `moderation/migrations/` | `backend/apps/moderation/migrations/` |
+| `moderation/tests/` | `backend/apps/moderation/tests/` |
+
+### Location App
+| Current Location | New Location |
+|------------------|--------------|
+| `location/` | `backend/apps/location/` |
+| `location/__init__.py` | `backend/apps/location/__init__.py` |
+| `location/models.py` | `backend/apps/location/models.py` |
+| `location/views.py` | `backend/apps/location/views.py` |
+| `location/admin.py` | `backend/apps/location/admin.py` |
+| `location/apps.py` | `backend/apps/location/apps.py` |
+| `location/migrations/` | `backend/apps/location/migrations/` |
+| `location/tests/` | `backend/apps/location/tests/` |
+
+### Media App
+| Current Location | New Location |
+|------------------|--------------|
+| `media/` | `backend/apps/media/` |
+| `media/__init__.py` | `backend/apps/media/__init__.py` |
+| `media/models.py` | `backend/apps/media/models.py` |
+| `media/views.py` | `backend/apps/media/views.py` |
+| `media/admin.py` | `backend/apps/media/admin.py` |
+| `media/apps.py` | `backend/apps/media/apps.py` |
+| `media/migrations/` | `backend/apps/media/migrations/` |
+| `media/tests/` | `backend/apps/media/tests/` |
+
+### Email Service App
+| Current Location | New Location |
+|------------------|--------------|
+| `email_service/` | `backend/apps/email_service/` |
+| `email_service/__init__.py` | `backend/apps/email_service/__init__.py` |
+| `email_service/models.py` | `backend/apps/email_service/models.py` |
+| `email_service/views.py` | `backend/apps/email_service/views.py` |
+| `email_service/admin.py` | `backend/apps/email_service/admin.py` |
+| `email_service/apps.py` | `backend/apps/email_service/apps.py` |
+| `email_service/migrations/` | `backend/apps/email_service/migrations/` |
+| `email_service/tests/` | `backend/apps/email_service/tests/` |
+
+### Core App
+| Current Location | New Location |
+|------------------|--------------|
+| `core/` | `backend/apps/core/` |
+| `core/__init__.py` | `backend/apps/core/__init__.py` |
+| `core/models.py` | `backend/apps/core/models.py` |
+| `core/views.py` | `backend/apps/core/views.py` |
+| `core/admin.py` | `backend/apps/core/admin.py` |
+| `core/apps.py` | `backend/apps/core/apps.py` |
+| `core/migrations/` | `backend/apps/core/migrations/` |
+| `core/tests/` | `backend/apps/core/tests/` |
+
+## Static Files and Templates
+
+| Current Location | New Location | Notes |
+|------------------|--------------|-------|
+| `static/` | `backend/static/` | Django admin and backend assets |
+| `staticfiles/` | `backend/staticfiles/` | Collected static files |
+| `templates/` | `backend/templates/` | Django templates (if any) |
+
+## Media Files
+
+| Current Location | New Location | Notes |
+|------------------|--------------|-------|
+| `media/` | `shared/media/` | User uploaded content |
+
+## Scripts and Development Tools
+
+| Current Location | New Location | Notes |
+|------------------|--------------|-------|
+| `scripts/` | `scripts/` | Root level scripts |
+| `scripts/dev_server.sh` | `scripts/backend_dev.sh` | Rename for clarity |
+
+## New Frontend Structure (Created)
+
+| New Location | Purpose |
+|--------------|---------|
+| `frontend/` | Vue.js application root |
+| `frontend/package.json` | Node.js dependencies |
+| `frontend/pnpm-lock.yaml` | pnpm lock file |
+| `frontend/vite.config.ts` | Vite configuration |
+| `frontend/tsconfig.json` | TypeScript configuration |
+| `frontend/tailwind.config.js` | Tailwind CSS configuration |
+| `frontend/src/` | Vue.js source code |
+| `frontend/src/main.ts` | Application entry point |
+| `frontend/src/App.vue` | Root component |
+| `frontend/src/components/` | Vue components |
+| `frontend/src/views/` | Page components |
+| `frontend/src/router/` | Vue Router configuration |
+| `frontend/src/stores/` | Pinia stores |
+| `frontend/src/composables/` | Vue composables |
+| `frontend/src/utils/` | Utility functions |
+| `frontend/src/types/` | TypeScript type definitions |
+| `frontend/src/assets/` | Static assets |
+| `frontend/public/` | Public assets |
+| `frontend/dist/` | Build output |
+
+## New Shared Resources (Created)
+
+| New Location | Purpose |
+|--------------|---------|
+| `shared/` | Cross-platform resources |
+| `shared/media/` | User uploaded files |
+| `shared/docs/` | Documentation |
+| `shared/types/` | Shared TypeScript types |
+| `shared/constants/` | Shared constants |
+
+## Updated Root Files
+
+### package.json (Root)
+```json
+{
+  "name": "thrillwiki-monorepo",
+  "private": true,
+  "workspaces": [
+    "frontend"
+  ],
+  "scripts": {
+    "dev": "concurrently \"pnpm --filter frontend dev\" \"./scripts/backend_dev.sh\"",
+    "build": "pnpm --filter frontend build",
+    "backend:dev": "./scripts/backend_dev.sh",
+    "frontend:dev": "pnpm --filter frontend dev",
+    "test": "pnpm --filter frontend test && cd backend && uv run manage.py test",
+    "lint": "pnpm --filter frontend lint && cd backend && uv run flake8 .",
+    "format": "pnpm --filter frontend format && cd backend && uv run black ."
+  },
+  "devDependencies": {
+    "concurrently": "^8.2.2"
+  }
+}
+```
+
+### .gitignore (Updated)
+```gitignore
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# Django
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+/backend/static/
+/backend/media/
+
+# UV
+.uv/
+
+# Node.js
+node_modules/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+.pnpm-store/
+
+# Vue.js / Vite
+/frontend/dist/
+/frontend/dist-ssr/
+*.local
+
+# Environment variables
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# IDEs
+.vscode/
+.idea/
+*.swp
+*.swo
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Logs
+logs/
+*.log
+
+# Coverage
+coverage/
+*.lcov
+.nyc_output
+```
+
+## Configuration Updates Required
+
+### Backend Django Settings
+Update `INSTALLED_APPS` paths:
+```python
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    
+    # Local apps
+    'apps.accounts',
+    'apps.parks',
+    'apps.rides',
+    'apps.moderation',
+    'apps.location',
+    'apps.media',
+    'apps.email_service',
+    'apps.core',
+]
+```
+
+Update media and static files paths:
+```python
+STATIC_URL = '/static/'
+STATIC_ROOT = BASE_DIR / 'staticfiles'
+STATICFILES_DIRS = [
+    BASE_DIR / 'static',
+]
+
+MEDIA_URL = '/media/'
+MEDIA_ROOT = BASE_DIR.parent / 'shared' / 'media'
+```
+
+### Script Updates
+Update `scripts/backend_dev.sh`:
+```bash
+#!/bin/bash
+cd backend
+lsof -ti :8000 | xargs kill -9 2>/dev/null || true
+find . -type d -name "__pycache__" -exec rm -r {} + 2>/dev/null || true
+uv run manage.py runserver 0.0.0.0:8000
+```
+
+## Migration Steps Summary
+
+1. **Create new directory structure**
+2. **Move backend files** to `backend/` directory
+3. **Update import paths** in Django settings and apps
+4. **Create frontend** Vue.js application
+5. **Update scripts** and configuration files
+6. **Test both backend and frontend** independently
+7. **Configure API integration** between Django and Vue.js
+8. **Update deployment** configurations
+
+## Validation Checklist
+
+- [ ] All Django apps moved to `backend/apps/`
+- [ ] Configuration files updated with new paths
+- [ ] Static and media file paths configured correctly
+- [ ] Frontend Vue.js application created and configured
+- [ ] Root package.json with workspace configuration
+- [ ] Development scripts updated and tested
+- [ ] Git configuration updated
+- [ ] Documentation updated
+- [ ] CI/CD pipelines updated (if applicable)
+- [ ] Database migrations work correctly
+- [ ] Both development servers start successfully
+- [ ] API endpoints accessible from frontend

architecture/monorepo-structure-plan.md

@@ -0,0 +1,525 @@
+# ThrillWiki Django + Vue.js Monorepo Architecture Plan
+
+## Executive Summary
+
+This document outlines the optimal monorepo directory structure for migrating the ThrillWiki Django project to a Django + Vue.js architecture. The design separates backend and frontend concerns while maintaining existing Django app organization and supporting modern development workflows.
+
+## Current Project Analysis
+
+### Django Apps Structure
+- **accounts**: User management and authentication
+- **parks**: Theme park data and operations
+- **rides**: Ride information and management
+- **moderation**: Content moderation system
+- **location**: Geographic data handling
+- **media**: File and image management
+- **email_service**: Email functionality
+- **core**: Core utilities and services
+
+### Key Infrastructure
+- **Package Management**: UV-based Python setup
+- **Configuration**: `config/django/` for settings, `config/settings/` for modular settings
+- **Development**: `scripts/dev_server.sh` with comprehensive setup
+- **Static Assets**: Tailwind CSS integration, `static/` and `staticfiles/`
+- **Media Handling**: Organized `media/` directory with park/ride subdirectories
+
+## Proposed Monorepo Structure
+
+```
+thrillwiki-monorepo/
+├── README.md
+├── pyproject.toml                    # Python dependencies (backend only)
+├── package.json                      # Node.js dependencies (monorepo coordination)
+├── pnpm-workspace.yaml              # pnpm workspace configuration
+├── .env.example
+├── .gitignore
+├── 
+├── backend/                          # Django Backend
+│   ├── manage.py
+│   ├── pyproject.toml               # Backend-specific dependencies
+│   ├── config/
+│   │   ├── django/
+│   │   │   ├── base.py
+│   │   │   ├── local.py
+│   │   │   ├── production.py
+│   │   │   └── test.py
+│   │   └── settings/
+│   │       ├── database.py
+│   │       ├── email.py
+│   │       └── security.py
+│   ├── thrillwiki/
+│   │   ├── __init__.py
+│   │   ├── urls.py
+│   │   ├── wsgi.py
+│   │   ├── asgi.py
+│   │   └── views.py
+│   ├── apps/                        # Django apps
+│   │   ├── accounts/
+│   │   ├── parks/
+│   │   ├── rides/
+│   │   ├── moderation/
+│   │   ├── location/
+│   │   ├── media/
+│   │   ├── email_service/
+│   │   └── core/
+│   ├── templates/                   # Django templates (API responses, admin)
+│   ├── static/                      # Backend static files
+│   │   └── admin/                   # Django admin assets
+│   ├── media/                       # User uploads
+│   │   ├── avatars/
+│   │   ├── park/
+│   │   └── submissions/
+│   └── tests/                       # Backend tests
+│
+├── frontend/                        # Vue.js Frontend
+│   ├── package.json
+│   ├── pnpm-lock.yaml
+│   ├── vite.config.js
+│   ├── tailwind.config.js
+│   ├── index.html
+│   ├── src/
+│   │   ├── main.js
+│   │   ├── App.vue
+│   │   ├── router/
+│   │   │   └── index.js
+│   │   ├── stores/                  # Pinia/Vuex stores
+│   │   │   ├── auth.js
+│   │   │   ├── parks.js
+│   │   │   └── rides.js
+│   │   ├── components/
+│   │   │   ├── common/              # Shared components
+│   │   │   ├── parks/               # Park-specific components
+│   │   │   ├── rides/               # Ride-specific components
+│   │   │   └── moderation/          # Moderation components
+│   │   ├── views/                   # Page components
+│   │   │   ├── Home.vue
+│   │   │   ├── parks/
+│   │   │   ├── rides/
+│   │   │   └── auth/
+│   │   ├── composables/             # Vue 3 composables
+│   │   │   ├── useAuth.js
+│   │   │   ├── useApi.js
+│   │   │   └── useTheme.js
+│   │   ├── services/                # API service layer
+│   │   │   ├── api.js
+│   │   │   ├── auth.js
+│   │   │   ├── parks.js
+│   │   │   └── rides.js
+│   │   ├── assets/
+│   │   │   ├── images/
+│   │   │   └── styles/
+│   │   │       ├── globals.css
+│   │   │       └── components/
+│   │   └── utils/
+│   ├── public/
+│   │   ├── favicon.ico
+│   │   └── images/
+│   ├── dist/                        # Build output
+│   └── tests/                       # Frontend tests
+│       ├── unit/
+│       └── e2e/
+│
+├── shared/                          # Shared Resources
+│   ├── docs/                        # Documentation
+│   │   ├── api/                     # API documentation
+│   │   ├── deployment/              # Deployment guides
+│   │   └── development/             # Development setup
+│   ├── scripts/                     # Build and deployment scripts
+│   │   ├── dev/
+│   │   │   ├── start-backend.sh
+│   │   │   ├── start-frontend.sh
+│   │   │   └── start-full-stack.sh
+│   │   ├── build/
+│   │   │   ├── build-frontend.sh
+│   │   │   └── build-production.sh
+│   │   ├── deploy/
+│   │   └── utils/
+│   ├── config/                      # Shared configuration
+│   │   ├── docker/
+│   │   │   ├── Dockerfile.backend
+│   │   │   ├── Dockerfile.frontend
+│   │   │   └── docker-compose.yml
+│   │   ├── nginx/
+│   │   └── ci/                      # CI/CD configuration
+│   │       └── github-actions/
+│   └── types/                       # Shared TypeScript types
+│       ├── api.ts
+│       ├── parks.ts
+│       └── rides.ts
+│
+├── logs/                            # Application logs
+├── backups/                         # Database backups
+├── uploads/                         # Temporary upload directory
+└── dist/                            # Production build output
+    ├── backend/                     # Django static files
+    └── frontend/                    # Vue.js build
+```
+
+## Directory Organization Rationale
+
+### 1. Clear Separation of Concerns
+- **backend/**: Contains all Django-related code, maintaining existing app structure
+- **frontend/**: Vue.js application with modern structure (Vite + Vue 3)
+- **shared/**: Common resources, documentation, and configuration
+
+### 2. Backend Structure (`backend/`)
+- Preserves existing Django app organization under `apps/`
+- Maintains UV-based Python dependency management
+- Keeps configuration structure with `config/django/` and `config/settings/`
+- Separates templates for API responses vs. frontend UI
+
+### 3. Frontend Structure (`frontend/`)
+- Modern Vue 3 + Vite setup with TypeScript support
+- Organized by feature areas (parks, rides, auth)
+- Composables for Vue 3 Composition API patterns
+- Service layer for API communication with Django backend
+- Tailwind CSS integration with shared design system
+
+### 4. Shared Resources (`shared/`)
+- Centralized documentation and deployment scripts
+- Docker configuration for containerized deployment
+- TypeScript type definitions shared between frontend and API
+- CI/CD pipeline configuration
+
+## Static File Strategy
+
+### Development
+```mermaid
+graph LR
+    A[Vue Dev Server :3000] --> B[Vite HMR]
+    C[Django Dev Server :8000] --> D[Django Static Files]
+    E[Tailwind CSS] --> F[Both Frontend & Backend]
+```
+
+### Production
+```mermaid
+graph LR
+    A[Vue Build] --> B[dist/frontend/]
+    C[Django Collectstatic] --> D[dist/backend/]
+    E[Nginx] --> F[Serves Both]
+    F --> G[Frontend Assets]
+    F --> H[API Endpoints]
+    F --> I[Media Files]
+```
+
+### Implementation Details
+
+1. **Development Mode**:
+   - Frontend: Vite dev server on port 3000 with HMR
+   - Backend: Django dev server on port 8000
+   - Proxy API calls from frontend to backend
+
+2. **Production Mode**:
+   - Frontend built to `dist/frontend/`
+   - Django static files collected to `dist/backend/`
+   - Nginx serves static files and proxies API calls
+
+## Media File Management
+
+### Current Structure Preservation
+```
+media/
+├── avatars/                         # User profile images
+├── park/                           # Park-specific media
+│   ├── {park-slug}/
+│   │   └── {ride-slug}/
+└── submissions/                    # User-submitted content
+    └── photos/
+```
+
+### Strategy
+- **Development**: Django serves media files directly
+- **Production**: CDN or object storage (S3/CloudFlare) integration
+- **Frontend Access**: Media URLs provided via API responses
+- **Upload Handling**: Django handles all file uploads, Vue.js provides UI
+
+## Development Workflow Integration
+
+### Package Management
+- **Root**: Node.js dependencies for frontend and tooling (using pnpm)
+- **Backend**: UV for Python dependencies (existing approach)
+- **Frontend**: pnpm for Vue.js dependencies
+
+### Development Scripts
+```bash
+# Root level scripts
+pnpm run dev              # Start both backend and frontend
+pnpm run dev:backend      # Start only Django
+pnpm run dev:frontend     # Start only Vue.js
+pnpm run build           # Build for production
+pnpm run test            # Run all tests
+
+# Backend specific (using UV)
+cd backend && uv run manage.py runserver
+cd backend && uv run manage.py test
+
+# Frontend specific
+cd frontend && pnpm run dev
+cd frontend && pnpm run build
+cd frontend && pnpm run test
+```
+
+### Environment Configuration
+```bash
+# Root .env (shared settings)
+DATABASE_URL=
+REDIS_URL=
+SECRET_KEY=
+
+# Backend .env (Django specific)
+DJANGO_SETTINGS_MODULE=config.django.local
+DEBUG=True
+
+# Frontend .env (Vue specific)
+VITE_API_BASE_URL=http://localhost:8000/api
+VITE_APP_TITLE=ThrillWiki
+```
+
+### Package Manager Configuration
+
+#### Root pnpm-workspace.yaml
+```yaml
+packages:
+  - 'frontend'
+  # Backend is managed separately with uv
+```
+
+#### Root package.json
+```json
+{
+  "name": "thrillwiki-monorepo",
+  "private": true,
+  "packageManager": "pnpm@9.0.0",
+  "scripts": {
+    "dev": "concurrently \"pnpm run dev:backend\" \"pnpm run dev:frontend\"",
+    "dev:backend": "cd backend && uv run manage.py runserver",
+    "dev:frontend": "cd frontend && pnpm run dev",
+    "build": "pnpm run build:frontend && cd backend && uv run manage.py collectstatic --noinput",
+    "build:frontend": "cd frontend && pnpm run build",
+    "test": "pnpm run test:backend && pnpm run test:frontend",
+    "test:backend": "cd backend && uv run manage.py test",
+    "test:frontend": "cd frontend && pnpm run test",
+    "lint": "cd frontend && pnpm run lint && cd ../backend && uv run flake8 .",
+    "format": "cd frontend && pnpm run format && cd ../backend && uv run black ."
+  },
+  "devDependencies": {
+    "concurrently": "^8.2.0"
+  }
+}
+```
+
+#### Frontend package.json
+```json
+{
+  "name": "thrillwiki-frontend",
+  "private": true,
+  "version": "0.1.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview",
+    "test": "vitest",
+    "test:e2e": "playwright test",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
+    "format": "prettier --write src/",
+    "type-check": "vue-tsc --noEmit"
+  },
+  "dependencies": {
+    "vue": "^3.4.0",
+    "vue-router": "^4.3.0",
+    "pinia": "^2.1.0",
+    "axios": "^1.6.0"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-vue": "^5.0.0",
+    "vite": "^5.0.0",
+    "vue-tsc": "^2.0.0",
+    "typescript": "^5.3.0",
+    "tailwindcss": "^3.4.0",
+    "autoprefixer": "^10.4.0",
+    "postcss": "^8.4.0",
+    "eslint": "^8.57.0",
+    "prettier": "^3.2.0",
+    "vitest": "^1.3.0",
+    "@playwright/test": "^1.42.0"
+  }
+}
+```
+
+## File Migration Mapping
+
+### High-Level Moves
+```
+Current → New Location
+├── manage.py → backend/manage.py
+├── pyproject.toml → backend/pyproject.toml (+ root package.json)
+├── config/ → backend/config/
+├── thrillwiki/ → backend/thrillwiki/
+├── accounts/ → backend/apps/accounts/
+├── parks/ → backend/apps/parks/
+├── rides/ → backend/apps/rides/
+├── moderation/ → backend/apps/moderation/
+├── location/ → backend/apps/location/
+├── media/ → backend/apps/media/
+├── email_service/ → backend/apps/email_service/
+├── core/ → backend/apps/core/
+├── templates/ → backend/templates/ (API) + frontend/src/views/ (UI)
+├── static/ → backend/static/ (admin) + frontend/src/assets/
+├── media/ → media/ (shared, accessible to both)
+├── scripts/ → shared/scripts/
+├── docs/ → shared/docs/
+├── tests/ → backend/tests/ + frontend/tests/
+└── staticfiles/ → dist/backend/ (generated)
+```
+
+### Detailed Backend App Moves
+Each Django app moves to `backend/apps/{app_name}/` with structure preserved:
+- Models, views, serializers stay the same
+- Templates for API responses remain in app directories
+- Static files move to frontend if UI-related
+- Tests remain with respective apps
+
+## Build and Deployment Strategy
+
+### Development Build Process
+1. **Backend**: No build step, runs directly with Django dev server
+2. **Frontend**: Vite development server with HMR
+3. **Shared**: Scripts orchestrate starting both services
+
+### Production Build Process
+```mermaid
+graph TD
+    A[CI/CD Trigger] --> B[Install Dependencies]
+    B --> C[Build Frontend]
+    B --> D[Collect Django Static]
+    C --> E[Generate Frontend Bundle]
+    D --> F[Collect Backend Assets]
+    E --> G[Create Docker Images]
+    F --> G
+    G --> H[Deploy to Production]
+```
+
+### Container Strategy
+- **Multi-stage Docker builds**: Separate backend and frontend images
+- **Nginx**: Reverse proxy and static file serving
+- **Volume mounts**: For media files and logs
+- **Environment-based configuration**: Development vs. production
+
+## API Integration Strategy
+
+### Backend API Structure
+```python
+# Enhanced DRF setup for SPA
+REST_FRAMEWORK = {
+    'DEFAULT_RENDERER_CLASSES': [
+        'rest_framework.renderers.JSONRenderer',
+    ],
+    'DEFAULT_AUTHENTICATION_CLASSES': [
+        'rest_framework.authentication.SessionAuthentication',
+        'rest_framework.authentication.TokenAuthentication',
+    ],
+}
+
+# CORS for development
+CORS_ALLOWED_ORIGINS = [
+    "http://localhost:3000",  # Vue dev server
+]
+```
+
+### Frontend API Service
+```javascript
+// API service with auth integration
+class ApiService {
+  constructor() {
+    this.client = axios.create({
+      baseURL: import.meta.env.VITE_API_BASE_URL,
+      withCredentials: true,
+    });
+  }
+  
+  // Park operations
+  getParks(params = {}) {
+    return this.client.get('/parks/', { params });
+  }
+  
+  // Ride operations
+  getRides(parkId, params = {}) {
+    return this.client.get(`/parks/${parkId}/rides/`, { params });
+  }
+}
+```
+
+## Configuration Management
+
+### Shared Environment Variables
+- Database connections
+- Redis/Cache settings
+- Secret keys and API keys
+- Feature flags
+
+### Application-Specific Settings
+- **Django**: `backend/config/django/`
+- **Vue.js**: `frontend/.env` files
+- **Docker**: `shared/config/docker/`
+
+### Development vs. Production
+- Development: Multiple local servers, hot reloading
+- Production: Containerized deployment, CDN integration
+
+## Benefits of This Structure
+
+1. **Clear Separation**: Backend and frontend concerns are clearly separated
+2. **Scalability**: Each part can be developed, tested, and deployed independently
+3. **Modern Workflow**: Supports latest Vue 3, Vite, and Django patterns
+4. **Backward Compatibility**: Preserves existing Django app structure
+5. **Developer Experience**: Hot reloading, TypeScript support, modern tooling
+6. **Deployment Flexibility**: Can deploy as SPA + API or traditional Django
+
+## Implementation Phases
+
+### Phase 1: Structure Setup
+1. Create new directory structure
+2. Move Django code to `backend/`
+3. Initialize Vue.js frontend
+4. Set up basic API integration
+
+### Phase 2: Frontend Development
+1. Create Vue.js components for existing Django templates
+2. Implement routing and state management
+3. Integrate with Django API endpoints
+4. Add authentication flow
+
+### Phase 3: Build & Deploy
+1. Set up build processes
+2. Configure CI/CD pipelines
+3. Implement production deployment
+4. Performance optimization
+
+## Considerations and Trade-offs
+
+### Advantages
+- Modern development experience
+- Better code organization
+- Independent scaling
+- Rich frontend interactions
+- API-first architecture
+
+### Challenges
+- Increased complexity
+- Build process coordination
+- Authentication across services
+- SEO considerations (if needed)
+- Development environment setup
+
+## Next Steps
+
+1. **Validate Architecture**: Review with development team
+2. **Prototype Setup**: Create basic structure with sample components
+3. **Migration Planning**: Detailed plan for moving existing code
+4. **Tool Selection**: Finalize Vue.js ecosystem choices (Pinia vs. Vuex, etc.)
+5. **Implementation**: Begin phase-by-phase migration
+
+---
+
+This architecture provides a solid foundation for migrating ThrillWiki to a modern Django + Vue.js monorepo while preserving existing functionality and enabling future growth.

backend/.env.example

@@ -0,0 +1,31 @@
+# Django Configuration
+SECRET_KEY=your-secret-key-here
+DEBUG=True
+DJANGO_SETTINGS_MODULE=config.django.local
+
+# Database
+DATABASE_URL=postgresql://user:password@localhost:5432/thrillwiki
+
+# Redis
+REDIS_URL=redis://localhost:6379
+
+# Email Configuration (Optional)
+EMAIL_HOST=smtp.gmail.com
+EMAIL_PORT=587
+EMAIL_USE_TLS=True
+EMAIL_HOST_USER=your-email@gmail.com
+EMAIL_HOST_PASSWORD=your-app-password
+
+# Media and Static Files
+MEDIA_URL=/media/
+STATIC_URL=/static/
+
+# Security
+ALLOWED_HOSTS=localhost,127.0.0.1
+
+# API Configuration
+CORS_ALLOWED_ORIGINS=http://localhost:3000
+
+# Feature Flags
+ENABLE_DEBUG_TOOLBAR=True
+ENABLE_SILK_PROFILER=False

backend/README.md

@@ -0,0 +1,229 @@
+# ThrillWiki Backend
+
+Django REST API backend for the ThrillWiki monorepo.
+
+## 🏗️ Architecture
+
+This backend follows Django best practices with a modular app structure:
+
+```
+backend/
+├── apps/                 # Django applications
+│   ├── accounts/         # User management
+│   ├── parks/           # Theme park data
+│   ├── rides/           # Ride information
+│   ├── moderation/      # Content moderation
+│   ├── location/        # Geographic data
+│   ├── media/           # File management
+│   ├── email_service/   # Email functionality
+│   └── core/            # Core utilities
+├── config/              # Django configuration
+│   ├── django/          # Settings files
+│   └── settings/        # Modular settings
+├── templates/           # Django templates
+├── static/              # Static files
+└── tests/               # Test files
+```
+
+## 🛠️ Technology Stack
+
+- **Django 5.0+** - Web framework
+- **Django REST Framework** - API framework
+- **PostgreSQL** - Primary database
+- **Redis** - Caching and sessions
+- **UV** - Python package management
+- **Celery** - Background task processing
+
+## 🚀 Quick Start
+
+### Prerequisites
+
+- Python 3.11+
+- [uv](https://docs.astral.sh/uv/) package manager
+- PostgreSQL 14+
+- Redis 6+
+
+### Setup
+
+1. **Install dependencies**
+   ```bash
+   cd backend
+   uv sync
+   ```
+
+2. **Environment configuration**
+   ```bash
+   cp .env.example .env
+   # Edit .env with your settings
+   ```
+
+3. **Database setup**
+   ```bash
+   uv run manage.py migrate
+   uv run manage.py createsuperuser
+   ```
+
+4. **Start development server**
+   ```bash
+   uv run manage.py runserver
+   ```
+
+## 🔧 Configuration
+
+### Environment Variables
+
+Required environment variables:
+
+```bash
+# Database
+DATABASE_URL=postgresql://user:pass@localhost/thrillwiki
+
+# Django
+SECRET_KEY=your-secret-key
+DEBUG=True
+DJANGO_SETTINGS_MODULE=config.django.local
+
+# Redis
+REDIS_URL=redis://localhost:6379
+
+# Email (optional)
+EMAIL_HOST=smtp.gmail.com
+EMAIL_PORT=587
+EMAIL_USE_TLS=True
+EMAIL_HOST_USER=your-email@gmail.com
+EMAIL_HOST_PASSWORD=your-app-password
+```
+
+### Settings Structure
+
+- `config/django/base.py` - Base settings
+- `config/django/local.py` - Development settings
+- `config/django/production.py` - Production settings
+- `config/django/test.py` - Test settings
+
+## 📁 Apps Overview
+
+### Core Apps
+
+- **accounts** - User authentication and profile management
+- **parks** - Theme park models and operations
+- **rides** - Ride information and relationships
+- **core** - Shared utilities and base classes
+
+### Support Apps
+
+- **moderation** - Content moderation workflows
+- **location** - Geographic data and services
+- **media** - File upload and management
+- **email_service** - Email sending and templates
+
+## 🔌 API Endpoints
+
+Base URL: `http://localhost:8000/api/`
+
+### Authentication
+- `POST /auth/login/` - User login
+- `POST /auth/logout/` - User logout
+- `POST /auth/register/` - User registration
+
+### Parks
+- `GET /parks/` - List parks
+- `GET /parks/{id}/` - Park details
+- `POST /parks/` - Create park (admin)
+
+### Rides
+- `GET /rides/` - List rides
+- `GET /rides/{id}/` - Ride details
+- `GET /parks/{park_id}/rides/` - Rides by park
+
+## 🧪 Testing
+
+```bash
+# Run all tests
+uv run manage.py test
+
+# Run specific app tests
+uv run manage.py test apps.parks
+
+# Run with coverage
+uv run coverage run manage.py test
+uv run coverage report
+```
+
+## 🔧 Management Commands
+
+Custom management commands:
+
+```bash
+# Import park data
+uv run manage.py import_parks data/parks.json
+
+# Generate test data
+uv run manage.py generate_test_data
+
+# Clean up expired sessions
+uv run manage.py clearsessions
+```
+
+## 📊 Database
+
+### Entity Relationships
+
+- **Parks** have Operators (required) and PropertyOwners (optional)
+- **Rides** belong to Parks and may have Manufacturers/Designers
+- **Users** can create submissions and moderate content
+
+### Migrations
+
+```bash
+# Create migrations
+uv run manage.py makemigrations
+
+# Apply migrations
+uv run manage.py migrate
+
+# Show migration status
+uv run manage.py showmigrations
+```
+
+## 🔐 Security
+
+- CORS configured for frontend integration
+- CSRF protection enabled
+- JWT token authentication
+- Rate limiting on API endpoints
+- Input validation and sanitization
+
+## 📈 Performance
+
+- Database query optimization
+- Redis caching for frequent queries
+- Background task processing with Celery
+- Database connection pooling
+
+## 🚀 Deployment
+
+See the [Deployment Guide](../shared/docs/deployment/) for production setup.
+
+## 🐛 Debugging
+
+### Development Tools
+
+- Django Debug Toolbar
+- Django Extensions
+- Silk profiler for performance analysis
+
+### Logging
+
+Logs are written to:
+- Console (development)
+- Files in `logs/` directory (production)
+- External logging service (production)
+
+## 🤝 Contributing
+
+1. Follow Django coding standards
+2. Write tests for new features
+3. Update documentation
+4. Run linting: `uv run flake8 .`
+5. Format code: `uv run black .`

backend/apps/__init__.py

@@ -0,0 +1,6 @@
+"""
+Django apps package.
+
+This directory contains all Django applications for the ThrillWiki backend.
+Each app is self-contained and follows Django best practices.
+"""

backend/apps/accounts/adapters.py

@@ -6,18 +6,19 @@ 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):
         """
         Constructs the email confirmation (activation) url.
         """
-        site = get_current_site(request)
+        get_current_site(request)
         return f"{settings.LOGIN_REDIRECT_URL}verify-email?key={emailconfirmation.key}"
 
     def send_confirmation_mail(self, request, emailconfirmation, signup):
@@ -27,30 +28,31 @@ class CustomAccountAdapter(DefaultAccountAdapter):
         current_site = get_current_site(request)
         activate_url = self.get_email_confirmation_url(request, emailconfirmation)
         ctx = {
-            'user': emailconfirmation.email_address.user,
-            'activate_url': activate_url,
-            'current_site': current_site,
-            'key': emailconfirmation.key,
+            "user": emailconfirmation.email_address.user,
+            "activate_url": activate_url,
+            "current_site": current_site,
+            "key": emailconfirmation.key,
         }
         if signup:
-            email_template = 'account/email/email_confirmation_signup'
+            email_template = "account/email/email_confirmation_signup"
         else:
-            email_template = 'account/email/email_confirmation'
+            email_template = "account/email/email_confirmation"
         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):
         """
         Hook that can be used to further populate the user instance.
         """
         user = super().populate_user(request, sociallogin, data)
-        if sociallogin.account.provider == 'discord':
+        if sociallogin.account.provider == "discord":
             user.discord_id = sociallogin.account.uid
         return user
 

backend/apps/accounts/admin.py

@@ -0,0 +1,282 @@
+from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
+from django.utils.html import format_html
+from django.contrib.auth.models import Group
+from .models import User, UserProfile, EmailVerification, TopList, TopListItem
+
+
+class UserProfileInline(admin.StackedInline):
+    model = UserProfile
+    can_delete = False
+    verbose_name_plural = "Profile"
+    fieldsets = (
+        (
+            "Personal Info",
+            {"fields": ("display_name", "avatar", "pronouns", "bio")},
+        ),
+        (
+            "Social Media",
+            {"fields": ("twitter", "instagram", "youtube", "discord")},
+        ),
+        (
+            "Ride Credits",
+            {
+                "fields": (
+                    "coaster_credits",
+                    "dark_ride_credits",
+                    "flat_ride_credits",
+                    "water_ride_credits",
+                )
+            },
+        ),
+    )
+
+
+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",
+    )
+    search_fields = ("username", "email")
+    ordering = ("-date_joined",)
+    actions = [
+        "activate_users",
+        "deactivate_users",
+        "ban_users",
+        "unban_users",
+    ]
+    inlines = [UserProfileInline]
+
+    fieldsets = (
+        (None, {"fields": ("username", "password")}),
+        ("Personal info", {"fields": ("email", "pending_email")}),
+        (
+            "Roles and Permissions",
+            {
+                "fields": ("role", "groups", "user_permissions"),
+                "description": (
+                    "Role determines group membership. Groups determine permissions."
+                ),
+            },
+        ),
+        (
+            "Status",
+            {
+                "fields": ("is_active", "is_staff", "is_superuser"),
+                "description": "These are automatically managed based on role.",
+            },
+        ),
+        (
+            "Ban Status",
+            {
+                "fields": ("is_banned", "ban_reason", "ban_date"),
+            },
+        ),
+        (
+            "Preferences",
+            {
+                "fields": ("theme_preference",),
+            },
+        ),
+        ("Important dates", {"fields": ("last_login", "date_joined")}),
+    )
+    add_fieldsets = (
+        (
+            None,
+            {
+                "classes": ("wide",),
+                "fields": (
+                    "username",
+                    "email",
+                    "password1",
+                    "password2",
+                    "role",
+                ),
+            },
+        ),
+    )
+
+    @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(),
+        )
+
+    @admin.display(description="Status")
+    def get_status(self, obj):
+        if obj.is_banned:
+            return format_html('<span style="color: red;">Banned</span>')
+        if not obj.is_active:
+            return format_html('<span style="color: orange;">Inactive</span>')
+        if obj.is_superuser:
+            return format_html('<span style="color: purple;">Superuser</span>')
+        if obj.is_staff:
+            return format_html('<span style="color: blue;">Staff</span>')
+        return format_html('<span style="color: green;">Active</span>')
+
+    @admin.display(description="Ride Credits")
+    def get_credits(self, obj):
+        try:
+            profile = obj.profile
+            return format_html(
+                "RC: {}<br>DR: {}<br>FR: {}<br>WR: {}",
+                profile.coaster_credits,
+                profile.dark_ride_credits,
+                profile.flat_ride_credits,
+                profile.water_ride_credits,
+            )
+        except UserProfile.DoesNotExist:
+            return "-"
+
+    @admin.action(description="Activate selected users")
+    def activate_users(self, request, queryset):
+        queryset.update(is_active=True)
+
+    @admin.action(description="Deactivate selected users")
+    def deactivate_users(self, request, queryset):
+        queryset.update(is_active=False)
+
+    @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())
+
+    @admin.action(description="Unban selected users")
+    def unban_users(self, request, queryset):
+        queryset.update(is_banned=False, ban_date=None, ban_reason="")
+
+    def save_model(self, request, obj, form, change):
+        creating = not obj.pk
+        super().save_model(request, obj, form, change)
+        if creating and obj.role != User.Roles.USER:
+            # Ensure new user with role gets added to appropriate group
+            group = Group.objects.filter(name=obj.role).first()
+            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",
+    )
+    search_fields = ("user__username", "user__email", "display_name", "bio")
+
+    fieldsets = (
+        (
+            "User Information",
+            {"fields": ("user", "display_name", "avatar", "pronouns", "bio")},
+        ),
+        (
+            "Social Media",
+            {"fields": ("twitter", "instagram", "youtube", "discord")},
+        ),
+        (
+            "Ride Credits",
+            {
+                "fields": (
+                    "coaster_credits",
+                    "dark_ride_credits",
+                    "flat_ride_credits",
+                    "water_ride_credits",
+                )
+            },
+        ),
+    )
+
+
+@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")}),
+        ("Timing", {"fields": ("created_at", "last_sent")}),
+    )
+
+    @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>')
+
+
+@admin.register(TopList)
+class TopListAdmin(admin.ModelAdmin):
+    list_display = ("title", "user", "category", "created_at", "updated_at")
+    list_filter = ("category", "created_at", "updated_at")
+    search_fields = ("title", "user__username", "description")
+    inlines = [TopListItemInline]
+
+    fieldsets = (
+        (
+            "Basic Information",
+            {"fields": ("user", "title", "category", "description")},
+        ),
+        (
+            "Timestamps",
+            {"fields": ("created_at", "updated_at"), "classes": ("collapse",)},
+        ),
+    )
+    readonly_fields = ("created_at", "updated_at")
+
+
+@admin.register(TopListItem)
+class TopListItemAdmin(admin.ModelAdmin):
+    list_display = ("top_list", "content_type", "object_id", "rank")
+    list_filter = ("top_list__category", "rank")
+    search_fields = ("top_list__title", "notes")
+    ordering = ("top_list", "rank")
+
+    fieldsets = (
+        ("List Information", {"fields": ("top_list", "rank")}),
+        ("Item Details", {"fields": ("content_type", "object_id", "notes")}),
+    )

backend/apps/accounts/apps.py

@@ -3,7 +3,7 @@ from django.apps import AppConfig
 
 class AccountsConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "accounts"
+    name = "apps.accounts"
 
     def ready(self):
-        import accounts.signals  # noqa
+        import apps.accounts.signals  # noqa

backend/apps/accounts/management/commands/check_all_social_tables.py

@@ -0,0 +1,46 @@
+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"
+
+    def handle(self, *args, **options):
+        # Check SocialApp
+        self.stdout.write("\nChecking SocialApp table:")
+        for app in SocialApp.objects.all():
+            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}")
+
+        # Check SocialAccount
+        self.stdout.write("\nChecking SocialAccount table:")
+        for account in SocialAccount.objects.all():
+            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.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.pk}, Domain: {site.domain}, Name: {site.name}"
+            )

backend/apps/accounts/management/commands/check_social_apps.py

@@ -0,0 +1,27 @@
+from django.core.management.base import BaseCommand
+from allauth.socialaccount.models import SocialApp
+
+
+class Command(BaseCommand):
+    help = "Check social app configurations"
+
+    def handle(self, *args, **options):
+        social_apps = SocialApp.objects.all()
+
+        if not social_apps:
+            self.stdout.write(self.style.ERROR("No social apps found"))
+            return
+
+        for app in social_apps:
+            self.stdout.write(
+                self.style.SUCCESS(
+                    f"\nProvider: {
+                        app.provider}"
+                )
+            )
+            self.stdout.write(f"Name: {app.name}")
+            self.stdout.write(f"Client ID: {app.client_id}")
+            self.stdout.write(f"Secret: {app.secret}")
+            self.stdout.write(
+                f'Sites: {", ".join(str(site.domain) for site in app.sites.all())}'
+            )

backend/apps/accounts/management/commands/cleanup_social_auth.py

@@ -1,8 +1,9 @@
 from django.core.management.base import BaseCommand
 from django.db import connection
 
+
 class Command(BaseCommand):
-    help = 'Clean up social auth tables and migrations'
+    help = "Clean up social auth tables and migrations"
 
     def handle(self, *args, **options):
         with connection.cursor() as cursor:
@@ -11,12 +12,17 @@ class Command(BaseCommand):
             cursor.execute("DROP TABLE IF EXISTS socialaccount_socialapp_sites")
             cursor.execute("DROP TABLE IF EXISTS socialaccount_socialaccount")
             cursor.execute("DROP TABLE IF EXISTS socialaccount_socialtoken")
-            
+
             # Remove migration records
             cursor.execute("DELETE FROM django_migrations WHERE app='socialaccount'")
-            cursor.execute("DELETE FROM django_migrations WHERE app='accounts' AND name LIKE '%social%'")
-            
+            cursor.execute(
+                "DELETE FROM django_migrations WHERE app='accounts' "
+                "AND name LIKE '%social%'"
+            )
+
             # Reset sequences
             cursor.execute("DELETE FROM sqlite_sequence WHERE name LIKE '%social%'")
-            
-            self.stdout.write(self.style.SUCCESS('Successfully cleaned up social auth configuration'))
+
+            self.stdout.write(
+                self.style.SUCCESS("Successfully cleaned up social auth configuration")
+            )

backend/apps/accounts/management/commands/cleanup_test_data.py

@@ -1,10 +1,8 @@
 from django.core.management.base import BaseCommand
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Group
-from reviews.models import Review
-from parks.models import Park
-from rides.models import Ride
-from media.models import Photo
+from apps.parks.models import ParkReview, Park
+from apps.rides.models import Ride
+from apps.media.models import Photo
 
 User = get_user_model()
 
@@ -20,7 +18,9 @@ class Command(BaseCommand):
         self.stdout.write(self.style.SUCCESS(f"Deleted {count} test users"))
 
         # Delete test reviews
-        reviews = Review.objects.filter(user__username__in=["testuser", "moderator"])
+        reviews = ParkReview.objects.filter(
+            user__username__in=["testuser", "moderator"]
+        )
         count = reviews.count()
         reviews.delete()
         self.stdout.write(self.style.SUCCESS(f"Deleted {count} test reviews"))

backend/apps/accounts/management/commands/create_social_apps.py

@@ -0,0 +1,55 @@
+from django.core.management.base import BaseCommand
+from django.contrib.sites.models import Site
+from allauth.socialaccount.models import SocialApp
+
+
+class Command(BaseCommand):
+    help = "Create social apps for authentication"
+
+    def handle(self, *args, **options):
+        # Get the default site
+        site = Site.objects.get_or_create(
+            id=1,
+            defaults={
+                "domain": "localhost:8000",
+                "name": "ThrillWiki Development",
+            },
+        )[0]
+
+        # Create Discord app
+        discord_app, created = SocialApp.objects.get_or_create(
+            provider="discord",
+            defaults={
+                "name": "Discord",
+                "client_id": "1299112802274902047",
+                "secret": "ece7Pe_M4mD4mYzAgcINjTEKL_3ftL11",
+            },
+        )
+        if not created:
+            discord_app.client_id = "1299112802274902047"
+            discord_app.secret = "ece7Pe_M4mD4mYzAgcINjTEKL_3ftL11"
+            discord_app.save()
+        discord_app.sites.add(site)
+        self.stdout.write(f'{"Created" if created else "Updated"} Discord app')
+
+        # Create Google app
+        google_app, created = SocialApp.objects.get_or_create(
+            provider="google",
+            defaults={
+                "name": "Google",
+                "client_id": (
+                    "135166769591-nopcgmo0fkqfqfs9qe783a137mtmcrt2."
+                    "apps.googleusercontent.com"
+                ),
+                "secret": "GOCSPX-Wd_0Ue0Ue0Ue0Ue0Ue0Ue0Ue0Ue",
+            },
+        )
+        if not created:
+            google_app.client_id = (
+                "135166769591-nopcgmo0fkqfqfs9qe783a137mtmcrt2."
+                "apps.googleusercontent.com"
+            )
+            google_app.secret = "GOCSPX-Wd_0Ue0Ue0Ue0Ue0Ue0Ue0Ue0Ue"
+            google_app.save()
+        google_app.sites.add(site)
+        self.stdout.write(f'{"Created" if created else "Updated"} Google app')

backend/apps/accounts/management/commands/create_test_users.py

@@ -1,8 +1,5 @@
 from django.core.management.base import BaseCommand
-from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Group, Permission
-
-User = get_user_model()
+from django.contrib.auth.models import Group, Permission, User
 
 
 class Command(BaseCommand):
@@ -11,22 +8,25 @@ class Command(BaseCommand):
     def handle(self, *args, **kwargs):
         # Create regular test user
         if not User.objects.filter(username="testuser").exists():
-            user = User.objects.create_user(
+            user = User.objects.create(
                 username="testuser",
                 email="testuser@example.com",
-                [PASSWORD-REMOVED]",
             )
-            self.stdout.write(self.style.SUCCESS(f"Created test user: {user.username}"))
+            user.set_password("testpass123")
+            user.save()
+            self.stdout.write(
+                self.style.SUCCESS(f"Created test user: {user.get_username()}")
+            )
         else:
             self.stdout.write(self.style.WARNING("Test user already exists"))
 
-        # Create moderator user
         if not User.objects.filter(username="moderator").exists():
-            moderator = User.objects.create_user(
+            moderator = User.objects.create(
                 username="moderator",
                 email="moderator@example.com",
-                [PASSWORD-REMOVED]",
             )
+            moderator.set_password("modpass123")
+            moderator.save()
 
             # Create moderator group if it doesn't exist
             moderator_group, created = Group.objects.get_or_create(name="Moderators")
@@ -48,7 +48,9 @@ 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.get_username()}"
+                )
             )
         else:
             self.stdout.write(self.style.WARNING("Moderator user already exists"))

backend/apps/accounts/management/commands/fix_migration_history.py

@@ -0,0 +1,18 @@
+from django.core.management.base import BaseCommand
+from django.db import connection
+
+
+class Command(BaseCommand):
+    help = "Fix migration history by removing rides.0001_initial"
+
+    def handle(self, *args, **kwargs):
+        with connection.cursor() as cursor:
+            cursor.execute(
+                "DELETE FROM django_migrations WHERE app='rides' "
+                "AND name='0001_initial';"
+            )
+        self.stdout.write(
+            self.style.SUCCESS(
+                "Successfully removed rides.0001_initial from migration history"
+            )
+        )

backend/apps/accounts/management/commands/fix_social_apps.py

@@ -0,0 +1,41 @@
+from django.core.management.base import BaseCommand
+from allauth.socialaccount.models import SocialApp
+from django.contrib.sites.models import Site
+import os
+
+
+class Command(BaseCommand):
+    help = "Fix social app configurations"
+
+    def handle(self, *args, **options):
+        # Delete all existing social apps
+        SocialApp.objects.all().delete()
+        self.stdout.write("Deleted all existing social apps")
+
+        # Get the default site
+        site = Site.objects.get(id=1)
+
+        # Create Google provider
+        google_app = SocialApp.objects.create(
+            provider="google",
+            name="Google",
+            client_id=os.getenv("GOOGLE_CLIENT_ID"),
+            secret=os.getenv("GOOGLE_CLIENT_SECRET"),
+        )
+        google_app.sites.add(site)
+        self.stdout.write(
+            f"Created Google app with client_id: {
+                google_app.client_id}"
+        )
+
+        # Create Discord provider
+        discord_app = SocialApp.objects.create(
+            provider="discord",
+            name="Discord",
+            client_id=os.getenv("DISCORD_CLIENT_ID"),
+            secret=os.getenv("DISCORD_CLIENT_SECRET"),
+        )
+        discord_app.sites.add(site)
+        self.stdout.write(
+            f"Created Discord app with client_id: {discord_app.client_id}"
+        )

backend/apps/accounts/management/commands/generate_letter_avatars.py

@@ -2,6 +2,7 @@ from django.core.management.base import BaseCommand
 from PIL import Image, ImageDraw, ImageFont
 import os
 
+
 def generate_avatar(letter):
     """Generate an avatar for a given letter or number"""
     avatar_size = (100, 100)
@@ -10,7 +11,7 @@ def generate_avatar(letter):
     font_size = 100
 
     # Create a blank image with background color
-    image = Image.new('RGB', avatar_size, background_color)
+    image = Image.new("RGB", avatar_size, background_color)
     draw = ImageDraw.Draw(image)
 
     # Load a font
@@ -19,8 +20,14 @@ def generate_avatar(letter):
 
     # Calculate text size and position using textbbox
     text_bbox = draw.textbbox((0, 0), letter, font=font)
-    text_width, text_height = text_bbox[2] - text_bbox[0], text_bbox[3] - text_bbox[1]
-    text_position = ((avatar_size[0] - text_width) / 2, (avatar_size[1] - text_height) / 2)
+    text_width, text_height = (
+        text_bbox[2] - text_bbox[0],
+        text_bbox[3] - text_bbox[1],
+    )
+    text_position = (
+        (avatar_size[0] - text_width) / 2,
+        (avatar_size[1] - text_height) / 2,
+    )
 
     # Draw the text on the image
     draw.text(text_position, letter, font=font, fill=text_color)
@@ -34,11 +41,14 @@ def generate_avatar(letter):
     avatar_path = os.path.join(avatar_dir, f"{letter}_avatar.png")
     image.save(avatar_path)
 
+
 class Command(BaseCommand):
-    help = 'Generate avatars for letters A-Z and numbers 0-9'
+    help = "Generate avatars for letters A-Z and numbers 0-9"
 
     def handle(self, *args, **kwargs):
-        characters = [chr(i) for i in range(65, 91)] + [str(i) for i in range(10)]  # A-Z and 0-9
+        characters = [chr(i) for i in range(65, 91)] + [
+            str(i) for i in range(10)
+        ]  # A-Z and 0-9
         for char in characters:
             generate_avatar(char)
             self.stdout.write(self.style.SUCCESS(f"Generated avatar for {char}"))

backend/apps/accounts/management/commands/regenerate_avatars.py

@@ -0,0 +1,18 @@
+from django.core.management.base import BaseCommand
+from apps.accounts.models import UserProfile
+
+
+class Command(BaseCommand):
+    help = "Regenerate default avatars for users without an uploaded avatar"
+
+    def handle(self, *args, **kwargs):
+        profiles = UserProfile.objects.filter(avatar="")
+        for profile in profiles:
+            # This will trigger the avatar generation logic in the save method
+            profile.save()
+            self.stdout.write(
+                self.style.SUCCESS(
+                    f"Regenerated avatar for {
+                        profile.user.username}"
+                )
+            )

backend/apps/accounts/management/commands/reset_db.py

@@ -3,66 +3,87 @@ 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'
+    help = "Reset database and create admin user"
 
     def handle(self, *args, **options):
-        self.stdout.write('Resetting database...')
+        self.stdout.write("Resetting database...")
 
         # Drop all tables
         with connection.cursor() as cursor:
-            cursor.execute("""
+            cursor.execute(
+                """
                 DO $$ DECLARE
                     r RECORD;
                 BEGIN
-                    FOR r IN (SELECT tablename FROM pg_tables WHERE schemaname = current_schema()) LOOP
-                        EXECUTE 'DROP TABLE IF EXISTS ' || quote_ident(r.tablename) || ' CASCADE';
+                    FOR r IN (
+                        SELECT tablename FROM pg_tables
+                        WHERE schemaname = current_schema()
+                    ) LOOP
+                        EXECUTE 'DROP TABLE IF EXISTS ' || \
+                                quote_ident(r.tablename) || ' CASCADE';
                     END LOOP;
                 END $$;
-            """)
+            """
+            )
 
             # Reset sequences
-            cursor.execute("""
+            cursor.execute(
+                """
                 DO $$ DECLARE
                     r RECORD;
                 BEGIN
-                    FOR r IN (SELECT sequencename FROM pg_sequences WHERE schemaname = current_schema()) LOOP
-                        EXECUTE 'ALTER SEQUENCE ' || quote_ident(r.sequencename) || ' RESTART WITH 1';
+                    FOR r IN (
+                        SELECT sequencename FROM pg_sequences
+                        WHERE schemaname = current_schema()
+                    ) LOOP
+                        EXECUTE 'ALTER SEQUENCE ' || \
+                                quote_ident(r.sequencename) || ' RESTART WITH 1';
                     END LOOP;
                 END $$;
-            """)
+            """
+            )
 
-        self.stdout.write('All tables dropped and sequences reset.')
+        self.stdout.write("All tables dropped and sequences reset.")
 
         # Run migrations
         from django.core.management import call_command
-        call_command('migrate')
 
-        self.stdout.write('Migrations applied.')
+        call_command("migrate")
+
+        self.stdout.write("Migrations applied.")
 
         # Create superuser using raw SQL
         try:
             with connection.cursor() as cursor:
                 # Create user
                 user_id = str(uuid.uuid4())[:10]
-                cursor.execute("""
+                cursor.execute(
+                    """
                     INSERT INTO accounts_user (
-                        username, password, email, is_superuser, is_staff, 
-                        is_active, date_joined, user_id, first_name, 
-                        last_name, role, is_banned, ban_reason, 
+                        username, password, email, is_superuser, is_staff,
+                        is_active, date_joined, user_id, first_name,
+                        last_name, role, is_banned, ban_reason,
                         theme_preference
                     ) VALUES (
                         'admin', %s, 'admin@thrillwiki.com', true, true,
                         true, NOW(), %s, '', '', 'SUPERUSER', false, '',
                         'light'
                     ) RETURNING id;
-                """, [make_password('admin'), user_id])
-                
-                user_db_id = cursor.fetchone()[0]
+                """,
+                    [make_password("admin"), user_id],
+                )
+
+                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]
-                cursor.execute("""
+                cursor.execute(
+                    """
                     INSERT INTO accounts_userprofile (
                         profile_id, display_name, pronouns, bio,
                         twitter, instagram, youtube, discord,
@@ -75,11 +96,18 @@ class Command(BaseCommand):
                         0, 0, 0, 0,
                         %s, ''
                     );
-                """, [profile_id, user_db_id])
+                """,
+                    [profile_id, user_db_id],
+                )
 
-            self.stdout.write('Superuser created.')
+            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.'))
+        self.stdout.write(self.style.SUCCESS("Database reset complete."))

backend/apps/accounts/management/commands/reset_social_apps.py

@@ -3,34 +3,37 @@ from allauth.socialaccount.models import SocialApp
 from django.contrib.sites.models import Site
 from django.db import connection
 
+
 class Command(BaseCommand):
-    help = 'Reset social apps configuration'
+    help = "Reset social apps configuration"
 
     def handle(self, *args, **options):
         # Delete all social apps using raw SQL to bypass Django's ORM
         with connection.cursor() as cursor:
             cursor.execute("DELETE FROM socialaccount_socialapp_sites")
             cursor.execute("DELETE FROM socialaccount_socialapp")
-        
+
         # Get the default site
         site = Site.objects.get(id=1)
-        
+
         # Create Discord app
         discord_app = SocialApp.objects.create(
-            provider='discord',
-            name='Discord',
-            client_id='1299112802274902047',
-            secret='ece7Pe_M4mD4mYzAgcINjTEKL_3ftL11',
+            provider="discord",
+            name="Discord",
+            client_id="1299112802274902047",
+            secret="ece7Pe_M4mD4mYzAgcINjTEKL_3ftL11",
         )
         discord_app.sites.add(site)
-        self.stdout.write(f'Created Discord app with ID: {discord_app.id}')
-        
+        self.stdout.write(f"Created Discord app with ID: {discord_app.pk}")
+
         # Create Google app
         google_app = SocialApp.objects.create(
-            provider='google',
-            name='Google',
-            client_id='135166769591-nopcgmo0fkqfqfs9qe783a137mtmcrt2.apps.googleusercontent.com',
-            secret='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',
+            provider="google",
+            name="Google",
+            client_id=(
+                "135166769591-nopcgmo0fkqfqfs9qe783a137mtmcrt2.apps.googleusercontent.com"
+            ),
+            secret="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",
         )
         google_app.sites.add(site)
-        self.stdout.write(f'Created Google app with ID: {google_app.id}')
+        self.stdout.write(f"Created Google app with ID: {google_app.pk}")

backend/apps/accounts/management/commands/reset_social_auth.py

@@ -0,0 +1,24 @@
+from django.core.management.base import BaseCommand
+from django.db import connection
+
+
+class Command(BaseCommand):
+    help = "Reset social auth configuration"
+
+    def handle(self, *args, **options):
+        with connection.cursor() as cursor:
+            # Delete all social apps
+            cursor.execute("DELETE FROM socialaccount_socialapp")
+            cursor.execute("DELETE FROM socialaccount_socialapp_sites")
+
+            # Reset sequences
+            cursor.execute(
+                "DELETE FROM sqlite_sequence WHERE name='socialaccount_socialapp'"
+            )
+            cursor.execute(
+                "DELETE FROM sqlite_sequence WHERE name='socialaccount_socialapp_sites'"
+            )
+
+            self.stdout.write(
+                self.style.SUCCESS("Successfully reset social auth configuration")
+            )

backend/apps/accounts/management/commands/setup_groups.py

@@ -1,26 +1,26 @@
 from django.core.management.base import BaseCommand
-from django.contrib.auth.models import Group, Permission
-from django.contrib.contenttypes.models import ContentType
-from accounts.models import User
-from accounts.signals import create_default_groups
+from django.contrib.auth.models import Group
+from apps.accounts.models import User
+from apps.accounts.signals import create_default_groups
+
 
 class Command(BaseCommand):
-    help = 'Set up default groups and permissions for user roles'
+    help = "Set up default groups and permissions for user roles"
 
     def handle(self, *args, **options):
-        self.stdout.write('Creating default groups and permissions...')
-        
+        self.stdout.write("Creating default groups and permissions...")
+
         try:
             # Create default groups with permissions
             create_default_groups()
-            
+
             # Sync existing users with groups based on their roles
             users = User.objects.exclude(role=User.Roles.USER)
             for user in users:
                 group = Group.objects.filter(name=user.role).first()
                 if group:
                     user.groups.add(group)
-                    
+
                     # Update staff/superuser status based on role
                     if user.role == User.Roles.SUPERUSER:
                         user.is_superuser = True
@@ -28,15 +28,22 @@ class Command(BaseCommand):
                     elif user.role in [User.Roles.ADMIN, User.Roles.MODERATOR]:
                         user.is_staff = True
                     user.save()
-            
-            self.stdout.write(self.style.SUCCESS('Successfully set up groups and permissions'))
-            
+
+            self.stdout.write(
+                self.style.SUCCESS("Successfully set up groups and permissions")
+            )
+
             # Print summary
             for group in Group.objects.all():
-                self.stdout.write(f'\nGroup: {group.name}')
-                self.stdout.write('Permissions:')
+                self.stdout.write(f"\nGroup: {group.name}")
+                self.stdout.write("Permissions:")
                 for perm in group.permissions.all():
-                    self.stdout.write(f'  - {perm.codename}')
-                
+                    self.stdout.write(f"  - {perm.codename}")
+
         except Exception as e:
-            self.stdout.write(self.style.ERROR(f'Error setting up groups: {str(e)}'))
+            self.stdout.write(
+                self.style.ERROR(
+                    f"Error setting up groups: {
+                        str(e)}"
+                )
+            )

backend/apps/accounts/management/commands/setup_site.py

@@ -1,17 +1,16 @@
 from django.core.management.base import BaseCommand
 from django.contrib.sites.models import Site
 
+
 class Command(BaseCommand):
-    help = 'Set up default site'
+    help = "Set up default site"
 
     def handle(self, *args, **options):
         # Delete any existing sites
         Site.objects.all().delete()
-        
+
         # Create default site
         site = Site.objects.create(
-            id=1,
-            domain='localhost:8000',
-            name='ThrillWiki Development'
+            id=1, domain="localhost:8000", name="ThrillWiki Development"
         )
-        self.stdout.write(self.style.SUCCESS(f'Created site: {site.domain}'))
+        self.stdout.write(self.style.SUCCESS(f"Created site: {site.domain}"))

backend/apps/accounts/management/commands/setup_social_auth.py

@@ -0,0 +1,126 @@
+from django.core.management.base import BaseCommand
+from django.contrib.sites.models import Site
+from allauth.socialaccount.models import SocialApp
+from dotenv import load_dotenv
+import os
+
+
+class Command(BaseCommand):
+    help = "Sets up social authentication apps"
+
+    def handle(self, *args, **kwargs):
+        # Load environment variables
+        load_dotenv()
+
+        # Get environment variables
+        google_client_id = os.getenv("GOOGLE_CLIENT_ID")
+        google_client_secret = os.getenv("GOOGLE_CLIENT_SECRET")
+        discord_client_id = os.getenv("DISCORD_CLIENT_ID")
+        discord_client_secret = os.getenv("DISCORD_CLIENT_SECRET")
+
+        # DEBUG: Log environment variable values
+        self.stdout.write(
+            f"DEBUG: google_client_id type: {
+                type(google_client_id)}, value: {google_client_id}"
+        )
+        self.stdout.write(
+            f"DEBUG: google_client_secret type: {
+                type(google_client_secret)}, value: {google_client_secret}"
+        )
+        self.stdout.write(
+            f"DEBUG: discord_client_id type: {
+                type(discord_client_id)}, value: {discord_client_id}"
+        )
+        self.stdout.write(
+            f"DEBUG: discord_client_secret type: {
+                type(discord_client_secret)}, value: {discord_client_secret}"
+        )
+
+        if not all(
+            [
+                google_client_id,
+                google_client_secret,
+                discord_client_id,
+                discord_client_secret,
+            ]
+        ):
+            self.stdout.write(
+                self.style.ERROR("Missing required environment variables")
+            )
+            self.stdout.write(
+                f"DEBUG: google_client_id is None: {google_client_id is None}"
+            )
+            self.stdout.write(
+                f"DEBUG: google_client_secret is None: {
+                    google_client_secret is None}"
+            )
+            self.stdout.write(
+                f"DEBUG: discord_client_id is None: {
+                    discord_client_id is None}"
+            )
+            self.stdout.write(
+                f"DEBUG: discord_client_secret is None: {
+                    discord_client_secret is None}"
+            )
+            return
+
+        # Get or create the default site
+        site, _ = Site.objects.get_or_create(
+            id=1, defaults={"domain": "localhost:8000", "name": "localhost"}
+        )
+
+        # Set up Google
+        google_app, created = SocialApp.objects.get_or_create(
+            provider="google",
+            defaults={
+                "name": "Google",
+                "client_id": google_client_id,
+                "secret": google_client_secret,
+            },
+        )
+        if not created:
+            self.stdout.write(
+                f"DEBUG: About to assign google_client_id: {google_client_id} (type: {
+                    type(google_client_id)})"
+            )
+            if google_client_id is not None and google_client_secret is not None:
+                google_app.client_id = google_client_id
+                google_app.secret = google_client_secret
+                google_app.save()
+                self.stdout.write("DEBUG: Successfully updated Google app")
+            else:
+                self.stdout.write(
+                    self.style.ERROR(
+                        "Google client_id or secret is None, skipping update."
+                    )
+                )
+        google_app.sites.add(site)
+
+        # Set up Discord
+        discord_app, created = SocialApp.objects.get_or_create(
+            provider="discord",
+            defaults={
+                "name": "Discord",
+                "client_id": discord_client_id,
+                "secret": discord_client_secret,
+            },
+        )
+        if not created:
+            self.stdout.write(
+                f"DEBUG: About to assign discord_client_id: {discord_client_id} (type: {
+                    type(discord_client_id)})"
+            )
+            if discord_client_id is not None and discord_client_secret is not None:
+                discord_app.client_id = discord_client_id
+                discord_app.secret = discord_client_secret
+                discord_app.save()
+                self.stdout.write("DEBUG: Successfully updated Discord app")
+            else:
+                self.stdout.write(
+                    self.style.ERROR(
+                        "Discord client_id or secret is None, skipping update."
+                    )
+                )
+        discord_app.sites.add(site)
+
+        self.stdout.write(self.style.SUCCESS("Successfully set up social auth apps"))

backend/apps/accounts/management/commands/setup_social_auth_admin.py

@@ -1,35 +1,43 @@
 from django.core.management.base import BaseCommand
 from django.contrib.sites.models import Site
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Permission
-from allauth.socialaccount.models import SocialApp
 
 User = get_user_model()
 
+
 class Command(BaseCommand):
-    help = 'Set up social authentication through admin interface'
+    help = "Set up social authentication through admin interface"
 
     def handle(self, *args, **options):
         # Get or create the default site
         site, _ = Site.objects.get_or_create(
             id=1,
             defaults={
-                'domain': 'localhost:8000',
-                'name': 'ThrillWiki Development'
-            }
+                "domain": "localhost:8000",
+                "name": "ThrillWiki Development",
+            },
         )
         if not _:
-            site.domain = 'localhost:8000'
-            site.name = 'ThrillWiki Development'
+            site.domain = "localhost:8000"
+            site.name = "ThrillWiki Development"
             site.save()
         self.stdout.write(f'{"Created" if _ else "Updated"} site: {site.domain}')
 
         # Create superuser if it doesn't exist
-        if not User.objects.filter(username='admin').exists():
-            User.objects.create_superuser('admin', 'admin@example.com', 'admin')
-            self.stdout.write('Created superuser: admin/admin')
+        if not User.objects.filter(username="admin").exists():
+            admin_user = User.objects.create(
+                username="admin",
+                email="admin@example.com",
+                is_staff=True,
+                is_superuser=True,
+            )
+            admin_user.set_password("admin")
+            admin_user.save()
+            self.stdout.write("Created superuser: admin/admin")
 
-        self.stdout.write(self.style.SUCCESS('''
+        self.stdout.write(
+            self.style.SUCCESS(
+                """
 Social auth setup instructions:
 
 1. Run the development server:
@@ -57,4 +65,6 @@ Social auth setup instructions:
      Client id: 135166769591-nopcgmo0fkqfqfs9qe783a137mtmcrt2.apps.googleusercontent.com
      Secret key: GOCSPX-Wd_0Ue0Ue0Ue0Ue0Ue0Ue0Ue0Ue
      Sites: Add "localhost:8000"
-'''))
+"""
+            )
+        )

backend/apps/accounts/management/commands/test_discord_auth.py

@@ -0,0 +1,61 @@
+from django.core.management.base import BaseCommand
+from django.test import Client
+from allauth.socialaccount.models import SocialApp
+
+
+class Command(BaseCommand):
+    help = "Test Discord OAuth2 authentication flow"
+
+    def handle(self, *args, **options):
+        client = Client(HTTP_HOST="localhost:8000")
+
+        # Get Discord app
+        try:
+            discord_app = SocialApp.objects.get(provider="discord")
+            self.stdout.write("Found Discord app configuration:")
+            self.stdout.write(f"Client ID: {discord_app.client_id}")
+
+            # Test login URL
+            login_url = "/accounts/discord/login/"
+            response = client.get(login_url, HTTP_HOST="localhost:8000")
+            self.stdout.write(f"\nTesting login URL: {login_url}")
+            self.stdout.write(f"Status code: {response.status_code}")
+
+            if response.status_code == 302:
+                redirect_url = response["Location"]
+                self.stdout.write(f"Redirects to: {redirect_url}")
+
+                # Parse OAuth2 parameters
+                self.stdout.write("\nOAuth2 Parameters:")
+                if "client_id=" in redirect_url:
+                    self.stdout.write("✓ client_id parameter present")
+                if "redirect_uri=" in redirect_url:
+                    self.stdout.write("✓ redirect_uri parameter present")
+                if "scope=" in redirect_url:
+                    self.stdout.write("✓ scope parameter present")
+                if "response_type=" in redirect_url:
+                    self.stdout.write("✓ response_type parameter present")
+                if "code_challenge=" in redirect_url:
+                    self.stdout.write("✓ PKCE enabled (code_challenge present)")
+
+            # Show callback URL
+            callback_url = "http://localhost:8000/accounts/discord/login/callback/"
+            self.stdout.write(
+                "\nCallback URL to configure in Discord Developer Portal:"
+            )
+            self.stdout.write(callback_url)
+
+            # Show frontend login URL
+            frontend_url = "http://localhost:5173"
+            self.stdout.write("\nFrontend configuration:")
+            self.stdout.write(f"Frontend URL: {frontend_url}")
+            self.stdout.write("Discord login button should use:")
+            self.stdout.write("/accounts/discord/login/?process=login")
+
+            # Show allauth URLs
+            self.stdout.write("\nAllauth URLs:")
+            self.stdout.write("Login URL: /accounts/discord/login/?process=login")
+            self.stdout.write("Callback URL: /accounts/discord/login/callback/")
+
+        except SocialApp.DoesNotExist:
+            self.stdout.write(self.style.ERROR("Discord app not found"))

backend/apps/accounts/management/commands/update_social_apps_sites.py

@@ -2,19 +2,22 @@ from django.core.management.base import BaseCommand
 from allauth.socialaccount.models import SocialApp
 from django.contrib.sites.models import Site
 
+
 class Command(BaseCommand):
-    help = 'Update social apps to be associated with all sites'
+    help = "Update social apps to be associated with all sites"
 
     def handle(self, *args, **options):
         # Get all sites
         sites = Site.objects.all()
-        
+
         # Update each social app
         for app in SocialApp.objects.all():
-            self.stdout.write(f'Updating {app.provider} app...')
+            self.stdout.write(f"Updating {app.provider} app...")
             # Clear existing sites
             app.sites.clear()
             # Add all sites
             for site in sites:
                 app.sites.add(site)
-            self.stdout.write(f'Added sites: {", ".join(site.domain for site in sites)}')
+            self.stdout.write(
+                f'Added sites: {", ".join(site.domain for site in sites)}'
+            )

backend/apps/accounts/management/commands/verify_discord_settings.py

@@ -0,0 +1,42 @@
+from django.core.management.base import BaseCommand
+from allauth.socialaccount.models import SocialApp
+from django.conf import settings
+
+
+class Command(BaseCommand):
+    help = "Verify Discord OAuth2 settings"
+
+    def handle(self, *args, **options):
+        # Get Discord app
+        try:
+            discord_app = SocialApp.objects.get(provider="discord")
+            self.stdout.write("Found Discord app configuration:")
+            self.stdout.write(f"Client ID: {discord_app.client_id}")
+            self.stdout.write(f"Secret: {discord_app.secret}")
+
+            # Get sites
+            sites = discord_app.sites.all()
+            self.stdout.write("\nAssociated sites:")
+            for site in sites:
+                self.stdout.write(f"- {site.domain} ({site.name})")
+
+            # Show callback URL
+            callback_url = "http://localhost:8000/accounts/discord/login/callback/"
+            self.stdout.write(
+                "\nCallback URL to configure in Discord Developer Portal:"
+            )
+            self.stdout.write(callback_url)
+
+            # Show OAuth2 settings
+            self.stdout.write("\nOAuth2 settings in settings.py:")
+            discord_settings = settings.SOCIALACCOUNT_PROVIDERS.get("discord", {})
+            self.stdout.write(
+                f'PKCE Enabled: {
+                    discord_settings.get(
+                        "OAUTH_PKCE_ENABLED",
+                        False)}'
+            )
+            self.stdout.write(f'Scopes: {discord_settings.get("SCOPE", [])}')
+
+        except SocialApp.DoesNotExist:
+            self.stdout.write(self.style.ERROR("Discord app not found"))

backend/apps/accounts/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.4 on 2025-02-10 01:10
+# Generated by Django 5.1.4 on 2025-08-13 21:35
 
 import django.contrib.auth.models
 import django.contrib.auth.validators
@@ -33,7 +33,10 @@ class Migration(migrations.Migration):
                         verbose_name="ID",
                     ),
                 ),
-                ("password", models.CharField(max_length=128, verbose_name="password")),
+                (
+                    "password",
+                    models.CharField(max_length=128, verbose_name="password"),
+                ),
                 (
                     "last_login",
                     models.DateTimeField(
@@ -78,7 +81,9 @@ class Migration(migrations.Migration):
                 (
                     "email",
                     models.EmailField(
-                        blank=True, max_length=254, verbose_name="email address"
+                        blank=True,
+                        max_length=254,
+                        verbose_name="email address",
                     ),
                 ),
                 (
@@ -100,7 +105,8 @@ class Migration(migrations.Migration):
                 (
                     "date_joined",
                     models.DateTimeField(
-                        default=django.utils.timezone.now, verbose_name="date joined"
+                        default=django.utils.timezone.now,
+                        verbose_name="date joined",
                     ),
                 ),
                 (
@@ -232,7 +238,15 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name="TopList",
             fields=[
-                ("id", models.BigAutoField(primary_key=True, serialize=False)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
                 ("title", models.CharField(max_length=100)),
                 (
                     "category",
@@ -266,7 +280,10 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name="TopListEvent",
             fields=[
-                ("pgh_id", models.AutoField(primary_key=True, serialize=False)),
+                (
+                    "pgh_id",
+                    models.AutoField(primary_key=True, serialize=False),
+                ),
                 ("pgh_created_at", models.DateTimeField(auto_now_add=True)),
                 ("pgh_label", models.TextField(help_text="The event label.")),
                 ("id", models.BigIntegerField()),
@@ -324,7 +341,17 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name="TopListItem",
             fields=[
-                ("id", models.BigAutoField(primary_key=True, serialize=False)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
                 ("object_id", models.PositiveIntegerField()),
                 ("rank", models.PositiveIntegerField()),
                 ("notes", models.TextField(blank=True)),
@@ -351,10 +378,15 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name="TopListItemEvent",
             fields=[
-                ("pgh_id", models.AutoField(primary_key=True, serialize=False)),
+                (
+                    "pgh_id",
+                    models.AutoField(primary_key=True, serialize=False),
+                ),
                 ("pgh_created_at", models.DateTimeField(auto_now_add=True)),
                 ("pgh_label", models.TextField(help_text="The event label.")),
                 ("id", models.BigIntegerField()),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
                 ("object_id", models.PositiveIntegerField()),
                 ("rank", models.PositiveIntegerField()),
                 ("notes", models.TextField(blank=True)),
@@ -431,7 +463,10 @@ class Migration(migrations.Migration):
                         unique=True,
                     ),
                 ),
-                ("avatar", models.ImageField(blank=True, upload_to="avatars/")),
+                (
+                    "avatar",
+                    models.ImageField(blank=True, upload_to="avatars/"),
+                ),
                 ("pronouns", models.CharField(blank=True, max_length=50)),
                 ("bio", models.TextField(blank=True, max_length=500)),
                 ("twitter", models.URLField(blank=True)),
@@ -490,7 +525,7 @@ class Migration(migrations.Migration):
             trigger=pgtrigger.compiler.Trigger(
                 name="insert_insert",
                 sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "accounts_toplistitemevent" ("content_type_id", "id", "notes", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "rank", "top_list_id") VALUES (NEW."content_type_id", NEW."id", NEW."notes", NEW."object_id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."rank", NEW."top_list_id"); RETURN NULL;',
+                    func='INSERT INTO "accounts_toplistitemevent" ("content_type_id", "created_at", "id", "notes", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "rank", "top_list_id", "updated_at") VALUES (NEW."content_type_id", NEW."created_at", NEW."id", NEW."notes", NEW."object_id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."rank", NEW."top_list_id", NEW."updated_at"); RETURN NULL;',
                     hash="[AWS-SECRET-REMOVED]",
                     operation="INSERT",
                     pgid="pgtrigger_insert_insert_56dfc",
@@ -505,7 +540,7 @@ class Migration(migrations.Migration):
                 name="update_update",
                 sql=pgtrigger.compiler.UpsertTriggerSql(
                     condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "accounts_toplistitemevent" ("content_type_id", "id", "notes", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "rank", "top_list_id") VALUES (NEW."content_type_id", NEW."id", NEW."notes", NEW."object_id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."rank", NEW."top_list_id"); RETURN NULL;',
+                    func='INSERT INTO "accounts_toplistitemevent" ("content_type_id", "created_at", "id", "notes", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "rank", "top_list_id", "updated_at") VALUES (NEW."content_type_id", NEW."created_at", NEW."id", NEW."notes", NEW."object_id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."rank", NEW."top_list_id", NEW."updated_at"); RETURN NULL;',
                     hash="[AWS-SECRET-REMOVED]",
                     operation="UPDATE",
                     pgid="pgtrigger_update_update_2b6e3",

backend/apps/accounts/mixins.py

@@ -2,11 +2,13 @@ import requests
 from django.conf import settings
 from django.core.exceptions import ValidationError
 
+
 class TurnstileMixin:
     """
     Mixin to handle Cloudflare Turnstile validation.
     Bypasses validation when DEBUG is True.
     """
+
     def validate_turnstile(self, request):
         """
         Validate the Turnstile response token.
@@ -14,20 +16,20 @@ class TurnstileMixin:
         """
         if settings.DEBUG:
             return
-            
-        token = request.POST.get('cf-turnstile-response')
+
+        token = request.POST.get("cf-turnstile-response")
         if not token:
-            raise ValidationError('Please complete the Turnstile challenge.')
+            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'),
+            "secret": settings.TURNSTILE_SECRET_KEY,
+            "response": token,
+            "remoteip": request.META.get("REMOTE_ADDR"),
         }
 
         response = requests.post(settings.TURNSTILE_VERIFY_URL, data=data, timeout=60)
         result = response.json()
 
-        if not result.get('success'):
-            raise ValidationError('Turnstile validation failed. Please try again.')
+        if not result.get("success"):
+            raise ValidationError("Turnstile validation failed. Please try again.")

backend/apps/accounts/models.py

@@ -0,0 +1,219 @@
+from django.contrib.auth.models import AbstractUser
+from django.db import models
+from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
+import os
+import secrets
+from apps.core.history import TrackedModel
+
+# import pghistory
+
+
+def generate_random_id(model_class, id_field):
+    """Generate a random ID starting at 4 digits, expanding to 5 if needed"""
+    while True:
+        # Try to get a 4-digit number first
+        new_id = str(secrets.SystemRandom().randint(1000, 9999))
+        if not model_class.objects.filter(**{id_field: new_id}).exists():
+            return new_id
+
+        # If all 4-digit numbers are taken, try 5 digits
+        new_id = str(secrets.SystemRandom().randint(10000, 99999))
+        if not model_class.objects.filter(**{id_field: new_id}).exists():
+            return new_id
+
+
+class User(AbstractUser):
+    class Roles(models.TextChoices):
+        USER = "USER", _("User")
+        MODERATOR = "MODERATOR", _("Moderator")
+        ADMIN = "ADMIN", _("Admin")
+        SUPERUSER = "SUPERUSER", _("Superuser")
+
+    class ThemePreference(models.TextChoices):
+        LIGHT = "light", _("Light")
+        DARK = "dark", _("Dark")
+
+    # Read-only ID
+    user_id = models.CharField(
+        max_length=10,
+        unique=True,
+        editable=False,
+        help_text=(
+            "Unique identifier for this user that remains constant even if the "
+            "username changes"
+        ),
+    )
+
+    role = models.CharField(
+        max_length=10,
+        choices=Roles.choices,
+        default=Roles.USER,
+    )
+    is_banned = models.BooleanField(default=False)
+    ban_reason = models.TextField(blank=True)
+    ban_date = models.DateTimeField(null=True, blank=True)
+    pending_email = models.EmailField(blank=True, null=True)
+    theme_preference = models.CharField(
+        max_length=5,
+        choices=ThemePreference.choices,
+        default=ThemePreference.LIGHT,
+    )
+
+    def __str__(self):
+        return self.get_display_name()
+
+    def get_absolute_url(self):
+        return reverse("profile", kwargs={"username": self.username})
+
+    def get_display_name(self):
+        """Get the user's display name, falling back to username if not set"""
+        profile = getattr(self, "profile", None)
+        if profile and profile.display_name:
+            return profile.display_name
+        return self.username
+
+    def save(self, *args, **kwargs):
+        if not self.user_id:
+            self.user_id = generate_random_id(User, "user_id")
+        super().save(*args, **kwargs)
+
+
+class UserProfile(models.Model):
+    # Read-only ID
+    profile_id = models.CharField(
+        max_length=10,
+        unique=True,
+        editable=False,
+        help_text="Unique identifier for this profile that remains constant",
+    )
+
+    user = models.OneToOneField(User, on_delete=models.CASCADE, related_name="profile")
+    display_name = models.CharField(
+        max_length=50,
+        unique=True,
+        help_text="This is the name that will be displayed on the site",
+    )
+    avatar = models.ImageField(upload_to="avatars/", blank=True)
+    pronouns = models.CharField(max_length=50, blank=True)
+
+    bio = models.TextField(max_length=500, blank=True)
+
+    # Social media links
+    twitter = models.URLField(blank=True)
+    instagram = models.URLField(blank=True)
+    youtube = models.URLField(blank=True)
+    discord = models.CharField(max_length=100, blank=True)
+
+    # Ride statistics
+    coaster_credits = models.IntegerField(default=0)
+    dark_ride_credits = models.IntegerField(default=0)
+    flat_ride_credits = models.IntegerField(default=0)
+    water_ride_credits = models.IntegerField(default=0)
+
+    def get_avatar(self):
+        """
+        Return the avatar URL or serve a pre-generated avatar based on the
+        first letter of the username
+        """
+        if self.avatar:
+            return self.avatar.url
+        first_letter = self.user.username.upper()
+        avatar_path = f"avatars/letters/{first_letter}_avatar.png"
+        if os.path.exists(avatar_path):
+            return f"/{avatar_path}"
+        return "/static/images/default-avatar.png"
+
+    def save(self, *args, **kwargs):
+        # If no display name is set, use the username
+        if not self.display_name:
+            self.display_name = self.user.username
+
+        if not self.profile_id:
+            self.profile_id = generate_random_id(UserProfile, "profile_id")
+        super().save(*args, **kwargs)
+
+    def __str__(self):
+        return self.display_name
+
+
+class EmailVerification(models.Model):
+    user = models.OneToOneField(User, on_delete=models.CASCADE)
+    token = models.CharField(max_length=64, unique=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+    last_sent = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return f"Email verification for {self.user.username}"
+
+    class Meta:
+        verbose_name = "Email Verification"
+        verbose_name_plural = "Email Verifications"
+
+
+class PasswordReset(models.Model):
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    token = models.CharField(max_length=64)
+    created_at = models.DateTimeField(auto_now_add=True)
+    expires_at = models.DateTimeField()
+    used = models.BooleanField(default=False)
+
+    def __str__(self):
+        return f"Password reset for {self.user.username}"
+
+    class Meta:
+        verbose_name = "Password Reset"
+        verbose_name_plural = "Password Resets"
+
+
+# @pghistory.track()
+
+
+class TopList(TrackedModel):
+    class Categories(models.TextChoices):
+        ROLLER_COASTER = "RC", _("Roller Coaster")
+        DARK_RIDE = "DR", _("Dark Ride")
+        FLAT_RIDE = "FR", _("Flat Ride")
+        WATER_RIDE = "WR", _("Water Ride")
+        PARK = "PK", _("Park")
+
+    user = models.ForeignKey(
+        User,
+        on_delete=models.CASCADE,
+        related_name="top_lists",  # Added related_name for User model access
+    )
+    title = models.CharField(max_length=100)
+    category = models.CharField(max_length=2, choices=Categories.choices)
+    description = models.TextField(blank=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    class Meta(TrackedModel.Meta):
+        ordering = ["-updated_at"]
+
+    def __str__(self):
+        return (
+            f"{self.user.get_display_name()}'s {self.category} Top List: {self.title}"
+        )
+
+
+# @pghistory.track()
+
+
+class TopListItem(TrackedModel):
+    top_list = models.ForeignKey(
+        TopList, on_delete=models.CASCADE, related_name="items"
+    )
+    content_type = models.ForeignKey(
+        "contenttypes.ContentType", on_delete=models.CASCADE
+    )
+    object_id = models.PositiveIntegerField()
+    rank = models.PositiveIntegerField()
+    notes = models.TextField(blank=True)
+
+    class Meta(TrackedModel.Meta):
+        ordering = ["rank"]
+        unique_together = [["top_list", "rank"]]
+
+    def __str__(self):
+        return f"#{self.rank} in {self.top_list.title}"

backend/apps/accounts/models_temp.py

@@ -2,14 +2,12 @@ from django.contrib.auth.models import AbstractUser
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from PIL import Image, ImageDraw, ImageFont
-from io import BytesIO
-import base64
 import os
 import secrets
-from history_tracking.models import TrackedModel
+from apps.core.history import TrackedModel
 import pghistory
 
+
 def generate_random_id(model_class, id_field):
     """Generate a random ID starting at 4 digits, expanding to 5 if needed"""
     while True:
@@ -17,29 +15,30 @@ def generate_random_id(model_class, id_field):
         new_id = str(secrets.SystemRandom().randint(1000, 9999))
         if not model_class.objects.filter(**{id_field: new_id}).exists():
             return new_id
-        
+
         # If all 4-digit numbers are taken, try 5 digits
         new_id = str(secrets.SystemRandom().randint(10000, 99999))
         if not model_class.objects.filter(**{id_field: new_id}).exists():
             return new_id
 
+
 class User(AbstractUser):
     class Roles(models.TextChoices):
-        USER = 'USER', _('User')
-        MODERATOR = 'MODERATOR', _('Moderator')
-        ADMIN = 'ADMIN', _('Admin')
-        SUPERUSER = 'SUPERUSER', _('Superuser')
+        USER = "USER", _("User")
+        MODERATOR = "MODERATOR", _("Moderator")
+        ADMIN = "ADMIN", _("Admin")
+        SUPERUSER = "SUPERUSER", _("Superuser")
 
     class ThemePreference(models.TextChoices):
-        LIGHT = 'light', _('Light')
-        DARK = 'dark', _('Dark')
+        LIGHT = "light", _("Light")
+        DARK = "dark", _("Dark")
 
     # Read-only ID
     user_id = models.CharField(
         max_length=10,
         unique=True,
         editable=False,
-        help_text='Unique identifier for this user that remains constant even if the username changes'
+        help_text="Unique identifier for this user that remains constant even if the username changes",
     )
 
     role = models.CharField(
@@ -61,50 +60,47 @@ class User(AbstractUser):
         return self.get_display_name()
 
     def get_absolute_url(self):
-        return reverse('profile', kwargs={'username': self.username})
+        return reverse("profile", kwargs={"username": self.username})
 
     def get_display_name(self):
         """Get the user's display name, falling back to username if not set"""
-        profile = getattr(self, 'profile', None)
+        profile = getattr(self, "profile", None)
         if profile and profile.display_name:
             return profile.display_name
         return self.username
 
     def save(self, *args, **kwargs):
         if not self.user_id:
-            self.user_id = generate_random_id(User, 'user_id')
+            self.user_id = generate_random_id(User, "user_id")
         super().save(*args, **kwargs)
 
+
 class UserProfile(models.Model):
     # Read-only ID
     profile_id = models.CharField(
         max_length=10,
         unique=True,
         editable=False,
-        help_text='Unique identifier for this profile that remains constant'
+        help_text="Unique identifier for this profile that remains constant",
     )
 
-    user = models.OneToOneField(
-        User,
-        on_delete=models.CASCADE,
-        related_name='profile'
-    )
+    user = models.OneToOneField(User, on_delete=models.CASCADE, related_name="profile")
     display_name = models.CharField(
         max_length=50,
         unique=True,
-        help_text="This is the name that will be displayed on the site"
+        help_text="This is the name that will be displayed on the site",
     )
-    avatar = models.ImageField(upload_to='avatars/', blank=True)
+    avatar = models.ImageField(upload_to="avatars/", blank=True)
     pronouns = models.CharField(max_length=50, blank=True)
-    
+
     bio = models.TextField(max_length=500, blank=True)
-    
+
     # Social media links
     twitter = models.URLField(blank=True)
     instagram = models.URLField(blank=True)
     youtube = models.URLField(blank=True)
     discord = models.CharField(max_length=100, blank=True)
-    
+
     # Ride statistics
     coaster_credits = models.IntegerField(default=0)
     dark_ride_credits = models.IntegerField(default=0)
@@ -127,12 +123,13 @@ class UserProfile(models.Model):
             self.display_name = self.user.username
 
         if not self.profile_id:
-            self.profile_id = generate_random_id(UserProfile, 'profile_id')
+            self.profile_id = generate_random_id(UserProfile, "profile_id")
         super().save(*args, **kwargs)
-    
+
     def __str__(self):
         return self.display_name
 
+
 class EmailVerification(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE)
     token = models.CharField(max_length=64, unique=True)
@@ -146,6 +143,7 @@ class EmailVerification(models.Model):
         verbose_name = "Email Verification"
         verbose_name_plural = "Email Verifications"
 
+
 class PasswordReset(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     token = models.CharField(max_length=64)
@@ -160,53 +158,51 @@ class PasswordReset(models.Model):
         verbose_name = "Password Reset"
         verbose_name_plural = "Password Resets"
 
+
 @pghistory.track()
 class TopList(TrackedModel):
     class Categories(models.TextChoices):
-        ROLLER_COASTER = 'RC', _('Roller Coaster')
-        DARK_RIDE = 'DR', _('Dark Ride')
-        FLAT_RIDE = 'FR', _('Flat Ride')
-        WATER_RIDE = 'WR', _('Water Ride')
-        PARK = 'PK', _('Park')
+        ROLLER_COASTER = "RC", _("Roller Coaster")
+        DARK_RIDE = "DR", _("Dark Ride")
+        FLAT_RIDE = "FR", _("Flat Ride")
+        WATER_RIDE = "WR", _("Water Ride")
+        PARK = "PK", _("Park")
 
     user = models.ForeignKey(
         User,
         on_delete=models.CASCADE,
-        related_name='top_lists'  # Added related_name for User model access
+        related_name="top_lists",  # Added related_name for User model access
     )
     title = models.CharField(max_length=100)
-    category = models.CharField(
-        max_length=2,
-        choices=Categories.choices
-    )
+    category = models.CharField(max_length=2, choices=Categories.choices)
     description = models.TextField(blank=True)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
-    class Meta:
-        ordering = ['-updated_at']
+    class Meta(TrackedModel.Meta):
+        ordering = ["-updated_at"]
 
     def __str__(self):
-        return f"{self.user.get_display_name()}'s {self.category} Top List: {self.title}"
+        return (
+            f"{self.user.get_display_name()}'s {self.category} Top List: {self.title}"
+        )
+
 
 @pghistory.track()
 class TopListItem(TrackedModel):
     top_list = models.ForeignKey(
-        TopList,
-        on_delete=models.CASCADE,
-        related_name='items'
+        TopList, on_delete=models.CASCADE, related_name="items"
     )
     content_type = models.ForeignKey(
-        'contenttypes.ContentType',
-        on_delete=models.CASCADE
+        "contenttypes.ContentType", on_delete=models.CASCADE
     )
     object_id = models.PositiveIntegerField()
     rank = models.PositiveIntegerField()
     notes = models.TextField(blank=True)
 
-    class Meta:
-        ordering = ['rank']
-        unique_together = [['top_list', 'rank']]
+    class Meta(TrackedModel.Meta):
+        ordering = ["rank"]
+        unique_together = [["top_list", "rank"]]
 
     def __str__(self):
         return f"#{self.rank} in {self.top_list.title}"

backend/apps/accounts/selectors.py

@@ -0,0 +1,273 @@
+"""
+Selectors for user and account-related data retrieval.
+Following Django styleguide pattern for separating data access from business logic.
+"""
+
+from typing import Dict, Any
+from django.db.models import QuerySet, Q, F, Count
+from django.contrib.auth import get_user_model
+from django.utils import timezone
+from datetime import timedelta
+
+User = get_user_model()
+
+
+def user_profile_optimized(*, user_id: int) -> Any:
+    """
+    Get a user with optimized queries for profile display.
+
+    Args:
+        user_id: User ID
+
+    Returns:
+        User instance with prefetched related data
+
+    Raises:
+        User.DoesNotExist: If user doesn't exist
+    """
+    return (
+        User.objects.prefetch_related(
+            "park_reviews", "ride_reviews", "socialaccount_set"
+        )
+        .annotate(
+            park_review_count=Count(
+                "park_reviews", filter=Q(park_reviews__is_published=True)
+            ),
+            ride_review_count=Count(
+                "ride_reviews", filter=Q(ride_reviews__is_published=True)
+            ),
+            total_review_count=F("park_review_count") + F("ride_review_count"),
+        )
+        .get(id=user_id)
+    )
+
+
+def active_users_with_stats() -> QuerySet:
+    """
+    Get active users with review statistics.
+
+    Returns:
+        QuerySet of active users with review counts
+    """
+    return (
+        User.objects.filter(is_active=True)
+        .annotate(
+            park_review_count=Count(
+                "park_reviews", filter=Q(park_reviews__is_published=True)
+            ),
+            ride_review_count=Count(
+                "ride_reviews", filter=Q(ride_reviews__is_published=True)
+            ),
+            total_review_count=F("park_review_count") + F("ride_review_count"),
+        )
+        .order_by("-total_review_count")
+    )
+
+
+def users_with_recent_activity(*, days: int = 30) -> QuerySet:
+    """
+    Get users who have been active in the last N days.
+
+    Args:
+        days: Number of days to look back for activity
+
+    Returns:
+        QuerySet of recently active users
+    """
+    cutoff_date = timezone.now() - timedelta(days=days)
+
+    return (
+        User.objects.filter(
+            Q(last_login__gte=cutoff_date)
+            | Q(park_reviews__created_at__gte=cutoff_date)
+            | Q(ride_reviews__created_at__gte=cutoff_date)
+        )
+        .annotate(
+            recent_park_reviews=Count(
+                "park_reviews",
+                filter=Q(park_reviews__created_at__gte=cutoff_date),
+            ),
+            recent_ride_reviews=Count(
+                "ride_reviews",
+                filter=Q(ride_reviews__created_at__gte=cutoff_date),
+            ),
+            recent_total_reviews=F("recent_park_reviews") + F("recent_ride_reviews"),
+        )
+        .order_by("-last_login")
+        .distinct()
+    )
+
+
+def top_reviewers(*, limit: int = 10) -> QuerySet:
+    """
+    Get top users by review count.
+
+    Args:
+        limit: Maximum number of users to return
+
+    Returns:
+        QuerySet of top reviewers
+    """
+    return (
+        User.objects.filter(is_active=True)
+        .annotate(
+            park_review_count=Count(
+                "park_reviews", filter=Q(park_reviews__is_published=True)
+            ),
+            ride_review_count=Count(
+                "ride_reviews", filter=Q(ride_reviews__is_published=True)
+            ),
+            total_review_count=F("park_review_count") + F("ride_review_count"),
+        )
+        .filter(total_review_count__gt=0)
+        .order_by("-total_review_count")[:limit]
+    )
+
+
+def moderator_users() -> QuerySet:
+    """
+    Get users with moderation permissions.
+
+    Returns:
+        QuerySet of users who can moderate content
+    """
+    return (
+        User.objects.filter(
+            Q(is_staff=True)
+            | Q(groups__name="Moderators")
+            | Q(
+                user_permissions__codename__in=[
+                    "change_parkreview",
+                    "change_ridereview",
+                ]
+            )
+        )
+        .distinct()
+        .order_by("username")
+    )
+
+
+def users_by_registration_date(*, start_date, end_date) -> QuerySet:
+    """
+    Get users who registered within a date range.
+
+    Args:
+        start_date: Start of date range
+        end_date: End of date range
+
+    Returns:
+        QuerySet of users registered in the date range
+    """
+    return User.objects.filter(
+        date_joined__date__gte=start_date, date_joined__date__lte=end_date
+    ).order_by("-date_joined")
+
+
+def user_search_autocomplete(*, query: str, limit: int = 10) -> QuerySet:
+    """
+    Get users matching a search query for autocomplete functionality.
+
+    Args:
+        query: Search string
+        limit: Maximum number of results
+
+    Returns:
+        QuerySet of matching users for autocomplete
+    """
+    return User.objects.filter(
+        Q(username__icontains=query)
+        | Q(first_name__icontains=query)
+        | Q(last_name__icontains=query),
+        is_active=True,
+    ).order_by("username")[:limit]
+
+
+def users_with_social_accounts() -> QuerySet:
+    """
+    Get users who have connected social accounts.
+
+    Returns:
+        QuerySet of users with social account connections
+    """
+    return (
+        User.objects.filter(socialaccount__isnull=False)
+        .prefetch_related("socialaccount_set")
+        .distinct()
+        .order_by("username")
+    )
+
+
+def user_statistics_summary() -> Dict[str, Any]:
+    """
+    Get overall user statistics for dashboard/analytics.
+
+    Returns:
+        Dictionary containing user statistics
+    """
+    total_users = User.objects.count()
+    active_users = User.objects.filter(is_active=True).count()
+    staff_users = User.objects.filter(is_staff=True).count()
+
+    # Users with reviews
+    users_with_reviews = (
+        User.objects.filter(
+            Q(park_reviews__isnull=False) | Q(ride_reviews__isnull=False)
+        )
+        .distinct()
+        .count()
+    )
+
+    # Recent registrations (last 30 days)
+    cutoff_date = timezone.now() - timedelta(days=30)
+    recent_registrations = User.objects.filter(date_joined__gte=cutoff_date).count()
+
+    return {
+        "total_users": total_users,
+        "active_users": active_users,
+        "inactive_users": total_users - active_users,
+        "staff_users": staff_users,
+        "users_with_reviews": users_with_reviews,
+        "recent_registrations": recent_registrations,
+        "review_participation_rate": (
+            (users_with_reviews / total_users * 100) if total_users > 0 else 0
+        ),
+    }
+
+
+def users_needing_email_verification() -> QuerySet:
+    """
+    Get users who haven't verified their email addresses.
+
+    Returns:
+        QuerySet of users with unverified emails
+    """
+    return (
+        User.objects.filter(is_active=True, emailaddress__verified=False)
+        .distinct()
+        .order_by("date_joined")
+    )
+
+
+def users_by_review_activity(*, min_reviews: int = 1) -> QuerySet:
+    """
+    Get users who have written at least a minimum number of reviews.
+
+    Args:
+        min_reviews: Minimum number of reviews required
+
+    Returns:
+        QuerySet of users with sufficient review activity
+    """
+    return (
+        User.objects.annotate(
+            park_review_count=Count(
+                "park_reviews", filter=Q(park_reviews__is_published=True)
+            ),
+            ride_review_count=Count(
+                "ride_reviews", filter=Q(ride_reviews__is_published=True)
+            ),
+            total_review_count=F("park_review_count") + F("ride_review_count"),
+        )
+        .filter(total_review_count__gte=min_reviews)
+        .order_by("-total_review_count")
+    )

backend/apps/accounts/signals.py

@@ -5,7 +5,8 @@ from django.db import transaction
 from django.core.files import File
 from django.core.files.temp import NamedTemporaryFile
 import requests
-from .models import User, UserProfile, EmailVerification
+from .models import User, UserProfile
+
 
 @receiver(post_save, sender=User)
 def create_user_profile(sender, instance, created, **kwargs):
@@ -14,21 +15,21 @@ def create_user_profile(sender, instance, created, **kwargs):
         if created:
             # Create profile
             profile = UserProfile.objects.create(user=instance)
-            
+
             # If user has a social account with avatar, download it
             social_account = instance.socialaccount_set.first()
             if social_account:
                 extra_data = social_account.extra_data
                 avatar_url = None
-                
-                if social_account.provider == 'google':
-                    avatar_url = extra_data.get('picture')
-                elif social_account.provider == 'discord':
-                    avatar = extra_data.get('avatar')
-                    discord_id = extra_data.get('id')
+
+                if social_account.provider == "google":
+                    avatar_url = extra_data.get("picture")
+                elif social_account.provider == "discord":
+                    avatar = extra_data.get("avatar")
+                    discord_id = extra_data.get("id")
                     if avatar:
-                        avatar_url = f'https://cdn.discordapp.com/avatars/{discord_id}/{avatar}.png'
-                
+                        avatar_url = f"https://cdn.discordapp.com/avatars/{discord_id}/{avatar}.png"
+
                 if avatar_url:
                     try:
                         response = requests.get(avatar_url, timeout=60)
@@ -36,28 +37,34 @@ def create_user_profile(sender, instance, created, **kwargs):
                             img_temp = NamedTemporaryFile(delete=True)
                             img_temp.write(response.content)
                             img_temp.flush()
-                            
+
                             file_name = f"avatar_{instance.username}.png"
-                            profile.avatar.save(
-                                file_name,
-                                File(img_temp),
-                                save=True
-                            )
+                            profile.avatar.save(file_name, File(img_temp), save=True)
                     except Exception as e:
-                        print(f"Error downloading avatar for user {instance.username}: {str(e)}")
+                        print(
+                            f"Error downloading avatar for user {
+                                instance.username}: {
+                                str(e)}"
+                        )
     except Exception as e:
         print(f"Error creating profile for user {instance.username}: {str(e)}")
 
+
 @receiver(post_save, sender=User)
 def save_user_profile(sender, instance, **kwargs):
     """Ensure UserProfile exists and is saved"""
     try:
-        if not hasattr(instance, 'profile'):
+        # Try to get existing profile first
+        try:
+            profile = instance.profile
+            profile.save()
+        except UserProfile.DoesNotExist:
+            # Profile doesn't exist, create it
             UserProfile.objects.create(user=instance)
-        instance.profile.save()
     except Exception as e:
         print(f"Error saving profile for user {instance.username}: {str(e)}")
 
+
 @receiver(pre_save, sender=User)
 def sync_user_role_with_groups(sender, instance, **kwargs):
     """Sync user role with Django groups"""
@@ -72,33 +79,49 @@ def sync_user_role_with_groups(sender, instance, **kwargs):
                         old_group = Group.objects.filter(name=old_instance.role).first()
                         if old_group:
                             instance.groups.remove(old_group)
-                    
+
                     # Add to new role group
                     if instance.role != User.Roles.USER:
                         new_group, _ = Group.objects.get_or_create(name=instance.role)
                         instance.groups.add(new_group)
-                        
+
                         # Special handling for superuser role
                         if instance.role == User.Roles.SUPERUSER:
                             instance.is_superuser = True
                             instance.is_staff = True
                         elif old_instance.role == User.Roles.SUPERUSER:
-                            # If removing superuser role, remove superuser status
+                            # If removing superuser role, remove superuser
+                            # status
                             instance.is_superuser = False
-                            if instance.role not in [User.Roles.ADMIN, User.Roles.MODERATOR]:
+                            if instance.role not in [
+                                User.Roles.ADMIN,
+                                User.Roles.MODERATOR,
+                            ]:
                                 instance.is_staff = False
-                        
+
                         # Handle staff status for admin and moderator roles
-                        if instance.role in [User.Roles.ADMIN, User.Roles.MODERATOR]:
+                        if instance.role in [
+                            User.Roles.ADMIN,
+                            User.Roles.MODERATOR,
+                        ]:
                             instance.is_staff = True
-                        elif old_instance.role in [User.Roles.ADMIN, User.Roles.MODERATOR]:
-                            # If removing admin/moderator role, remove staff status
+                        elif old_instance.role in [
+                            User.Roles.ADMIN,
+                            User.Roles.MODERATOR,
+                        ]:
+                            # If removing admin/moderator role, remove staff
+                            # status
                             if instance.role not in [User.Roles.SUPERUSER]:
                                 instance.is_staff = False
         except User.DoesNotExist:
             pass
         except Exception as e:
-            print(f"Error syncing role with groups for user {instance.username}: {str(e)}")
+            print(
+                f"Error syncing role with groups for user {
+                    instance.username}: {
+                    str(e)}"
+            )
+
 
 def create_default_groups():
     """
@@ -107,33 +130,47 @@ def create_default_groups():
     """
     try:
         from django.contrib.auth.models import Permission
-        from django.contrib.contenttypes.models import ContentType
-        
+
         # Create Moderator group
         moderator_group, _ = Group.objects.get_or_create(name=User.Roles.MODERATOR)
         moderator_permissions = [
             # Review moderation permissions
-            'change_review', 'delete_review',
-            'change_reviewreport', 'delete_reviewreport',
+            "change_review",
+            "delete_review",
+            "change_reviewreport",
+            "delete_reviewreport",
             # Edit moderation permissions
-            'change_parkedit', 'delete_parkedit',
-            'change_rideedit', 'delete_rideedit',
-            'change_companyedit', 'delete_companyedit',
-            'change_manufactureredit', 'delete_manufactureredit',
+            "change_parkedit",
+            "delete_parkedit",
+            "change_rideedit",
+            "delete_rideedit",
+            "change_companyedit",
+            "delete_companyedit",
+            "change_manufactureredit",
+            "delete_manufactureredit",
         ]
-        
+
         # Create Admin group
         admin_group, _ = Group.objects.get_or_create(name=User.Roles.ADMIN)
         admin_permissions = moderator_permissions + [
             # User management permissions
-            'change_user', 'delete_user',
+            "change_user",
+            "delete_user",
             # Content management permissions
-            'add_park', 'change_park', 'delete_park',
-            'add_ride', 'change_ride', 'delete_ride',
-            'add_company', 'change_company', 'delete_company',
-            'add_manufacturer', 'change_manufacturer', 'delete_manufacturer',
+            "add_park",
+            "change_park",
+            "delete_park",
+            "add_ride",
+            "change_ride",
+            "delete_ride",
+            "add_company",
+            "change_company",
+            "delete_company",
+            "add_manufacturer",
+            "change_manufacturer",
+            "delete_manufacturer",
         ]
-        
+
         # Assign permissions to groups
         for codename in moderator_permissions:
             try:
@@ -141,7 +178,7 @@ def create_default_groups():
                 moderator_group.permissions.add(perm)
             except Permission.DoesNotExist:
                 print(f"Permission not found: {codename}")
-        
+
         for codename in admin_permissions:
             try:
                 perm = Permission.objects.get(codename=codename)

backend/apps/accounts/templatetags/turnstile_tags.py

@@ -4,6 +4,7 @@ from django.template.loader import render_to_string
 
 register = template.Library()
 
+
 @register.simple_tag
 def turnstile_widget():
     """
@@ -13,12 +14,10 @@ def turnstile_widget():
     Usage: {% load turnstile_tags %}{% turnstile_widget %}
     """
     if settings.DEBUG:
-        template_name = 'accounts/turnstile_widget_empty.html'
+        template_name = "accounts/turnstile_widget_empty.html"
         context = {}
     else:
-        template_name = 'accounts/turnstile_widget.html'
-        context = {
-            'site_key': settings.TURNSTILE_SITE_KEY
-        }
-    
+        template_name = "accounts/turnstile_widget.html"
+        context = {"site_key": settings.TURNSTILE_SITE_KEY}
+
     return render_to_string(template_name, context)

backend/apps/accounts/tests.py

@@ -0,0 +1,126 @@
+from django.test import TestCase
+from django.contrib.auth.models import Group, Permission
+from django.contrib.contenttypes.models import ContentType
+from unittest.mock import patch, MagicMock
+from .models import User, UserProfile
+from .signals import create_default_groups
+
+
+class SignalsTestCase(TestCase):
+    def setUp(self):
+        self.user = User.objects.create_user(
+            username="testuser",
+            email="testuser@example.com",
+            password="password",
+        )
+
+    def test_create_user_profile(self):
+        # Refresh user from database to ensure signals have been processed
+        self.user.refresh_from_db()
+
+        # Check if profile exists in database first
+        profile_exists = UserProfile.objects.filter(user=self.user).exists()
+        self.assertTrue(profile_exists, "UserProfile should be created by signals")
+
+        # Now safely access the profile
+        profile = UserProfile.objects.get(user=self.user)
+        self.assertIsInstance(profile, UserProfile)
+
+        # Test the reverse relationship
+        self.assertTrue(hasattr(self.user, "profile"))
+        # Test that we can access the profile through the user relationship
+        user_profile = getattr(self.user, "profile", None)
+        self.assertEqual(user_profile, profile)
+
+    @patch("accounts.signals.requests.get")
+    def test_create_user_profile_with_social_avatar(self, mock_get):
+        # Mock the response from requests.get
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.content = b"fake-image-content"
+        mock_get.return_value = mock_response
+
+        # Create a social account for the user (we'll skip this test since socialaccount_set requires allauth setup)
+        # This test would need proper allauth configuration to work
+        self.skipTest("Requires proper allauth socialaccount setup")
+
+    def test_save_user_profile(self):
+        # Get the profile safely first
+        profile = UserProfile.objects.get(user=self.user)
+        profile.delete()
+
+        # Refresh user to clear cached profile relationship
+        self.user.refresh_from_db()
+
+        # Check that profile no longer exists
+        self.assertFalse(UserProfile.objects.filter(user=self.user).exists())
+
+        # Trigger save to recreate profile via signal
+        self.user.save()
+
+        # Verify profile was recreated
+        self.assertTrue(UserProfile.objects.filter(user=self.user).exists())
+        new_profile = UserProfile.objects.get(user=self.user)
+        self.assertIsInstance(new_profile, UserProfile)
+
+    def test_sync_user_role_with_groups(self):
+        self.user.role = User.Roles.MODERATOR
+        self.user.save()
+        self.assertTrue(self.user.groups.filter(name=User.Roles.MODERATOR).exists())
+        self.assertTrue(self.user.is_staff)
+
+        self.user.role = User.Roles.ADMIN
+        self.user.save()
+        self.assertFalse(self.user.groups.filter(name=User.Roles.MODERATOR).exists())
+        self.assertTrue(self.user.groups.filter(name=User.Roles.ADMIN).exists())
+        self.assertTrue(self.user.is_staff)
+
+        self.user.role = User.Roles.SUPERUSER
+        self.user.save()
+        self.assertFalse(self.user.groups.filter(name=User.Roles.ADMIN).exists())
+        self.assertTrue(self.user.groups.filter(name=User.Roles.SUPERUSER).exists())
+        self.assertTrue(self.user.is_superuser)
+        self.assertTrue(self.user.is_staff)
+
+        self.user.role = User.Roles.USER
+        self.user.save()
+        self.assertFalse(self.user.groups.exists())
+        self.assertFalse(self.user.is_superuser)
+        self.assertFalse(self.user.is_staff)
+
+    def test_create_default_groups(self):
+        # Create some permissions for testing
+        content_type = ContentType.objects.get_for_model(User)
+        Permission.objects.create(
+            codename="change_review",
+            name="Can change review",
+            content_type=content_type,
+        )
+        Permission.objects.create(
+            codename="delete_review",
+            name="Can delete review",
+            content_type=content_type,
+        )
+        Permission.objects.create(
+            codename="change_user",
+            name="Can change user",
+            content_type=content_type,
+        )
+
+        create_default_groups()
+
+        moderator_group = Group.objects.get(name=User.Roles.MODERATOR)
+        self.assertIsNotNone(moderator_group)
+        self.assertTrue(
+            moderator_group.permissions.filter(codename="change_review").exists()
+        )
+        self.assertFalse(
+            moderator_group.permissions.filter(codename="change_user").exists()
+        )
+
+        admin_group = Group.objects.get(name=User.Roles.ADMIN)
+        self.assertIsNotNone(admin_group)
+        self.assertTrue(
+            admin_group.permissions.filter(codename="change_review").exists()
+        )
+        self.assertTrue(admin_group.permissions.filter(codename="change_user").exists())

backend/apps/accounts/urls.py

@@ -0,0 +1,48 @@
+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("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",
+    ),
+    path(
+        "password_reset/done/",
+        auth_views.PasswordResetDoneView.as_view(),
+        name="password_reset_done",
+    ),
+    path(
+        "reset/<uidb64>/<token>/",
+        auth_views.PasswordResetConfirmView.as_view(),
+        name="password_reset_confirm",
+    ),
+    path(
+        "reset/done/",
+        auth_views.PasswordResetCompleteView.as_view(),
+        name="password_reset_complete",
+    ),
+    # Profile views
+    path("profile/", views.user_redirect_view, name="profile_redirect"),
+    path("settings/", views.SettingsView.as_view(), name="settings"),
+]

backend/apps/accounts/views.py

@@ -0,0 +1,426 @@
+from django.views.generic import DetailView, TemplateView
+from django.contrib.auth import get_user_model
+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 django.template.loader import render_to_string
+from django.utils.crypto import get_random_string
+from django.utils import timezone
+from datetime import timedelta
+from django.contrib.sites.shortcuts import get_current_site
+from django.contrib.sites.models import Site
+from django.contrib.sites.requests import RequestSite
+from django.db.models import QuerySet
+from django.http import HttpResponseRedirect, HttpResponse, HttpRequest
+from django.urls import reverse
+from django.contrib.auth import login
+from django.core.files.uploadedfile import UploadedFile
+from apps.accounts.models import (
+    User,
+    PasswordReset,
+    TopList,
+    EmailVerification,
+    UserProfile,
+)
+from apps.email_service.services import EmailService
+from apps.parks.models import ParkReview
+from apps.rides.models import RideReview
+from allauth.account.views import LoginView, SignupView
+from .mixins import TurnstileMixin
+from typing import Dict, Any, Optional, Union, cast
+from django_htmx.http import HttpResponseClientRefresh
+from contextlib import suppress
+import re
+
+UserModel = 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)
+
+        response = super().form_valid(form)
+        return (
+            HttpResponseClientRefresh()
+            if getattr(self.request, "htmx", False)
+            else response
+        )
+
+    def form_invalid(self, form):
+        if getattr(self.request, "htmx", False):
+            return render(
+                self.request,
+                "account/partials/login_form.html",
+                self.get_context_data(form=form),
+            )
+        return super().form_invalid(form)
+
+    def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
+        if getattr(request, "htmx", False):
+            return render(
+                request,
+                "account/partials/login_modal.html",
+                self.get_context_data(),
+            )
+        return super().get(request, *args, **kwargs)
+
+
+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)
+
+        response = super().form_valid(form)
+        return (
+            HttpResponseClientRefresh()
+            if getattr(self.request, "htmx", False)
+            else response
+        )
+
+    def form_invalid(self, form):
+        if getattr(self.request, "htmx", False):
+            return render(
+                self.request,
+                "account/partials/signup_modal.html",
+                self.get_context_data(form=form),
+            )
+        return super().form_invalid(form)
+
+    def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
+        if getattr(request, "htmx", False):
+            return render(
+                request,
+                "account/partials/signup_modal.html",
+                self.get_context_data(),
+            )
+        return super().get(request, *args, **kwargs)
+
+
+@login_required
+def user_redirect_view(request: HttpRequest) -> HttpResponse:
+    user = cast(User, request.user)
+    return redirect("profile", username=user.username)
+
+
+def handle_social_login(request: HttpRequest, email: str) -> HttpResponse:
+    if sociallogin := request.session.get("socialaccount_sociallogin"):
+        sociallogin.user.email = email
+        sociallogin.save()
+        login(request, sociallogin.user)
+        del request.session["socialaccount_sociallogin"]
+        messages.success(request, "Successfully logged in")
+    return redirect("/")
+
+
+def email_required(request: HttpRequest) -> HttpResponse:
+    if not request.session.get("socialaccount_sociallogin"):
+        messages.error(request, "No social login in progress")
+        return redirect("/")
+
+    if request.method == "POST":
+        if email := request.POST.get("email"):
+            return handle_social_login(request, email)
+        messages.error(request, "Email is required")
+        return render(
+            request,
+            "accounts/email_required.html",
+            {"error": "Email is required"},
+        )
+
+    return render(request, "accounts/email_required.html")
+
+
+class ProfileView(DetailView):
+    model = User
+    template_name = "accounts/profile.html"
+    context_object_name = "profile_user"
+    slug_field = "username"
+    slug_url_kwarg = "username"
+
+    def get_queryset(self) -> QuerySet[User]:
+        return User.objects.select_related("profile")
+
+    def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
+        context = super().get_context_data(**kwargs)
+        user = cast(User, self.get_object())
+
+        context["park_reviews"] = self._get_user_park_reviews(user)
+        context["ride_reviews"] = self._get_user_ride_reviews(user)
+        context["top_lists"] = self._get_user_top_lists(user)
+
+        return context
+
+    def _get_user_park_reviews(self, user: User) -> QuerySet[ParkReview]:
+        return (
+            ParkReview.objects.filter(user=user, is_published=True)
+            .select_related("user", "user__profile", "park")
+            .order_by("-created_at")[:5]
+        )
+
+    def _get_user_ride_reviews(self, user: User) -> QuerySet[RideReview]:
+        return (
+            RideReview.objects.filter(user=user, is_published=True)
+            .select_related("user", "user__profile", "ride")
+            .order_by("-created_at")[:5]
+        )
+
+    def _get_user_top_lists(self, user: User) -> QuerySet[TopList]:
+        return (
+            TopList.objects.filter(user=user)
+            .select_related("user", "user__profile")
+            .prefetch_related("items")
+            .order_by("-created_at")[:5]
+        )
+
+
+class SettingsView(LoginRequiredMixin, TemplateView):
+    template_name = "accounts/settings.html"
+
+    def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
+        context = super().get_context_data(**kwargs)
+        context["user"] = self.request.user
+        return context
+
+    def _handle_profile_update(self, request: HttpRequest) -> None:
+        user = cast(User, request.user)
+        profile = get_object_or_404(UserProfile, user=user)
+
+        if display_name := request.POST.get("display_name"):
+            profile.display_name = display_name
+
+        if "avatar" in request.FILES:
+            avatar_file = cast(UploadedFile, request.FILES["avatar"])
+            profile.avatar.save(avatar_file.name, avatar_file, save=False)
+            profile.save()
+
+        user.save()
+        messages.success(request, "Profile updated successfully")
+
+    def _validate_password(self, password: str) -> bool:
+        """Validate password meets requirements."""
+        return (
+            len(password) >= 8
+            and bool(re.search(r"[A-Z]", password))
+            and bool(re.search(r"[a-z]", password))
+            and bool(re.search(r"[0-9]", password))
+        )
+
+    def _send_password_change_confirmation(
+        self, request: HttpRequest, user: User
+    ) -> None:
+        """Send password change confirmation email."""
+        site = get_current_site(request)
+        context = {
+            "user": user,
+            "site_name": site.name,
+        }
+
+        email_html = render_to_string(
+            "accounts/email/password_change_confirmation.html", context
+        )
+
+        EmailService.send_email(
+            to=user.email,
+            subject="Password Changed Successfully",
+            text="Your password has been changed successfully.",
+            site=site,
+            html=email_html,
+        )
+
+    def _handle_password_change(
+        self, request: HttpRequest
+    ) -> Optional[HttpResponseRedirect]:
+        user = cast(User, request.user)
+        old_password = request.POST.get("old_password", "")
+        new_password = request.POST.get("new_password", "")
+        confirm_password = request.POST.get("confirm_password", "")
+
+        if not user.check_password(old_password):
+            messages.error(request, "Current password is incorrect")
+            return None
+
+        if new_password != confirm_password:
+            messages.error(request, "New passwords do not match")
+            return None
+
+        if not self._validate_password(new_password):
+            messages.error(
+                request,
+                "Password must be at least 8 characters and contain uppercase, lowercase, and numbers",
+            )
+            return None
+
+        user.set_password(new_password)
+        user.save()
+
+        self._send_password_change_confirmation(request, user)
+        messages.success(
+            request,
+            "Password changed successfully. Please check your email for confirmation.",
+        )
+        return HttpResponseRedirect(reverse("account_login"))
+
+    def _handle_email_change(self, request: HttpRequest) -> None:
+        if new_email := request.POST.get("new_email"):
+            self._send_email_verification(request, new_email)
+            messages.success(
+                request, "Verification email sent to your new email address"
+            )
+        else:
+            messages.error(request, "New email is required")
+
+    def _send_email_verification(self, request: HttpRequest, new_email: str) -> None:
+        user = cast(User, request.user)
+        token = get_random_string(64)
+        EmailVerification.objects.update_or_create(user=user, defaults={"token": token})
+
+        site = cast(Site, get_current_site(request))
+        verification_url = reverse("verify_email", kwargs={"token": token})
+
+        context = {
+            "user": user,
+            "verification_url": verification_url,
+            "site_name": site.name,
+        }
+
+        email_html = render_to_string("accounts/email/verify_email.html", context)
+        EmailService.send_email(
+            to=new_email,
+            subject="Verify your new email address",
+            text="Click the link to verify your new email address",
+            site=site,
+            html=email_html,
+        )
+
+        user.pending_email = new_email
+        user.save()
+
+    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
+        action = request.POST.get("action")
+
+        if action == "update_profile":
+            self._handle_profile_update(request)
+        elif action == "change_password":
+            if response := self._handle_password_change(request):
+                return response
+        elif action == "change_email":
+            self._handle_email_change(request)
+
+        return self.get(request, *args, **kwargs)
+
+
+def create_password_reset_token(user: User) -> str:
+    token = get_random_string(64)
+    PasswordReset.objects.update_or_create(
+        user=user,
+        defaults={
+            "token": token,
+            "expires_at": timezone.now() + timedelta(hours=24),
+        },
+    )
+    return token
+
+
+def send_password_reset_email(
+    user: User, site: Union[Site, RequestSite], token: str
+) -> None:
+    reset_url = reverse("password_reset_confirm", kwargs={"token": token})
+    context = {
+        "user": user,
+        "reset_url": reset_url,
+        "site_name": site.name,
+    }
+    email_html = render_to_string("accounts/email/password_reset.html", context)
+
+    EmailService.send_email(
+        to=user.email,
+        subject="Reset your password",
+        text="Click the link to reset your password",
+        site=site,
+        html=email_html,
+    )
+
+
+def request_password_reset(request: HttpRequest) -> HttpResponse:
+    if request.method != "POST":
+        return render(request, "accounts/password_reset.html")
+
+    if not (email := request.POST.get("email")):
+        messages.error(request, "Email is required")
+        return redirect("account_reset_password")
+
+    with suppress(User.DoesNotExist):
+        user = User.objects.get(email=email)
+        token = create_password_reset_token(user)
+        site = get_current_site(request)
+        send_password_reset_email(user, site, token)
+
+    messages.success(request, "Password reset email sent")
+    return redirect("account_login")
+
+
+def handle_password_reset(
+    request: HttpRequest,
+    user: User,
+    new_password: str,
+    reset: PasswordReset,
+    site: Union[Site, RequestSite],
+) -> None:
+    user.set_password(new_password)
+    user.save()
+
+    reset.used = True
+    reset.save()
+
+    send_password_reset_confirmation(user, site)
+    messages.success(request, "Password reset successfully")
+
+
+def send_password_reset_confirmation(
+    user: User, site: Union[Site, RequestSite]
+) -> None:
+    context = {
+        "user": user,
+        "site_name": site.name,
+    }
+    email_html = render_to_string(
+        "accounts/email/password_reset_complete.html", context
+    )
+
+    EmailService.send_email(
+        to=user.email,
+        subject="Password Reset Complete",
+        text="Your password has been reset successfully.",
+        site=site,
+        html=email_html,
+    )
+
+
+def reset_password(request: HttpRequest, token: str) -> HttpResponse:
+    try:
+        reset = PasswordReset.objects.select_related("user").get(
+            token=token, expires_at__gt=timezone.now(), used=False
+        )
+
+        if request.method == "POST":
+            if new_password := request.POST.get("new_password"):
+                site = get_current_site(request)
+                handle_password_reset(request, reset.user, new_password, reset, site)
+                return redirect("account_login")
+
+            messages.error(request, "New password is required")
+
+        return render(request, "accounts/password_reset_confirm.html", {"token": token})
+
+    except PasswordReset.DoesNotExist:
+        messages.error(request, "Invalid or expired reset token")
+        return redirect("account_reset_password")

backend/apps/context_portal/alembic.ini

@@ -0,0 +1,43 @@
+
+# A generic Alembic configuration file.
+
+[alembic]
+# path to migration scripts
+script_location = alembic
+
+# The database URL is now set dynamically by ConPort's run_migrations function.
+# sqlalchemy.url = sqlite:///your_database.db
+# ... other Alembic settings ...
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

backend/apps/context_portal/alembic/env.py

@@ -0,0 +1,76 @@
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line prevents the need to have a separate logging config file.
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+target_metadata = None
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline() -> None:
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online() -> None:
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section, {}),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(connection=connection, target_metadata=target_metadata)
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

backend/apps/context_portal/alembic/versions/2025_06_17_initial_schema.py

@@ -0,0 +1,247 @@
+"""Initial schema
+
+Revision ID: 20250617
+Revises:
+Create Date: 2025-06-17 15:00:00.000000
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+import json
+
+# revision identifiers, used by Alembic.
+revision = "20250617"
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto-generated by Alembic - please adjust! ###
+    op.create_table(
+        "active_context",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("content", sa.Text(), nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_table(
+        "active_context_history",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("timestamp", sa.DateTime(), nullable=False),
+        sa.Column("version", sa.Integer(), nullable=False),
+        sa.Column("content", sa.Text(), nullable=False),
+        sa.Column("change_source", sa.String(length=255), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_table(
+        "context_links",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("workspace_id", sa.String(length=1024), nullable=False),
+        sa.Column("source_item_type", sa.String(length=255), nullable=False),
+        sa.Column("source_item_id", sa.String(length=255), nullable=False),
+        sa.Column("target_item_type", sa.String(length=255), nullable=False),
+        sa.Column("target_item_id", sa.String(length=255), nullable=False),
+        sa.Column("relationship_type", sa.String(length=255), nullable=False),
+        sa.Column("description", sa.Text(), nullable=True),
+        sa.Column(
+            "timestamp",
+            sa.DateTime(),
+            server_default=sa.text("(CURRENT_TIMESTAMP)"),
+            nullable=False,
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_index(
+        op.f("ix_context_links_source_item_id"),
+        "context_links",
+        ["source_item_id"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_context_links_source_item_type"),
+        "context_links",
+        ["source_item_type"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_context_links_target_item_id"),
+        "context_links",
+        ["target_item_id"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_context_links_target_item_type"),
+        "context_links",
+        ["target_item_type"],
+        unique=False,
+    )
+    op.create_table(
+        "custom_data",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("timestamp", sa.DateTime(), nullable=False),
+        sa.Column("category", sa.String(length=255), nullable=False),
+        sa.Column("key", sa.String(length=255), nullable=False),
+        sa.Column("value", sa.Text(), nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("category", "key"),
+    )
+    op.create_table(
+        "decisions",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("timestamp", sa.DateTime(), nullable=False),
+        sa.Column("summary", sa.Text(), nullable=False),
+        sa.Column("rationale", sa.Text(), nullable=True),
+        sa.Column("implementation_details", sa.Text(), nullable=True),
+        sa.Column("tags", sa.Text(), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_table(
+        "product_context",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("content", sa.Text(), nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_table(
+        "product_context_history",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("timestamp", sa.DateTime(), nullable=False),
+        sa.Column("version", sa.Integer(), nullable=False),
+        sa.Column("content", sa.Text(), nullable=False),
+        sa.Column("change_source", sa.String(length=255), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_table(
+        "progress_entries",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("timestamp", sa.DateTime(), nullable=False),
+        sa.Column("status", sa.String(length=50), nullable=False),
+        sa.Column("description", sa.Text(), nullable=False),
+        sa.Column("parent_id", sa.Integer(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["parent_id"], ["progress_entries.id"], ondelete="SET NULL"
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_table(
+        "system_patterns",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("timestamp", sa.DateTime(), nullable=False),
+        sa.Column("name", sa.String(length=255), nullable=False),
+        sa.Column("description", sa.Text(), nullable=True),
+        sa.Column("tags", sa.Text(), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("name"),
+    )
+
+    # Seed initial data
+    op.execute("INSERT INTO product_context (id, content) VALUES (1, '{}')")
+    op.execute("INSERT INTO active_context (id, content) VALUES (1, '{}')")
+
+    # Create FTS5 virtual table for decisions
+    op.execute(
+        """
+    CREATE VIRTUAL TABLE decisions_fts USING fts5(
+        summary,
+        rationale,
+        implementation_details,
+        tags,
+        content="decisions",
+        content_rowid="id"
+    );
+    """
+    )
+
+    # Create triggers to keep the FTS table in sync with the decisions table
+    op.execute(
+        """
+    CREATE TRIGGER decisions_after_insert AFTER INSERT ON decisions
+    BEGIN
+        INSERT INTO decisions_fts (rowid, summary, rationale, implementation_details, tags)
+        VALUES (new.id, new.summary, new.rationale, new.implementation_details, new.tags);
+    END;
+    """
+    )
+    op.execute(
+        """
+    CREATE TRIGGER decisions_after_delete AFTER DELETE ON decisions
+    BEGIN
+        INSERT INTO decisions_fts (decisions_fts, rowid, summary, rationale, implementation_details, tags)
+        VALUES ('delete', old.id, old.summary, old.rationale, old.implementation_details, old.tags);
+    END;
+    """
+    )
+    op.execute(
+        """
+    CREATE TRIGGER decisions_after_update AFTER UPDATE ON decisions
+    BEGIN
+        INSERT INTO decisions_fts (decisions_fts, rowid, summary, rationale, implementation_details, tags)
+        VALUES ('delete', old.id, old.summary, old.rationale, old.implementation_details, old.tags);
+        INSERT INTO decisions_fts (rowid, summary, rationale, implementation_details, tags)
+        VALUES (new.id, new.summary, new.rationale, new.implementation_details, new.tags);
+    END;
+    """
+    )
+
+    # Create FTS5 virtual table for custom_data
+    op.execute(
+        """
+    CREATE VIRTUAL TABLE custom_data_fts USING fts5(
+        category,
+        key,
+        value_text,
+        content="custom_data",
+        content_rowid="id"
+    );
+    """
+    )
+
+    # Create triggers for custom_data_fts
+    op.execute(
+        """
+    CREATE TRIGGER custom_data_after_insert AFTER INSERT ON custom_data
+    BEGIN
+        INSERT INTO custom_data_fts (rowid, category, key, value_text)
+        VALUES (new.id, new.category, new.key, new.value);
+    END;
+    """
+    )
+    op.execute(
+        """
+    CREATE TRIGGER custom_data_after_delete AFTER DELETE ON custom_data
+    BEGIN
+        INSERT INTO custom_data_fts (custom_data_fts, rowid, category, key, value_text)
+        VALUES ('delete', old.id, old.category, old.key, old.value);
+    END;
+    """
+    )
+    op.execute(
+        """
+    CREATE TRIGGER custom_data_after_update AFTER UPDATE ON custom_data
+    BEGIN
+        INSERT INTO custom_data_fts (custom_data_fts, rowid, category, key, value_text)
+        VALUES ('delete', old.id, old.category, old.key, old.value);
+        INSERT INTO custom_data_fts (rowid, category, key, value_text)
+        VALUES (new.id, new.category, new.key, new.value);
+    END;
+    """
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto-generated by Alembic - please adjust! ###
+    op.drop_table("system_patterns")
+    op.drop_table("progress_entries")
+    op.drop_table("product_context_history")
+    op.drop_table("product_context")
+    op.drop_table("decisions")
+    op.drop_table("custom_data")
+    op.drop_index(op.f("ix_context_links_target_item_type"), table_name="context_links")
+    op.drop_index(op.f("ix_context_links_target_item_id"), table_name="context_links")
+    op.drop_index(op.f("ix_context_links_source_item_type"), table_name="context_links")
+    op.drop_index(op.f("ix_context_links_source_item_id"), table_name="context_links")
+    op.drop_table("context_links")
+    op.drop_table("active_context_history")
+    op.drop_table("active_context")
+    # ### end Alembic commands ###

backend/apps/core/admin.py

@@ -1,29 +1,25 @@
 from django.contrib import admin
-from django.contrib.contenttypes.models import ContentType
 from django.utils.html import format_html
 from .models import SlugHistory
 
+
 @admin.register(SlugHistory)
 class SlugHistoryAdmin(admin.ModelAdmin):
-    list_display = ['content_object_link', 'old_slug', 'created_at']
-    list_filter = ['content_type', 'created_at']
-    search_fields = ['old_slug', 'object_id']
-    readonly_fields = ['content_type', 'object_id', 'old_slug', 'created_at']
-    date_hierarchy = 'created_at'
-    ordering = ['-created_at']
+    list_display = ["content_object_link", "old_slug", "created_at"]
+    list_filter = ["content_type", "created_at"]
+    search_fields = ["old_slug", "object_id"]
+    readonly_fields = ["content_type", "object_id", "old_slug", "created_at"]
+    date_hierarchy = "created_at"
+    ordering = ["-created_at"]
 
+    @admin.display(description="Object")
     def content_object_link(self, obj):
         """Create a link to the related object's admin page"""
         try:
             url = obj.content_object.get_absolute_url()
-            return format_html(
-                '<a href="{}">{}</a>',
-                url,
-                str(obj.content_object)
-            )
+            return format_html('<a href="{}">{}</a>', url, str(obj.content_object))
         except (AttributeError, ValueError):
             return str(obj.content_object)
-    content_object_link.short_description = 'Object'
 
     def has_add_permission(self, request):
         """Disable manual creation of slug history records"""

backend/apps/core/analytics.py

@@ -3,47 +3,49 @@ from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.utils import timezone
 from django.db.models import Count
-from django.conf import settings
+
 
 class PageView(models.Model):
-    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE, related_name='page_views')
+    content_type = models.ForeignKey(
+        ContentType, on_delete=models.CASCADE, related_name="page_views"
+    )
     object_id = models.PositiveIntegerField()
-    content_object = GenericForeignKey('content_type', 'object_id')
-    
+    content_object = GenericForeignKey("content_type", "object_id")
+
     timestamp = models.DateTimeField(auto_now_add=True, db_index=True)
     ip_address = models.GenericIPAddressField()
     user_agent = models.CharField(max_length=512, blank=True)
 
     class Meta:
         indexes = [
-            models.Index(fields=['timestamp']),
-            models.Index(fields=['content_type', 'object_id']),
+            models.Index(fields=["timestamp"]),
+            models.Index(fields=["content_type", "object_id"]),
         ]
 
     @classmethod
     def get_trending_items(cls, model_class, hours=24, limit=10):
         """Get trending items of a specific model class based on views in last X hours.
-        
+
         Args:
             model_class: The model class to get trending items for (e.g., Park, Ride)
             hours (int): Number of hours to look back for views (default: 24)
             limit (int): Maximum number of items to return (default: 10)
-        
+
         Returns:
             QuerySet: The trending items ordered by view count
         """
         content_type = ContentType.objects.get_for_model(model_class)
         cutoff = timezone.now() - timezone.timedelta(hours=hours)
-        
+
         # Query through the ContentType relationship
-        item_ids = cls.objects.filter(
-            content_type=content_type,
-            timestamp__gte=cutoff
-        ).values('object_id').annotate(
-            view_count=Count('id')
-        ).filter(
-            view_count__gt=0
-        ).order_by('-view_count').values_list('object_id', flat=True)[:limit]
+        item_ids = (
+            cls.objects.filter(content_type=content_type, timestamp__gte=cutoff)
+            .values("object_id")
+            .annotate(view_count=Count("id"))
+            .filter(view_count__gt=0)
+            .order_by("-view_count")
+            .values_list("object_id", flat=True)[:limit]
+        )
 
         # Get the actual items in the correct order
         if item_ids:
@@ -51,7 +53,8 @@ class PageView(models.Model):
             id_list = list(item_ids)
             # Use Case/When to preserve the ordering
             from django.db.models import Case, When
+
             preserved = Case(*[When(pk=pk, then=pos) for pos, pk in enumerate(id_list)])
             return model_class.objects.filter(pk__in=id_list).order_by(preserved)
-        
+
         return model_class.objects.none()

backend/apps/core/api/__init__.py

@@ -0,0 +1 @@
+# Core API infrastructure for ThrillWiki

backend/apps/core/api/exceptions.py

@@ -0,0 +1,205 @@
+"""
+Custom exception handling for ThrillWiki API.
+Provides standardized error responses following Django styleguide patterns.
+"""
+
+from typing import Any, Dict, Optional
+
+from django.http import Http404
+from django.core.exceptions import (
+    PermissionDenied,
+    ValidationError as DjangoValidationError,
+)
+from rest_framework import status
+from rest_framework.response import Response
+from rest_framework.views import exception_handler
+from rest_framework.exceptions import (
+    ValidationError as DRFValidationError,
+    NotFound,
+    PermissionDenied as DRFPermissionDenied,
+)
+
+from ..exceptions import ThrillWikiException
+from ..logging import get_logger, log_exception
+
+logger = get_logger(__name__)
+
+
+def custom_exception_handler(
+    exc: Exception, context: Dict[str, Any]
+) -> Optional[Response]:
+    """
+    Custom exception handler for DRF that provides standardized error responses.
+
+    Returns:
+        Response with standardized error format or None to fallback to default handler
+    """
+    # Call REST framework's default exception handler first
+    response = exception_handler(exc, context)
+
+    if response is not None:
+        # Standardize the error response format
+        custom_response_data = {
+            "status": "error",
+            "error": {
+                "code": _get_error_code(exc),
+                "message": _get_error_message(exc, response.data),
+                "details": _get_error_details(exc, response.data),
+            },
+            "data": None,
+        }
+
+        # Add request context for debugging
+        if hasattr(context.get("request"), "user"):
+            custom_response_data["error"]["request_user"] = str(context["request"].user)
+
+        # Log the error for monitoring
+        log_exception(
+            logger,
+            exc,
+            context={"response_status": response.status_code},
+            request=context.get("request"),
+        )
+
+        response.data = custom_response_data
+
+    # Handle ThrillWiki custom exceptions
+    elif isinstance(exc, ThrillWikiException):
+        custom_response_data = {
+            "status": "error",
+            "error": exc.to_dict(),
+            "data": None,
+        }
+
+        log_exception(
+            logger,
+            exc,
+            context={"response_status": exc.status_code},
+            request=context.get("request"),
+        )
+        response = Response(custom_response_data, status=exc.status_code)
+
+    # Handle specific Django exceptions that DRF doesn't catch
+    elif isinstance(exc, DjangoValidationError):
+        custom_response_data = {
+            "status": "error",
+            "error": {
+                "code": "VALIDATION_ERROR",
+                "message": "Validation failed",
+                "details": _format_django_validation_errors(exc),
+            },
+            "data": None,
+        }
+
+        log_exception(
+            logger,
+            exc,
+            context={"response_status": status.HTTP_400_BAD_REQUEST},
+            request=context.get("request"),
+        )
+        response = Response(custom_response_data, status=status.HTTP_400_BAD_REQUEST)
+
+    elif isinstance(exc, Http404):
+        custom_response_data = {
+            "status": "error",
+            "error": {
+                "code": "NOT_FOUND",
+                "message": "Resource not found",
+                "details": str(exc) if str(exc) else None,
+            },
+            "data": None,
+        }
+
+        log_exception(
+            logger,
+            exc,
+            context={"response_status": status.HTTP_404_NOT_FOUND},
+            request=context.get("request"),
+        )
+        response = Response(custom_response_data, status=status.HTTP_404_NOT_FOUND)
+
+    elif isinstance(exc, PermissionDenied):
+        custom_response_data = {
+            "status": "error",
+            "error": {
+                "code": "PERMISSION_DENIED",
+                "message": "Permission denied",
+                "details": str(exc) if str(exc) else None,
+            },
+            "data": None,
+        }
+
+        log_exception(
+            logger,
+            exc,
+            context={"response_status": status.HTTP_403_FORBIDDEN},
+            request=context.get("request"),
+        )
+        response = Response(custom_response_data, status=status.HTTP_403_FORBIDDEN)
+
+    return response
+
+
+def _get_error_code(exc: Exception) -> str:
+    """Extract or determine error code from exception."""
+    if hasattr(exc, "default_code"):
+        return exc.default_code.upper()
+
+    if isinstance(exc, DRFValidationError):
+        return "VALIDATION_ERROR"
+    elif isinstance(exc, NotFound):
+        return "NOT_FOUND"
+    elif isinstance(exc, DRFPermissionDenied):
+        return "PERMISSION_DENIED"
+
+    return exc.__class__.__name__.upper()
+
+
+def _get_error_message(exc: Exception, response_data: Any) -> str:
+    """Extract user-friendly error message."""
+    if isinstance(response_data, dict):
+        # Handle DRF validation errors
+        if "detail" in response_data:
+            return str(response_data["detail"])
+        elif "non_field_errors" in response_data:
+            errors = response_data["non_field_errors"]
+            return errors[0] if isinstance(errors, list) and errors else str(errors)
+        elif isinstance(response_data, dict) and len(response_data) == 1:
+            key, value = next(iter(response_data.items()))
+            if isinstance(value, list) and value:
+                return f"{key}: {value[0]}"
+            return f"{key}: {value}"
+
+    # Fallback to exception message
+    return str(exc) if str(exc) else "An error occurred"
+
+
+def _get_error_details(exc: Exception, response_data: Any) -> Optional[Dict[str, Any]]:
+    """Extract detailed error information for debugging."""
+    if isinstance(response_data, dict) and len(response_data) > 1:
+        return response_data
+
+    if hasattr(exc, "detail") and isinstance(exc.detail, dict):
+        return exc.detail
+
+    return None
+
+
+def _format_django_validation_errors(
+    exc: DjangoValidationError,
+) -> Dict[str, Any]:
+    """Format Django ValidationError for API response."""
+    if hasattr(exc, "error_dict"):
+        # Field-specific errors
+        return {
+            field: [str(error) for error in errors]
+            for field, errors in exc.error_dict.items()
+        }
+    elif hasattr(exc, "error_list"):
+        # Non-field errors
+        return {"non_field_errors": [str(error) for error in exc.error_list]}
+
+    return {"non_field_errors": [str(exc)]}
+
+
+# Removed _log_api_error - using centralized logging instead

backend/apps/core/api/mixins.py

@@ -0,0 +1,260 @@
+"""
+Common mixins for API views following Django styleguide patterns.
+"""
+
+from typing import Dict, Any, Optional
+from rest_framework.request import Request
+from rest_framework.response import Response
+from rest_framework import status
+
+
+class ApiMixin:
+    """
+    Base mixin for API views providing standardized response formatting.
+    """
+
+    def create_response(
+        self,
+        *,
+        data: Any = None,
+        message: Optional[str] = None,
+        status_code: int = status.HTTP_200_OK,
+        pagination: Optional[Dict[str, Any]] = None,
+        metadata: Optional[Dict[str, Any]] = None,
+    ) -> Response:
+        """
+        Create standardized API response.
+
+        Args:
+            data: Response data
+            message: Optional success message
+            status_code: HTTP status code
+            pagination: Pagination information
+            metadata: Additional metadata
+
+        Returns:
+            Standardized Response object
+        """
+        response_data = {
+            "status": "success" if status_code < 400 else "error",
+            "data": data,
+        }
+
+        if message:
+            response_data["message"] = message
+
+        if pagination:
+            response_data["pagination"] = pagination
+
+        if metadata:
+            response_data["metadata"] = metadata
+
+        return Response(response_data, status=status_code)
+
+    def create_error_response(
+        self,
+        *,
+        message: str,
+        status_code: int = status.HTTP_400_BAD_REQUEST,
+        error_code: Optional[str] = None,
+        details: Optional[Dict[str, Any]] = None,
+    ) -> Response:
+        """
+        Create standardized error response.
+
+        Args:
+            message: Error message
+            status_code: HTTP status code
+            error_code: Optional error code
+            details: Additional error details
+
+        Returns:
+            Standardized error Response object
+        """
+        error_data = {
+            "code": error_code or "GENERIC_ERROR",
+            "message": message,
+        }
+
+        if details:
+            error_data["details"] = details
+
+        response_data = {
+            "status": "error",
+            "error": error_data,
+            "data": None,
+        }
+
+        return Response(response_data, status=status_code)
+
+
+class CreateApiMixin(ApiMixin):
+    """
+    Mixin for create API endpoints with standardized input/output handling.
+    """
+
+    def create(self, request: Request, *args, **kwargs) -> Response:
+        """Handle POST requests for creating resources."""
+        serializer = self.get_input_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        # Create the object using the service layer
+        obj = self.perform_create(**serializer.validated_data)
+
+        # Serialize the output
+        output_serializer = self.get_output_serializer(obj)
+
+        return self.create_response(
+            data=output_serializer.data,
+            status_code=status.HTTP_201_CREATED,
+            message="Resource created successfully",
+        )
+
+    def perform_create(self, **validated_data):
+        """
+        Override this method to implement object creation logic.
+        Should use service layer methods.
+        """
+        raise NotImplementedError("Subclasses must implement perform_create")
+
+    def get_input_serializer(self, *args, **kwargs):
+        """Get the input serializer for validation."""
+        return self.InputSerializer(*args, **kwargs)
+
+    def get_output_serializer(self, *args, **kwargs):
+        """Get the output serializer for response."""
+        return self.OutputSerializer(*args, **kwargs)
+
+
+class UpdateApiMixin(ApiMixin):
+    """
+    Mixin for update API endpoints with standardized input/output handling.
+    """
+
+    def update(self, request: Request, *args, **kwargs) -> Response:
+        """Handle PUT/PATCH requests for updating resources."""
+        instance = self.get_object()
+        serializer = self.get_input_serializer(
+            data=request.data, partial=kwargs.get("partial", False)
+        )
+        serializer.is_valid(raise_exception=True)
+
+        # Update the object using the service layer
+        updated_obj = self.perform_update(instance, **serializer.validated_data)
+
+        # Serialize the output
+        output_serializer = self.get_output_serializer(updated_obj)
+
+        return self.create_response(
+            data=output_serializer.data,
+            message="Resource updated successfully",
+        )
+
+    def perform_update(self, instance, **validated_data):
+        """
+        Override this method to implement object update logic.
+        Should use service layer methods.
+        """
+        raise NotImplementedError("Subclasses must implement perform_update")
+
+    def get_input_serializer(self, *args, **kwargs):
+        """Get the input serializer for validation."""
+        return self.InputSerializer(*args, **kwargs)
+
+    def get_output_serializer(self, *args, **kwargs):
+        """Get the output serializer for response."""
+        return self.OutputSerializer(*args, **kwargs)
+
+
+class ListApiMixin(ApiMixin):
+    """
+    Mixin for list API endpoints with pagination and filtering.
+    """
+
+    def list(self, request: Request, *args, **kwargs) -> Response:
+        """Handle GET requests for listing resources."""
+        # Use selector to get filtered queryset
+        queryset = self.get_queryset()
+
+        # Apply pagination
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_output_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+
+        # No pagination
+        serializer = self.get_output_serializer(queryset, many=True)
+        return self.create_response(data=serializer.data)
+
+    def get_queryset(self):
+        """
+        Override this method to use selector patterns.
+        Should call selector functions, not access model managers directly.
+        """
+        raise NotImplementedError(
+            "Subclasses must implement get_queryset using selectors"
+        )
+
+    def get_output_serializer(self, *args, **kwargs):
+        """Get the output serializer for response."""
+        return self.OutputSerializer(*args, **kwargs)
+
+
+class RetrieveApiMixin(ApiMixin):
+    """
+    Mixin for retrieve API endpoints.
+    """
+
+    def retrieve(self, request: Request, *args, **kwargs) -> Response:
+        """Handle GET requests for retrieving a single resource."""
+        instance = self.get_object()
+        serializer = self.get_output_serializer(instance)
+
+        return self.create_response(data=serializer.data)
+
+    def get_object(self):
+        """
+        Override this method to use selector patterns.
+        Should call selector functions for optimized queries.
+        """
+        raise NotImplementedError(
+            "Subclasses must implement get_object using selectors"
+        )
+
+    def get_output_serializer(self, *args, **kwargs):
+        """Get the output serializer for response."""
+        return self.OutputSerializer(*args, **kwargs)
+
+
+class DestroyApiMixin(ApiMixin):
+    """
+    Mixin for delete API endpoints.
+    """
+
+    def destroy(self, request: Request, *args, **kwargs) -> Response:
+        """Handle DELETE requests for destroying resources."""
+        instance = self.get_object()
+
+        # Delete using service layer
+        self.perform_destroy(instance)
+
+        return self.create_response(
+            status_code=status.HTTP_204_NO_CONTENT,
+            message="Resource deleted successfully",
+        )
+
+    def perform_destroy(self, instance):
+        """
+        Override this method to implement object deletion logic.
+        Should use service layer methods.
+        """
+        raise NotImplementedError("Subclasses must implement perform_destroy")
+
+    def get_object(self):
+        """
+        Override this method to use selector patterns.
+        Should call selector functions for optimized queries.
+        """
+        raise NotImplementedError(
+            "Subclasses must implement get_object using selectors"
+        )

backend/apps/core/apps.py

@@ -1,5 +1,6 @@
 from django.apps import AppConfig
 
-class SearchConfig(AppConfig):
+
+class CoreConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "search"
+    name = "apps.core"

backend/apps/core/decorators/__init__.py

@@ -0,0 +1 @@
+# Decorators module

backend/apps/core/decorators/cache_decorators.py

@@ -0,0 +1,409 @@
+"""
+Advanced caching decorators for API views and functions.
+"""
+
+import hashlib
+import json
+import time
+from functools import wraps
+from typing import Optional, List, Callable
+from django.utils.decorators import method_decorator
+from django.views.decorators.vary import vary_on_headers
+from apps.core.services.enhanced_cache_service import EnhancedCacheService
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+def cache_api_response(
+    timeout=1800, vary_on=None, key_prefix="api", cache_backend="api"
+):
+    """
+    Advanced decorator for caching API responses with flexible configuration
+
+    Args:
+        timeout: Cache timeout in seconds
+        vary_on: List of request attributes to vary cache on
+        key_prefix: Prefix for cache keys
+        cache_backend: Cache backend to use
+    """
+
+    def decorator(view_func):
+        @wraps(view_func)
+        def wrapper(self, request, *args, **kwargs):
+            # Only cache GET requests
+            if request.method != "GET":
+                return view_func(self, request, *args, **kwargs)
+
+            # Generate cache key based on view, user, and parameters
+            cache_key_parts = [
+                key_prefix,
+                view_func.__name__,
+                (
+                    str(request.user.id)
+                    if request.user.is_authenticated
+                    else "anonymous"
+                ),
+                str(hash(frozenset(request.GET.items()))),
+            ]
+
+            # Add URL parameters to cache key
+            if args:
+                cache_key_parts.append(str(hash(args)))
+            if kwargs:
+                cache_key_parts.append(str(hash(frozenset(kwargs.items()))))
+
+            # Add custom vary_on fields
+            if vary_on:
+                for field in vary_on:
+                    value = getattr(request, field, "")
+                    cache_key_parts.append(str(value))
+
+            cache_key = ":".join(cache_key_parts)
+
+            # Try to get from cache
+            cache_service = EnhancedCacheService()
+            cached_response = getattr(cache_service, cache_backend + "_cache").get(
+                cache_key
+            )
+
+            if cached_response:
+                logger.debug(
+                    f"Cache hit for API view {view_func.__name__}",
+                    extra={
+                        "cache_key": cache_key,
+                        "view": view_func.__name__,
+                        "cache_hit": True,
+                    },
+                )
+                return cached_response
+
+            # Execute view and cache result
+            start_time = time.time()
+            response = view_func(self, request, *args, **kwargs)
+            execution_time = time.time() - start_time
+
+            # Only cache successful responses
+            if hasattr(response, "status_code") and response.status_code == 200:
+                getattr(cache_service, cache_backend + "_cache").set(
+                    cache_key, response, timeout
+                )
+                logger.debug(
+                    f"Cached API response for view {view_func.__name__}",
+                    extra={
+                        "cache_key": cache_key,
+                        "view": view_func.__name__,
+                        "execution_time": execution_time,
+                        "cache_timeout": timeout,
+                        "cache_miss": True,
+                    },
+                )
+            else:
+                logger.debug(
+                    f"Not caching response for view {
+                        view_func.__name__} (status: {
+                        getattr(
+                            response,
+                            'status_code',
+                            'unknown')})"
+                )
+
+            return response
+
+        return wrapper
+
+    return decorator
+
+
+def cache_queryset_result(
+    cache_key_template: str, timeout: int = 3600, cache_backend="default"
+):
+    """
+    Decorator for caching expensive queryset operations
+
+    Args:
+        cache_key_template: Template for cache key (can use format placeholders)
+        timeout: Cache timeout in seconds
+        cache_backend: Cache backend to use
+    """
+
+    def decorator(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            # Generate cache key from template and arguments
+            try:
+                cache_key = cache_key_template.format(*args, **kwargs)
+            except (KeyError, IndexError):
+                # Fallback to simpler key generation
+                cache_key = f"{cache_key_template}:{
+                    hash(
+                        str(args) +
+                        str(kwargs))}"
+
+            cache_service = EnhancedCacheService()
+            cached_result = getattr(cache_service, cache_backend + "_cache").get(
+                cache_key
+            )
+
+            if cached_result is not None:
+                logger.debug(
+                    f"Cache hit for queryset operation: {
+                        func.__name__}"
+                )
+                return cached_result
+
+            # Execute function and cache result
+            start_time = time.time()
+            result = func(*args, **kwargs)
+            execution_time = time.time() - start_time
+
+            getattr(cache_service, cache_backend + "_cache").set(
+                cache_key, result, timeout
+            )
+            logger.debug(
+                f"Cached queryset result for {func.__name__}",
+                extra={
+                    "cache_key": cache_key,
+                    "function": func.__name__,
+                    "execution_time": execution_time,
+                    "cache_timeout": timeout,
+                },
+            )
+
+            return result
+
+        return wrapper
+
+    return decorator
+
+
+def invalidate_cache_on_save(model_name: str, cache_patterns: List[str] = None):
+    """
+    Decorator to invalidate cache when model instances are saved
+
+    Args:
+        model_name: Name of the model
+        cache_patterns: List of cache key patterns to invalidate
+    """
+
+    def decorator(func):
+        @wraps(func)
+        def wrapper(self, *args, **kwargs):
+            result = func(self, *args, **kwargs)
+
+            # Invalidate related cache entries
+            cache_service = EnhancedCacheService()
+
+            # Standard model cache invalidation
+            instance_id = getattr(self, "id", None)
+            cache_service.invalidate_model_cache(model_name, instance_id)
+
+            # Custom pattern invalidation
+            if cache_patterns:
+                for pattern in cache_patterns:
+                    if instance_id:
+                        pattern = pattern.format(model=model_name, id=instance_id)
+                    cache_service.invalidate_pattern(pattern)
+
+            logger.info(
+                f"Invalidated cache for {model_name} after save",
+                extra={
+                    "model": model_name,
+                    "instance_id": instance_id,
+                    "patterns": cache_patterns,
+                },
+            )
+
+            return result
+
+        return wrapper
+
+    return decorator
+
+
+class CachedAPIViewMixin:
+    """Mixin to add caching capabilities to API views"""
+
+    cache_timeout = 1800  # 30 minutes default
+    cache_vary_on = ["version"]
+    cache_key_prefix = "api"
+    cache_backend = "api"
+
+    @method_decorator(vary_on_headers("User-Agent", "Accept-Language"))
+    def dispatch(self, request, *args, **kwargs):
+        """Add caching to the dispatch method"""
+        if request.method == "GET" and getattr(self, "enable_caching", True):
+            return self._cached_dispatch(request, *args, **kwargs)
+        return super().dispatch(request, *args, **kwargs)
+
+    def _cached_dispatch(self, request, *args, **kwargs):
+        """Handle cached dispatch for GET requests"""
+        cache_key = self._generate_cache_key(request, *args, **kwargs)
+
+        cache_service = EnhancedCacheService()
+        cached_response = getattr(cache_service, self.cache_backend + "_cache").get(
+            cache_key
+        )
+
+        if cached_response:
+            logger.debug(f"Cache hit for view {self.__class__.__name__}")
+            return cached_response
+
+        # Execute view
+        response = super().dispatch(request, *args, **kwargs)
+
+        # Cache successful responses
+        if hasattr(response, "status_code") and response.status_code == 200:
+            getattr(cache_service, self.cache_backend + "_cache").set(
+                cache_key, response, self.cache_timeout
+            )
+            logger.debug(f"Cached response for view {self.__class__.__name__}")
+
+        return response
+
+    def _generate_cache_key(self, request, *args, **kwargs):
+        """Generate cache key for the request"""
+        key_parts = [
+            self.cache_key_prefix,
+            self.__class__.__name__,
+            request.method,
+            (str(request.user.id) if request.user.is_authenticated else "anonymous"),
+            str(hash(frozenset(request.GET.items()))),
+        ]
+
+        if args:
+            key_parts.append(str(hash(args)))
+        if kwargs:
+            key_parts.append(str(hash(frozenset(kwargs.items()))))
+
+        # Add vary_on fields
+        for field in self.cache_vary_on:
+            value = getattr(request, field, "")
+            key_parts.append(str(value))
+
+        return ":".join(key_parts)
+
+
+def smart_cache(
+    timeout: int = 3600,
+    key_func: Optional[Callable] = None,
+    invalidate_on: Optional[List[str]] = None,
+    cache_backend: str = "default",
+):
+    """
+    Smart caching decorator that adapts to function arguments
+
+    Args:
+        timeout: Cache timeout in seconds
+        key_func: Custom function to generate cache key
+        invalidate_on: List of signals to invalidate cache on
+        cache_backend: Cache backend to use
+    """
+
+    def decorator(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            # Generate cache key
+            if key_func:
+                cache_key = key_func(*args, **kwargs)
+            else:
+                # Default key generation
+                key_data = {
+                    "func": f"{func.__module__}.{func.__name__}",
+                    "args": str(args),
+                    "kwargs": json.dumps(kwargs, sort_keys=True, default=str),
+                }
+                key_string = json.dumps(key_data, sort_keys=True)
+                cache_key = f"smart_cache:{
+                    hashlib.md5(
+                        key_string.encode()).hexdigest()}"
+
+            # Try to get from cache
+            cache_service = EnhancedCacheService()
+            cached_result = getattr(cache_service, cache_backend + "_cache").get(
+                cache_key
+            )
+
+            if cached_result is not None:
+                logger.debug(f"Smart cache hit for {func.__name__}")
+                return cached_result
+
+            # Execute function
+            start_time = time.time()
+            result = func(*args, **kwargs)
+            execution_time = time.time() - start_time
+
+            # Cache result
+            getattr(cache_service, cache_backend + "_cache").set(
+                cache_key, result, timeout
+            )
+
+            logger.debug(
+                f"Smart cached result for {func.__name__}",
+                extra={
+                    "cache_key": cache_key,
+                    "execution_time": execution_time,
+                    "function": func.__name__,
+                },
+            )
+
+            return result
+
+        # Add cache invalidation if specified
+        if invalidate_on:
+            wrapper._cache_invalidate_on = invalidate_on
+            wrapper._cache_backend = cache_backend
+
+        return wrapper
+
+    return decorator
+
+
+def conditional_cache(condition_func: Callable, **cache_kwargs):
+    """
+    Cache decorator that only caches when condition is met
+
+    Args:
+        condition_func: Function that returns True if caching should be applied
+        **cache_kwargs: Arguments passed to smart_cache
+    """
+
+    def decorator(func):
+        cached_func = smart_cache(**cache_kwargs)(func)
+
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            if condition_func(*args, **kwargs):
+                return cached_func(*args, **kwargs)
+            else:
+                return func(*args, **kwargs)
+
+        return wrapper
+
+    return decorator
+
+
+# Utility functions for cache key generation
+def generate_user_cache_key(user, suffix: str = ""):
+    """Generate cache key based on user"""
+    user_id = user.id if user.is_authenticated else "anonymous"
+    return f"user:{user_id}:{suffix}" if suffix else f"user:{user_id}"
+
+
+def generate_model_cache_key(model_instance, suffix: str = ""):
+    """Generate cache key based on model instance"""
+    model_name = model_instance._meta.model_name
+    instance_id = model_instance.id
+    return (
+        f"{model_name}:{instance_id}:{suffix}"
+        if suffix
+        else f"{model_name}:{instance_id}"
+    )
+
+
+def generate_queryset_cache_key(queryset, params: dict = None):
+    """Generate cache key for queryset with parameters"""
+    model_name = queryset.model._meta.model_name
+    params_str = json.dumps(params or {}, sort_keys=True, default=str)
+    params_hash = hashlib.md5(params_str.encode()).hexdigest()
+    return f"queryset:{model_name}:{params_hash}"

backend/apps/core/exceptions.py

@@ -0,0 +1,224 @@
+"""
+Custom exception classes for ThrillWiki.
+Provides domain-specific exceptions with proper error codes and messages.
+"""
+
+from typing import Optional, Dict, Any
+
+
+class ThrillWikiException(Exception):
+    """Base exception for all ThrillWiki-specific errors."""
+
+    default_message = "An error occurred"
+    error_code = "THRILLWIKI_ERROR"
+    status_code = 500
+
+    def __init__(
+        self,
+        message: Optional[str] = None,
+        error_code: Optional[str] = None,
+        details: Optional[Dict[str, Any]] = None,
+    ):
+        self.message = message or self.default_message
+        self.error_code = error_code or self.error_code
+        self.details = details or {}
+        super().__init__(self.message)
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Convert exception to dictionary for API responses."""
+        return {
+            "error_code": self.error_code,
+            "message": self.message,
+            "details": self.details,
+        }
+
+
+class ValidationException(ThrillWikiException):
+    """Raised when data validation fails."""
+
+    default_message = "Validation failed"
+    error_code = "VALIDATION_ERROR"
+    status_code = 400
+
+
+class NotFoundError(ThrillWikiException):
+    """Raised when a requested resource is not found."""
+
+    default_message = "Resource not found"
+    error_code = "NOT_FOUND"
+    status_code = 404
+
+
+class PermissionDeniedError(ThrillWikiException):
+    """Raised when user lacks permission for an operation."""
+
+    default_message = "Permission denied"
+    error_code = "PERMISSION_DENIED"
+    status_code = 403
+
+
+class BusinessLogicError(ThrillWikiException):
+    """Raised when business logic constraints are violated."""
+
+    default_message = "Business logic violation"
+    error_code = "BUSINESS_LOGIC_ERROR"
+    status_code = 400
+
+
+class ExternalServiceError(ThrillWikiException):
+    """Raised when external service calls fail."""
+
+    default_message = "External service error"
+    error_code = "EXTERNAL_SERVICE_ERROR"
+    status_code = 502
+
+
+# Domain-specific exceptions
+
+
+class ParkError(ThrillWikiException):
+    """Base exception for park-related errors."""
+
+    error_code = "PARK_ERROR"
+
+
+class ParkNotFoundError(NotFoundError):
+    """Raised when a park is not found."""
+
+    default_message = "Park not found"
+    error_code = "PARK_NOT_FOUND"
+
+    def __init__(self, park_slug: Optional[str] = None, **kwargs):
+        if park_slug:
+            kwargs["details"] = {"park_slug": park_slug}
+            kwargs["message"] = f"Park with slug '{park_slug}' not found"
+        super().__init__(**kwargs)
+
+
+class ParkOperationError(BusinessLogicError):
+    """Raised when park operation constraints are violated."""
+
+    default_message = "Invalid park operation"
+    error_code = "PARK_OPERATION_ERROR"
+
+
+class RideError(ThrillWikiException):
+    """Base exception for ride-related errors."""
+
+    error_code = "RIDE_ERROR"
+
+
+class RideNotFoundError(NotFoundError):
+    """Raised when a ride is not found."""
+
+    default_message = "Ride not found"
+    error_code = "RIDE_NOT_FOUND"
+
+    def __init__(self, ride_slug: Optional[str] = None, **kwargs):
+        if ride_slug:
+            kwargs["details"] = {"ride_slug": ride_slug}
+            kwargs["message"] = f"Ride with slug '{ride_slug}' not found"
+        super().__init__(**kwargs)
+
+
+class RideOperationError(BusinessLogicError):
+    """Raised when ride operation constraints are violated."""
+
+    default_message = "Invalid ride operation"
+    error_code = "RIDE_OPERATION_ERROR"
+
+
+class LocationError(ThrillWikiException):
+    """Base exception for location-related errors."""
+
+    error_code = "LOCATION_ERROR"
+
+
+class InvalidCoordinatesError(ValidationException):
+    """Raised when geographic coordinates are invalid."""
+
+    default_message = "Invalid geographic coordinates"
+    error_code = "INVALID_COORDINATES"
+
+    def __init__(
+        self,
+        latitude: Optional[float] = None,
+        longitude: Optional[float] = None,
+        **kwargs,
+    ):
+        if latitude is not None or longitude is not None:
+            kwargs["details"] = {"latitude": latitude, "longitude": longitude}
+        super().__init__(**kwargs)
+
+
+class GeolocationError(ExternalServiceError):
+    """Raised when geolocation services fail."""
+
+    default_message = "Geolocation service unavailable"
+    error_code = "GEOLOCATION_ERROR"
+
+
+class ReviewError(ThrillWikiException):
+    """Base exception for review-related errors."""
+
+    error_code = "REVIEW_ERROR"
+
+
+class ReviewModerationError(BusinessLogicError):
+    """Raised when review moderation constraints are violated."""
+
+    default_message = "Review moderation error"
+    error_code = "REVIEW_MODERATION_ERROR"
+
+
+class DuplicateReviewError(BusinessLogicError):
+    """Raised when user tries to create duplicate reviews."""
+
+    default_message = "User has already reviewed this item"
+    error_code = "DUPLICATE_REVIEW"
+
+
+class AccountError(ThrillWikiException):
+    """Base exception for account-related errors."""
+
+    error_code = "ACCOUNT_ERROR"
+
+
+class InsufficientPermissionsError(PermissionDeniedError):
+    """Raised when user lacks required permissions."""
+
+    default_message = "Insufficient permissions"
+    error_code = "INSUFFICIENT_PERMISSIONS"
+
+    def __init__(self, required_permission: Optional[str] = None, **kwargs):
+        if required_permission:
+            kwargs["details"] = {"required_permission": required_permission}
+            kwargs["message"] = f"Permission '{required_permission}' required"
+        super().__init__(**kwargs)
+
+
+class EmailError(ExternalServiceError):
+    """Raised when email operations fail."""
+
+    default_message = "Email service error"
+    error_code = "EMAIL_ERROR"
+
+
+class CacheError(ThrillWikiException):
+    """Raised when cache operations fail."""
+
+    default_message = "Cache operation failed"
+    error_code = "CACHE_ERROR"
+    status_code = 500
+
+
+class RoadTripError(ExternalServiceError):
+    """Raised when road trip planning fails."""
+
+    default_message = "Road trip planning error"
+    error_code = "ROADTRIP_ERROR"
+
+    def __init__(self, service_name: Optional[str] = None, **kwargs):
+        if service_name:
+            kwargs["details"] = {"service": service_name}
+        super().__init__(**kwargs)

backend/apps/core/forms.py

@@ -1,4 +1,5 @@
 """Core forms and form components."""
+
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
 from django.utils.translation import gettext_lazy as _
@@ -8,20 +9,23 @@ from autocomplete import Autocomplete
 
 class BaseAutocomplete(Autocomplete):
     """Base autocomplete class for consistent autocomplete behavior across the project.
-    
+
     This class extends django-htmx-autocomplete's base Autocomplete class to provide:
     - Project-wide defaults for autocomplete behavior
     - Translation strings
     - Authentication enforcement
     - Sensible search configuration
     """
+
     # Search configuration
     minimum_search_length = 2  # More responsive than default 3
     max_results = 10  # Reasonable limit for performance
 
     # UI text configuration using gettext for i18n
     no_result_text = _("No matches found")
-    narrow_search_text = _("Showing %(page_size)s of %(total)s matches. Please refine your search.")
+    narrow_search_text = _(
+        "Showing %(page_size)s of %(total)s matches. Please refine your search."
+    )
     type_at_least_n_characters = _("Type at least %(n)s characters...")
 
     # Project-wide component settings
@@ -30,10 +34,10 @@ class BaseAutocomplete(Autocomplete):
     @staticmethod
     def auth_check(request):
         """Enforce authentication by default.
-        
+
         This can be overridden in subclasses if public access is needed.
         Configure AUTOCOMPLETE_BLOCK_UNAUTHENTICATED in settings to disable.
         """
-        block_unauth = getattr(settings, 'AUTOCOMPLETE_BLOCK_UNAUTHENTICATED', True)
+        block_unauth = getattr(settings, "AUTOCOMPLETE_BLOCK_UNAUTHENTICATED", True)
         if block_unauth and not request.user.is_authenticated:
-            raise PermissionDenied(_("Authentication required"))
+            raise PermissionDenied(_("Authentication required"))

backend/apps/core/forms/search.py

@@ -0,0 +1,168 @@
+from django import forms
+from django.utils.translation import gettext_lazy as _
+
+
+class LocationSearchForm(forms.Form):
+    """
+    A comprehensive search form that includes text search, location-based
+    search, and content type filtering for a unified search experience.
+    """
+
+    # Text search query
+    q = forms.CharField(
+        required=False,
+        label=_("Search Query"),
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("Search parks, rides, companies..."),
+                "class": (
+                    "w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm "
+                    "focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 "
+                    "dark:border-gray-600 dark:text-white"
+                ),
+            }
+        ),
+    )
+
+    # Location-based search
+    location = forms.CharField(
+        required=False,
+        label=_("Near Location"),
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("City, address, or coordinates..."),
+                "id": "location-input",
+                "class": (
+                    "w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm "
+                    "focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 "
+                    "dark:border-gray-600 dark:text-white"
+                ),
+            }
+        ),
+    )
+
+    # Hidden fields for coordinates
+    lat = forms.FloatField(
+        required=False, widget=forms.HiddenInput(attrs={"id": "lat-input"})
+    )
+    lng = forms.FloatField(
+        required=False, widget=forms.HiddenInput(attrs={"id": "lng-input"})
+    )
+
+    # Search radius
+    radius_km = forms.ChoiceField(
+        required=False,
+        label=_("Search Radius"),
+        choices=[
+            ("", _("Any distance")),
+            ("5", _("5 km")),
+            ("10", _("10 km")),
+            ("25", _("25 km")),
+            ("50", _("50 km")),
+            ("100", _("100 km")),
+            ("200", _("200 km")),
+        ],
+        widget=forms.Select(
+            attrs={
+                "class": (
+                    "w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm "
+                    "focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 "
+                    "dark:border-gray-600 dark:text-white"
+                )
+            }
+        ),
+    )
+
+    # Content type filters
+    search_parks = forms.BooleanField(
+        required=False,
+        initial=True,
+        label=_("Search Parks"),
+        widget=forms.CheckboxInput(
+            attrs={
+                "class": (
+                    "rounded border-gray-300 text-blue-600 focus:ring-blue-500 "
+                    "dark:border-gray-600 dark:bg-gray-700"
+                )
+            }
+        ),
+    )
+    search_rides = forms.BooleanField(
+        required=False,
+        label=_("Search Rides"),
+        widget=forms.CheckboxInput(
+            attrs={
+                "class": (
+                    "rounded border-gray-300 text-blue-600 focus:ring-blue-500 "
+                    "dark:border-gray-600 dark:bg-gray-700"
+                )
+            }
+        ),
+    )
+    search_companies = forms.BooleanField(
+        required=False,
+        label=_("Search Companies"),
+        widget=forms.CheckboxInput(
+            attrs={
+                "class": (
+                    "rounded border-gray-300 text-blue-600 focus:ring-blue-500 "
+                    "dark:border-gray-600 dark:bg-gray-700"
+                )
+            }
+        ),
+    )
+
+    # Geographic filters
+    country = forms.CharField(
+        required=False,
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("Country"),
+                "class": (
+                    "w-full px-3 py-2 text-sm border border-gray-300 rounded-md "
+                    "shadow-sm focus:ring-blue-500 focus:border-blue-500 "
+                    "dark:bg-gray-700 dark:border-gray-600 dark:text-white"
+                ),
+            }
+        ),
+    )
+    state = forms.CharField(
+        required=False,
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("State/Region"),
+                "class": (
+                    "w-full px-3 py-2 text-sm border border-gray-300 rounded-md "
+                    "shadow-sm focus:ring-blue-500 focus:border-blue-500 "
+                    "dark:bg-gray-700 dark:border-gray-600 dark:text-white"
+                ),
+            }
+        ),
+    )
+    city = forms.CharField(
+        required=False,
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("City"),
+                "class": (
+                    "w-full px-3 py-2 text-sm border border-gray-300 rounded-md "
+                    "shadow-sm focus:ring-blue-500 focus:border-blue-500 "
+                    "dark:bg-gray-700 dark:border-gray-600 dark:text-white"
+                ),
+            }
+        ),
+    )
+
+    def clean(self):
+        cleaned_data = super().clean()
+
+        # If lat/lng are provided, ensure location field is populated for
+        # display
+        lat = cleaned_data.get("lat")
+        lng = cleaned_data.get("lng")
+        location = cleaned_data.get("location")
+
+        if lat and lng and not location:
+            cleaned_data["location"] = f"{lat}, {lng}"
+
+        return cleaned_data

backend/apps/core/health_checks/__init__.py

@@ -0,0 +1 @@
+# Health checks module

backend/apps/core/health_checks/custom_checks.py

@@ -0,0 +1,325 @@
+"""
+Custom health checks for ThrillWiki application.
+"""
+
+import time
+import logging
+from django.core.cache import cache
+from django.db import connection
+from health_check.backends import BaseHealthCheckBackend
+
+logger = logging.getLogger(__name__)
+
+
+class CacheHealthCheck(BaseHealthCheckBackend):
+    """Check Redis cache connectivity and performance"""
+
+    critical_service = True
+
+    def check_status(self):
+        try:
+            # Test cache write/read performance
+            test_key = "health_check_test"
+            test_value = "test_value_" + str(int(time.time()))
+
+            start_time = time.time()
+            cache.set(test_key, test_value, timeout=30)
+            cached_value = cache.get(test_key)
+            cache_time = time.time() - start_time
+
+            if cached_value != test_value:
+                self.add_error("Cache read/write test failed - values don't match")
+                return
+
+            # Check cache performance
+            if cache_time > 0.1:  # Warn if cache operations take more than 100ms
+                self.add_error(
+                    f"Cache performance degraded: {
+                        cache_time:.3f}s for read/write operation"
+                )
+                return
+
+            # Clean up test key
+            cache.delete(test_key)
+
+            # Additional Redis-specific checks if using django-redis
+            try:
+                from django_redis import get_redis_connection
+
+                redis_client = get_redis_connection("default")
+                info = redis_client.info()
+
+                # Check memory usage
+                used_memory = info.get("used_memory", 0)
+                max_memory = info.get("maxmemory", 0)
+
+                if max_memory > 0:
+                    memory_usage_percent = (used_memory / max_memory) * 100
+                    if memory_usage_percent > 90:
+                        self.add_error(
+                            f"Redis memory usage critical: {
+                                memory_usage_percent:.1f}%"
+                        )
+                    elif memory_usage_percent > 80:
+                        logger.warning(
+                            f"Redis memory usage high: {
+                                memory_usage_percent:.1f}%"
+                        )
+
+            except ImportError:
+                # django-redis not available, skip additional checks
+                pass
+            except Exception as e:
+                logger.warning(f"Could not get Redis info: {e}")
+
+        except Exception as e:
+            self.add_error(f"Cache service unavailable: {e}")
+
+
+class DatabasePerformanceCheck(BaseHealthCheckBackend):
+    """Check database performance and connectivity"""
+
+    critical_service = False
+
+    def check_status(self):
+        try:
+            start_time = time.time()
+
+            # Test basic connectivity
+            with connection.cursor() as cursor:
+                cursor.execute("SELECT 1")
+                result = cursor.fetchone()
+
+                if result[0] != 1:
+                    self.add_error("Database connectivity test failed")
+                    return
+
+            basic_query_time = time.time() - start_time
+
+            # Test a more complex query (if it takes too long, there might be
+            # performance issues)
+            start_time = time.time()
+            with connection.cursor() as cursor:
+                cursor.execute("SELECT COUNT(*) FROM django_content_type")
+                cursor.fetchone()
+
+            complex_query_time = time.time() - start_time
+
+            # Performance thresholds
+            if basic_query_time > 1.0:
+                self.add_error(
+                    f"Database responding slowly: basic query took {
+                        basic_query_time:.2f}s"
+                )
+            elif basic_query_time > 0.5:
+                logger.warning(
+                    f"Database performance degraded: basic query took {
+                        basic_query_time:.2f}s"
+                )
+
+            if complex_query_time > 2.0:
+                self.add_error(
+                    f"Database performance critical: complex query took {
+                        complex_query_time:.2f}s"
+                )
+            elif complex_query_time > 1.0:
+                logger.warning(
+                    f"Database performance slow: complex query took {
+                        complex_query_time:.2f}s"
+                )
+
+            # Check database version and settings if possible
+            try:
+                with connection.cursor() as cursor:
+                    cursor.execute("SELECT version()")
+                    version = cursor.fetchone()[0]
+                    logger.debug(f"Database version: {version}")
+            except Exception as e:
+                logger.debug(f"Could not get database version: {e}")
+
+        except Exception as e:
+            self.add_error(f"Database performance check failed: {e}")
+
+
+class ApplicationHealthCheck(BaseHealthCheckBackend):
+    """Check application-specific health indicators"""
+
+    critical_service = False
+
+    def check_status(self):
+        try:
+            # Check if we can import critical modules
+            critical_modules = [
+                "parks.models",
+                "rides.models",
+                "accounts.models",
+                "core.services",
+            ]
+
+            for module_name in critical_modules:
+                try:
+                    __import__(module_name)
+                except ImportError as e:
+                    self.add_error(
+                        f"Critical module import failed: {module_name} - {e}"
+                    )
+
+            # Check if we can access critical models
+            try:
+                from parks.models import Park
+                from apps.rides.models import Ride
+                from django.contrib.auth import get_user_model
+
+                User = get_user_model()
+
+                # Test that we can query these models (just count, don't load
+                # data)
+                park_count = Park.objects.count()
+                ride_count = Ride.objects.count()
+                user_count = User.objects.count()
+
+                logger.debug(
+                    f"Model counts - Parks: {park_count}, Rides: {ride_count}, Users: {user_count}"
+                )
+
+            except Exception as e:
+                self.add_error(f"Model access check failed: {e}")
+
+            # Check media and static file configuration
+            from django.conf import settings
+            import os
+
+            if not os.path.exists(settings.MEDIA_ROOT):
+                self.add_error(
+                    f"Media directory does not exist: {
+                        settings.MEDIA_ROOT}"
+                )
+
+            if not os.path.exists(settings.STATIC_ROOT) and not settings.DEBUG:
+                self.add_error(
+                    f"Static directory does not exist: {settings.STATIC_ROOT}"
+                )
+
+        except Exception as e:
+            self.add_error(f"Application health check failed: {e}")
+
+
+class ExternalServiceHealthCheck(BaseHealthCheckBackend):
+    """Check external services and dependencies"""
+
+    critical_service = False
+
+    def check_status(self):
+        # Check email service if configured
+        try:
+            from django.core.mail import get_connection
+            from django.conf import settings
+
+            if (
+                hasattr(settings, "EMAIL_BACKEND")
+                and "console" not in settings.EMAIL_BACKEND
+            ):
+                # Only check if not using console backend
+                connection = get_connection()
+                if hasattr(connection, "open"):
+                    try:
+                        connection.open()
+                        connection.close()
+                    except Exception as e:
+                        logger.warning(f"Email service check failed: {e}")
+                        # Don't fail the health check for email issues in
+                        # development
+
+        except Exception as e:
+            logger.debug(f"Email service check error: {e}")
+
+        # Check if Sentry is configured and working
+        try:
+            import sentry_sdk
+
+            if sentry_sdk.Hub.current.client:
+                # Sentry is configured
+                try:
+                    # Test that we can capture a test message (this won't
+                    # actually send to Sentry)
+                    with sentry_sdk.push_scope() as scope:
+                        scope.set_tag("health_check", True)
+                        # Don't actually send a message, just verify the SDK is
+                        # working
+                        logger.debug("Sentry SDK is operational")
+                except Exception as e:
+                    logger.warning(f"Sentry SDK check failed: {e}")
+
+        except ImportError:
+            logger.debug("Sentry SDK not installed")
+        except Exception as e:
+            logger.debug(f"Sentry check error: {e}")
+
+        # Check Redis connection if configured
+        try:
+            from django.core.cache import caches
+            from django.conf import settings
+
+            cache_config = settings.CACHES.get("default", {})
+            if "redis" in cache_config.get("BACKEND", "").lower():
+                # Redis is configured, test basic connectivity
+                redis_cache = caches["default"]
+                redis_cache.set("health_check_redis", "test", 10)
+                value = redis_cache.get("health_check_redis")
+                if value != "test":
+                    self.add_error("Redis cache connectivity test failed")
+                else:
+                    redis_cache.delete("health_check_redis")
+
+        except Exception as e:
+            logger.warning(f"Redis connectivity check failed: {e}")
+
+
+class DiskSpaceHealthCheck(BaseHealthCheckBackend):
+    """Check available disk space"""
+
+    critical_service = False
+
+    def check_status(self):
+        try:
+            import shutil
+            from django.conf import settings
+
+            # Check disk space for media directory
+            media_usage = shutil.disk_usage(settings.MEDIA_ROOT)
+            media_free_percent = (media_usage.free / media_usage.total) * 100
+
+            # Check disk space for logs directory if it exists
+            logs_dir = getattr(settings, "BASE_DIR", "/tmp") / "logs"
+            if logs_dir.exists():
+                logs_usage = shutil.disk_usage(logs_dir)
+                logs_free_percent = (logs_usage.free / logs_usage.total) * 100
+            else:
+                logs_free_percent = media_free_percent  # Use same as media
+
+            # Alert thresholds
+            if media_free_percent < 10:
+                self.add_error(
+                    f"Critical disk space: {
+                        media_free_percent:.1f}% free in media directory"
+                )
+            elif media_free_percent < 20:
+                logger.warning(
+                    f"Low disk space: {
+                        media_free_percent:.1f}% free in media directory"
+                )
+
+            if logs_free_percent < 10:
+                self.add_error(
+                    f"Critical disk space: {
+                        logs_free_percent:.1f}% free in logs directory"
+                )
+            elif logs_free_percent < 20:
+                logger.warning(
+                    f"Low disk space: {
+                        logs_free_percent:.1f}% free in logs directory"
+                )
+
+        except Exception as e:
+            logger.warning(f"Disk space check failed: {e}")
+            # Don't fail health check for disk space issues in development

backend/apps/core/history.py

@@ -5,16 +5,22 @@ from django.conf import settings
 from typing import Any, Dict, Optional
 from django.db.models import QuerySet
 
+
 class DiffMixin:
     """Mixin to add diffing capabilities to models"""
-    
+
     def get_prev_record(self) -> Optional[Any]:
         """Get the previous record for this instance"""
         try:
-            return type(self).objects.filter(
-                pgh_created_at__lt=self.pgh_created_at,
-                pgh_obj_id=self.pgh_obj_id
-            ).order_by('-pgh_created_at').first()
+            return (
+                type(self)
+                .objects.filter(
+                    pgh_created_at__lt=self.pgh_created_at,
+                    pgh_obj_id=self.pgh_obj_id,
+                )
+                .order_by("-pgh_created_at")
+                .first()
+            )
         except (AttributeError, TypeError):
             return None
 
@@ -25,15 +31,20 @@ class DiffMixin:
             return {}
 
         skip_fields = {
-            'pgh_id', 'pgh_created_at', 'pgh_label', 
-            'pgh_obj_id', 'pgh_context_id', '_state',
-            'created_at', 'updated_at'
+            "pgh_id",
+            "pgh_created_at",
+            "pgh_label",
+            "pgh_obj_id",
+            "pgh_context_id",
+            "_state",
+            "created_at",
+            "updated_at",
         }
 
         changes = {}
         for field, value in self.__dict__.items():
             # Skip internal fields and those we don't want to track
-            if field.startswith('_') or field in skip_fields or field.endswith('_id'):
+            if field.startswith("_") or field in skip_fields or field.endswith("_id"):
                 continue
 
             try:
@@ -41,16 +52,18 @@ class DiffMixin:
                 new_value = value
                 if old_value != new_value:
                     changes[field] = {
-                        "old": str(old_value) if old_value is not None else "None",
-                        "new": str(new_value) if new_value is not None else "None"
+                        "old": (str(old_value) if old_value is not None else "None"),
+                        "new": (str(new_value) if new_value is not None else "None"),
                     }
             except AttributeError:
                 continue
 
         return changes
 
+
 class TrackedModel(models.Model):
     """Abstract base class for models that need history tracking"""
+
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
@@ -61,16 +74,18 @@ class TrackedModel(models.Model):
         """Get all history records for this instance in chronological order"""
         event_model = self.events.model  # pghistory provides this automatically
         if event_model:
-            return event_model.objects.filter(
-                pgh_obj_id=self.pk
-            ).order_by('-pgh_created_at')
+            return event_model.objects.filter(pgh_obj_id=self.pk).order_by(
+                "-pgh_created_at"
+            )
         return self.__class__.objects.none()
 
+
 class HistoricalSlug(models.Model):
     """Track historical slugs for models"""
+
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
     object_id = models.PositiveIntegerField()
-    content_object = GenericForeignKey('content_type', 'object_id')
+    content_object = GenericForeignKey("content_type", "object_id")
     slug = models.SlugField(max_length=255)
     created_at = models.DateTimeField(auto_now_add=True)
     user = models.ForeignKey(
@@ -78,14 +93,15 @@ class HistoricalSlug(models.Model):
         null=True,
         blank=True,
         on_delete=models.SET_NULL,
-        related_name='historical_slugs'
+        related_name="historical_slugs",
     )
 
     class Meta:
-        unique_together = ('content_type', 'slug')
+        app_label = "core"
+        unique_together = ("content_type", "slug")
         indexes = [
-            models.Index(fields=['content_type', 'object_id']),
-            models.Index(fields=['slug']),
+            models.Index(fields=["content_type", "object_id"]),
+            models.Index(fields=["slug"]),
         ]
 
     def __str__(self) -> str:

backend/apps/core/logging.py

@@ -0,0 +1,261 @@
+"""
+Centralized logging configuration for ThrillWiki.
+Provides structured logging with proper formatting and context.
+"""
+
+import logging
+import sys
+from typing import Dict, Any, Optional
+from django.conf import settings
+from django.utils import timezone
+
+
+class ThrillWikiFormatter(logging.Formatter):
+    """Custom formatter for ThrillWiki logs with structured output."""
+
+    def format(self, record):
+        # Add timestamp if not present
+        if not hasattr(record, "timestamp"):
+            record.timestamp = timezone.now().isoformat()
+
+        # Add request context if available
+        if hasattr(record, "request"):
+            record.request_id = getattr(record.request, "id", "unknown")
+            record.user_id = (
+                getattr(record.request.user, "id", "anonymous")
+                if hasattr(record.request, "user")
+                else "unknown"
+            )
+            record.path = getattr(record.request, "path", "unknown")
+            record.method = getattr(record.request, "method", "unknown")
+
+        # Structure the log message
+        if hasattr(record, "extra_data"):
+            record.structured_data = record.extra_data
+
+        return super().format(record)
+
+
+def get_logger(name: str) -> logging.Logger:
+    """
+    Get a configured logger for ThrillWiki components.
+
+    Args:
+        name: Logger name (usually __name__)
+
+    Returns:
+        Configured logger instance
+    """
+    logger = logging.getLogger(name)
+
+    # Only configure if not already configured
+    if not logger.handlers:
+        handler = logging.StreamHandler(sys.stdout)
+        formatter = ThrillWikiFormatter(
+            fmt="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+        )
+        handler.setFormatter(formatter)
+        logger.addHandler(handler)
+        logger.setLevel(logging.INFO if settings.DEBUG else logging.WARNING)
+
+    return logger
+
+
+def log_exception(
+    logger: logging.Logger,
+    exception: Exception,
+    *,
+    context: Optional[Dict[str, Any]] = None,
+    request=None,
+    level: int = logging.ERROR,
+) -> None:
+    """
+    Log an exception with structured context.
+
+    Args:
+        logger: Logger instance
+        exception: Exception to log
+        context: Additional context data
+        request: Django request object
+        level: Log level
+    """
+    log_data = {
+        "exception_type": exception.__class__.__name__,
+        "exception_message": str(exception),
+        "context": context or {},
+    }
+
+    if request:
+        log_data.update(
+            {
+                "request_path": getattr(request, "path", "unknown"),
+                "request_method": getattr(request, "method", "unknown"),
+                "user_id": (
+                    getattr(request.user, "id", "anonymous")
+                    if hasattr(request, "user")
+                    else "unknown"
+                ),
+            }
+        )
+
+    logger.log(
+        level,
+        f"Exception occurred: {exception}",
+        extra={"extra_data": log_data},
+        exc_info=True,
+    )
+
+
+def log_business_event(
+    logger: logging.Logger,
+    event_type: str,
+    *,
+    message: str,
+    context: Optional[Dict[str, Any]] = None,
+    request=None,
+    level: int = logging.INFO,
+) -> None:
+    """
+    Log a business event with structured context.
+
+    Args:
+        logger: Logger instance
+        event_type: Type of business event
+        message: Event message
+        context: Additional context data
+        request: Django request object
+        level: Log level
+    """
+    log_data = {"event_type": event_type, "context": context or {}}
+
+    if request:
+        log_data.update(
+            {
+                "request_path": getattr(request, "path", "unknown"),
+                "request_method": getattr(request, "method", "unknown"),
+                "user_id": (
+                    getattr(request.user, "id", "anonymous")
+                    if hasattr(request, "user")
+                    else "unknown"
+                ),
+            }
+        )
+
+    logger.log(level, message, extra={"extra_data": log_data})
+
+
+def log_performance_metric(
+    logger: logging.Logger,
+    operation: str,
+    *,
+    duration_ms: float,
+    context: Optional[Dict[str, Any]] = None,
+    level: int = logging.INFO,
+) -> None:
+    """
+    Log a performance metric.
+
+    Args:
+        logger: Logger instance
+        operation: Operation name
+        duration_ms: Duration in milliseconds
+        context: Additional context data
+        level: Log level
+    """
+    log_data = {
+        "metric_type": "performance",
+        "operation": operation,
+        "duration_ms": duration_ms,
+        "context": context or {},
+    }
+
+    message = f"Performance: {operation} took {duration_ms:.2f}ms"
+    logger.log(level, message, extra={"extra_data": log_data})
+
+
+def log_api_request(
+    logger: logging.Logger,
+    request,
+    *,
+    response_status: Optional[int] = None,
+    duration_ms: Optional[float] = None,
+    level: int = logging.INFO,
+) -> None:
+    """
+    Log an API request with context.
+
+    Args:
+        logger: Logger instance
+        request: Django request object
+        response_status: HTTP response status code
+        duration_ms: Request duration in milliseconds
+        level: Log level
+    """
+    log_data = {
+        "request_type": "api",
+        "path": getattr(request, "path", "unknown"),
+        "method": getattr(request, "method", "unknown"),
+        "user_id": (
+            getattr(request.user, "id", "anonymous")
+            if hasattr(request, "user")
+            else "unknown"
+        ),
+        "response_status": response_status,
+        "duration_ms": duration_ms,
+    }
+
+    message = f"API Request: {request.method} {request.path}"
+    if response_status:
+        message += f" -> {response_status}"
+    if duration_ms:
+        message += f" ({duration_ms:.2f}ms)"
+
+    logger.log(level, message, extra={"extra_data": log_data})
+
+
+def log_security_event(
+    logger: logging.Logger,
+    event_type: str,
+    *,
+    message: str,
+    severity: str = "medium",
+    context: Optional[Dict[str, Any]] = None,
+    request=None,
+) -> None:
+    """
+    Log a security-related event.
+
+    Args:
+        logger: Logger instance
+        event_type: Type of security event
+        message: Event message
+        severity: Event severity (low, medium, high, critical)
+        context: Additional context data
+        request: Django request object
+    """
+    log_data = {
+        "security_event": True,
+        "event_type": event_type,
+        "severity": severity,
+        "context": context or {},
+    }
+
+    if request:
+        log_data.update(
+            {
+                "request_path": getattr(request, "path", "unknown"),
+                "request_method": getattr(request, "method", "unknown"),
+                "user_id": (
+                    getattr(request.user, "id", "anonymous")
+                    if hasattr(request, "user")
+                    else "unknown"
+                ),
+                "remote_addr": request.META.get("REMOTE_ADDR", "unknown"),
+                "user_agent": request.META.get("HTTP_USER_AGENT", "unknown"),
+            }
+        )
+
+    # Use WARNING for medium/high, ERROR for critical
+    level = logging.ERROR if severity in ["high", "critical"] else logging.WARNING
+
+    logger.log(level, f"SECURITY: {message}", extra={"extra_data": log_data})

backend/apps/core/management/__init__.py

@@ -0,0 +1 @@
+# Django management commands

backend/apps/core/management/commands/__init__.py

@@ -0,0 +1 @@
+# Django management commands

backend/apps/core/management/commands/rundev.py

@@ -0,0 +1,101 @@
+"""
+Django management command to run the development server.
+
+This command automatically sets up the development environment and starts
+the server, replacing the need for the dev_server.sh script.
+"""
+
+import subprocess
+import sys
+from django.core.management.base import BaseCommand
+from django.core.management import execute_from_command_line
+
+
+class Command(BaseCommand):
+    help = "Run the development server with automatic setup"
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--port",
+            type=str,
+            default="8000",
+            help="Port to run the server on (default: 8000)",
+        )
+        parser.add_argument(
+            "--host",
+            type=str,
+            default="0.0.0.0",
+            help="Host to bind the server to (default: 0.0.0.0)",
+        )
+        parser.add_argument(
+            "--skip-setup",
+            action="store_true",
+            help="Skip the development setup and go straight to running the server",
+        )
+        parser.add_argument(
+            "--use-runserver-plus",
+            action="store_true",
+            help="Use runserver_plus if available (from django-extensions)",
+        )
+
+    def handle(self, *args, **options):
+        """Run the development setup and start the server."""
+        if not options["skip_setup"]:
+            self.stdout.write(
+                self.style.SUCCESS(
+                    "🚀 Setting up and starting ThrillWiki Development Server..."
+                )
+            )
+
+            # Run the setup_dev command first
+            execute_from_command_line(["manage.py", "setup_dev"])
+
+        else:
+            self.stdout.write(
+                self.style.SUCCESS("🚀 Starting ThrillWiki Development Server...")
+            )
+
+        # Determine which server command to use
+        server_command = self.get_server_command(options)
+
+        # Start the server
+        self.stdout.write("")
+        self.stdout.write(
+            self.style.SUCCESS(
+                f'🌟 Starting Django development server on http://{options["host"]}:{options["port"]}'
+            )
+        )
+        self.stdout.write("Press Ctrl+C to stop the server")
+        self.stdout.write("")
+
+        try:
+            if options["use_runserver_plus"] or self.has_runserver_plus():
+                execute_from_command_line(
+                    [
+                        "manage.py",
+                        "runserver_plus",
+                        f'{options["host"]}:{options["port"]}',
+                    ]
+                )
+            else:
+                execute_from_command_line(
+                    ["manage.py", "runserver", f'{options["host"]}:{options["port"]}']
+                )
+        except KeyboardInterrupt:
+            self.stdout.write("")
+            self.stdout.write(self.style.SUCCESS("👋 Development server stopped"))
+
+    def get_server_command(self, options):
+        """Determine which server command to use."""
+        if options["use_runserver_plus"] or self.has_runserver_plus():
+            return "runserver_plus"
+        return "runserver"
+
+    def has_runserver_plus(self):
+        """Check if runserver_plus is available (django-extensions)."""
+        try:
+            import django_extensions
+
+            return True
+        except ImportError:
+            return False

backend/apps/core/management/commands/setup_dev.py

@@ -0,0 +1,226 @@
+"""
+Django management command to set up the development environment.
+
+This command performs all the setup tasks that the dev_server.sh script does,
+allowing the project to run without requiring the shell script.
+"""
+
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+from django.core.management.base import BaseCommand
+from django.core.management import execute_from_command_line
+from django.conf import settings
+
+
+class Command(BaseCommand):
+    help = "Set up the development environment"
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--skip-migrations",
+            action="store_true",
+            help="Skip running database migrations",
+        )
+        parser.add_argument(
+            "--skip-static",
+            action="store_true",
+            help="Skip collecting static files",
+        )
+        parser.add_argument(
+            "--skip-tailwind",
+            action="store_true",
+            help="Skip building Tailwind CSS",
+        )
+        parser.add_argument(
+            "--skip-superuser",
+            action="store_true",
+            help="Skip creating development superuser",
+        )
+
+    def handle(self, *args, **options):
+        """Run the development setup process."""
+        self.stdout.write(
+            self.style.SUCCESS("🚀 Setting up ThrillWiki Development Environment...")
+        )
+
+        # Create necessary directories
+        self.create_directories()
+
+        # Run database migrations if needed
+        if not options["skip_migrations"]:
+            self.run_migrations()
+
+        # Seed sample data
+        self.seed_sample_data()
+
+        # Create superuser if it doesn't exist
+        if not options["skip_superuser"]:
+            self.create_superuser()
+
+        # Collect static files
+        if not options["skip_static"]:
+            self.collect_static()
+
+        # Build Tailwind CSS
+        if not options["skip_tailwind"]:
+            self.build_tailwind()
+
+        # Run system checks
+        self.run_system_checks()
+
+        # Display environment info
+        self.display_environment_info()
+
+        self.stdout.write(
+            self.style.SUCCESS("✅ Development environment setup complete!")
+        )
+
+    def create_directories(self):
+        """Create necessary directories."""
+        self.stdout.write("📁 Creating necessary directories...")
+        directories = ["logs", "profiles", "media", "staticfiles", "static/css"]
+
+        for directory in directories:
+            dir_path = Path(settings.BASE_DIR) / directory
+            dir_path.mkdir(parents=True, exist_ok=True)
+
+        self.stdout.write(self.style.SUCCESS("✅ Directories created"))
+
+    def run_migrations(self):
+        """Run database migrations if needed."""
+        self.stdout.write("🗄️  Checking database migrations...")
+
+        try:
+            # Check if migrations are up to date
+            result = subprocess.run(
+                [sys.executable, "manage.py", "migrate", "--check"],
+                capture_output=True,
+                text=True,
+            )
+
+            if result.returncode == 0:
+                self.stdout.write(
+                    self.style.SUCCESS("✅ Database migrations are up to date")
+                )
+            else:
+                self.stdout.write("🔄 Running database migrations...")
+                subprocess.run(
+                    [sys.executable, "manage.py", "migrate", "--noinput"], check=True
+                )
+                self.stdout.write(
+                    self.style.SUCCESS("✅ Database migrations completed")
+                )
+
+        except subprocess.CalledProcessError as e:
+            self.stdout.write(
+                self.style.WARNING(f"⚠️  Migration error (continuing): {e}")
+            )
+
+    def seed_sample_data(self):
+        """Seed sample data to the database."""
+        self.stdout.write("🌱 Seeding sample data...")
+
+        try:
+            subprocess.run(
+                [sys.executable, "manage.py", "seed_sample_data"], check=True
+            )
+            self.stdout.write(self.style.SUCCESS("✅ Sample data seeded"))
+        except subprocess.CalledProcessError:
+            self.stdout.write(
+                self.style.WARNING("⚠️  Could not seed sample data (continuing)")
+            )
+
+    def create_superuser(self):
+        """Create development superuser if it doesn't exist."""
+        self.stdout.write("👤 Checking for superuser...")
+
+        try:
+            from django.contrib.auth import get_user_model
+
+            User = get_user_model()
+
+            if User.objects.filter(is_superuser=True).exists():
+                self.stdout.write(self.style.SUCCESS("✅ Superuser already exists"))
+            else:
+                self.stdout.write("👤 Creating development superuser (admin/admin)...")
+                if not User.objects.filter(username="admin").exists():
+                    User.objects.create_superuser("admin", "admin@example.com", "admin")
+                    self.stdout.write(
+                        self.style.SUCCESS("✅ Created superuser: admin/admin")
+                    )
+                else:
+                    self.stdout.write(
+                        self.style.SUCCESS("✅ Admin user already exists")
+                    )
+
+        except Exception as e:
+            self.stdout.write(self.style.WARNING(f"⚠️  Could not create superuser: {e}"))
+
+    def collect_static(self):
+        """Collect static files for development."""
+        self.stdout.write("📦 Collecting static files...")
+
+        try:
+            subprocess.run(
+                [sys.executable, "manage.py", "collectstatic", "--noinput", "--clear"],
+                check=True,
+            )
+            self.stdout.write(self.style.SUCCESS("✅ Static files collected"))
+        except subprocess.CalledProcessError as e:
+            self.stdout.write(
+                self.style.WARNING(f"⚠️  Could not collect static files: {e}")
+            )
+
+    def build_tailwind(self):
+        """Build Tailwind CSS if npm is available."""
+        self.stdout.write("🎨 Building Tailwind CSS...")
+
+        try:
+            # Check if npm is available
+            subprocess.run(["npm", "--version"], capture_output=True, check=True)
+
+            # Build Tailwind CSS
+            subprocess.run(
+                [sys.executable, "manage.py", "tailwind", "build"], check=True
+            )
+            self.stdout.write(self.style.SUCCESS("✅ Tailwind CSS built"))
+
+        except (subprocess.CalledProcessError, FileNotFoundError):
+            self.stdout.write(
+                self.style.WARNING(
+                    "⚠️  npm not found or Tailwind build failed, skipping"
+                )
+            )
+
+    def run_system_checks(self):
+        """Run Django system checks."""
+        self.stdout.write("🔍 Running system checks...")
+
+        try:
+            subprocess.run([sys.executable, "manage.py", "check"], check=True)
+            self.stdout.write(self.style.SUCCESS("✅ System checks passed"))
+        except subprocess.CalledProcessError:
+            self.stdout.write(
+                self.style.WARNING("❌ System checks failed, but continuing...")
+            )
+
+    def display_environment_info(self):
+        """Display development environment information."""
+        self.stdout.write("")
+        self.stdout.write(self.style.SUCCESS("🌍 Development Environment:"))
+        self.stdout.write(f"  - Settings Module: {settings.SETTINGS_MODULE}")
+        self.stdout.write(f"  - Debug Mode: {settings.DEBUG}")
+        self.stdout.write("  - Database: PostgreSQL with PostGIS")
+        self.stdout.write("  - Cache: Local memory cache")
+        self.stdout.write("  - Admin URL: http://localhost:8000/admin/")
+        self.stdout.write("  - Admin User: admin / admin")
+        self.stdout.write("  - Silk Profiler: http://localhost:8000/silk/")
+        self.stdout.write("  - Debug Toolbar: Available on debug pages")
+        self.stdout.write("  - API Documentation: http://localhost:8000/api/docs/")
+        self.stdout.write("")
+        self.stdout.write("🌟 Ready to start development server with:")
+        self.stdout.write("   python manage.py runserver")
+        self.stdout.write("")