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

update urls mainly, fix domain.com/rides to work still needs done, filtering

Browse Source
This commit is contained in:
pacnpal
2024-10-30 08:50:42 -04:00
parent c58968a24a
commit 6a27f0eab0
17 changed files with 195 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
parks/__pycache__/urls.cpython-312.pyc
View File

Binary file not shown.

5
parks/urls.py
View File

@@ -1,10 +1,13 @@
from django.urls import path from django.urls import path, include
from . import views from . import views
from rides.views import RideListView
app_name = 'parks' app_name = 'parks'
urlpatterns = [ urlpatterns = [
path('', views.ParkListView.as_view(), name='park_list'), path('', views.ParkListView.as_view(), name='park_list'),
path('create/', views.ParkCreateView.as_view(), name='park_create'), path('create/', views.ParkCreateView.as_view(), name='park_create'),
path('rides/', RideListView.as_view(), name='all_rides'), # Global rides list
path('<slug:slug>/', views.ParkDetailView.as_view(), name='park_detail'), path('<slug:slug>/', views.ParkDetailView.as_view(), name='park_detail'),
path('<slug:park_slug>/rides/', include('rides.urls', namespace='rides')),
] ]

BIN
rides/__pycache__/urls.cpython-312.pyc
View File

Binary file not shown.

BIN
rides/__pycache__/views.cpython-312.pyc
View File

Binary file not shown.

1
rides/urls.py
View File

@@ -6,4 +6,5 @@ app_name = 'rides'
urlpatterns = [ urlpatterns = [
path('', views.RideListView.as_view(), name='ride_list'), path('', views.RideListView.as_view(), name='ride_list'),
path('create/', views.RideCreateView.as_view(), name='ride_create'), path('create/', views.RideCreateView.as_view(), name='ride_create'),
path('<slug:ride_slug>/', views.RideDetailView.as_view(), name='ride_detail'),
] ]

50
rides/views.py
View File

@@ -15,11 +15,17 @@ from moderation.models import EditSubmission
class RideCreateView(LoginRequiredMixin, CreateView): class RideCreateView(LoginRequiredMixin, CreateView):
model = Ride model = Ride
template_name = 'rides/ride_form.html' template_name = 'rides/ride_form.html'
fields = ['name', 'park', 'park_area', 'category', 'manufacturer', 'model_name', 'status', fields = ['name', 'park_area', 'category', 'manufacturer', 'model_name', 'status',
'opening_date', 'closing_date', 'status_since', 'min_height_in', 'max_height_in', 'opening_date', 'closing_date', 'status_since', 'min_height_in', 'max_height_in',
'accessibility_options', 'capacity_per_hour', 'ride_duration_seconds', 'description'] 'accessibility_options', 'capacity_per_hour', 'ride_duration_seconds', 'description']
def setup(self, request, *args, **kwargs):
super().setup(request, *args, **kwargs)
self.park = get_object_or_404(Park, slug=self.kwargs['park_slug'])
def form_valid(self, form): def form_valid(self, form):
form.instance.park = self.park
# If user is moderator or above, save directly # If user is moderator or above, save directly
if self.request.user.role in ['MODERATOR', 'ADMIN', 'SUPERUSER']: if self.request.user.role in ['MODERATOR', 'ADMIN', 'SUPERUSER']:
self.object = form.save() self.object = form.save()
@@ -27,9 +33,8 @@ class RideCreateView(LoginRequiredMixin, CreateView):
# Otherwise, create a submission # Otherwise, create a submission
cleaned_data = form.cleaned_data.copy() cleaned_data = form.cleaned_data.copy()
cleaned_data['park'] = self.park.id
# Convert model instances to IDs for JSON serialization # Convert model instances to IDs for JSON serialization
if cleaned_data.get('park'):
cleaned_data['park'] = cleaned_data['park'].id
if cleaned_data.get('park_area'): if cleaned_data.get('park_area'):
cleaned_data['park_area'] = cleaned_data['park_area'].id cleaned_data['park_area'] = cleaned_data['park_area'].id
if cleaned_data.get('manufacturer'): if cleaned_data.get('manufacturer'):
@@ -43,14 +48,19 @@ class RideCreateView(LoginRequiredMixin, CreateView):
reason=self.request.POST.get('reason', ''), reason=self.request.POST.get('reason', ''),
source=self.request.POST.get('source', '') source=self.request.POST.get('source', '')
) )
return HttpResponseRedirect(reverse('ride_list')) return HttpResponseRedirect(reverse('parks:rides:ride_list', kwargs={'park_slug': self.park.slug}))
def get_success_url(self): def get_success_url(self):
return reverse('ride_detail', kwargs={ return reverse('parks:rides:ride_detail', kwargs={
'park_slug': self.object.park.slug, 'park_slug': self.park.slug,
'ride_slug': self.object.slug 'ride_slug': self.object.slug
}) })
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context['park'] = self.park
return context
class RideDetailView(SlugRedirectMixin, EditSubmissionMixin, PhotoSubmissionMixin, InlineEditMixin, HistoryMixin, DetailView): class RideDetailView(SlugRedirectMixin, EditSubmissionMixin, PhotoSubmissionMixin, InlineEditMixin, HistoryMixin, DetailView):
model = Ride model = Ride
template_name = 'rides/ride_detail.html' template_name = 'rides/ride_detail.html'
@@ -75,7 +85,7 @@ class RideDetailView(SlugRedirectMixin, EditSubmissionMixin, PhotoSubmissionMixi
return context return context
def get_redirect_url_pattern(self): def get_redirect_url_pattern(self):
return 'ride_detail' return 'parks:rides:ride_detail'
def get_redirect_url_kwargs(self): def get_redirect_url_kwargs(self):
return { return {
@@ -88,15 +98,28 @@ class RideListView(ListView):
template_name = 'rides/ride_list.html' template_name = 'rides/ride_list.html'
context_object_name = 'rides' context_object_name = 'rides'
def setup(self, request, *args, **kwargs):
super().setup(request, *args, **kwargs)
self.park = None
if 'park_slug' in self.kwargs:
self.park = get_object_or_404(Park, slug=self.kwargs['park_slug'])
def get_queryset(self): def get_queryset(self):
queryset = Ride.objects.select_related('park', 'coaster_stats', 'manufacturer').prefetch_related('photos') queryset = Ride.objects.select_related('park', 'coaster_stats', 'manufacturer').prefetch_related('photos')
# Filter by park if viewing park-specific rides
if self.park:
queryset = queryset.filter(park=self.park)
search = self.request.GET.get('search', '').strip() or None search = self.request.GET.get('search', '').strip() or None
category = self.request.GET.get('category', '').strip() or None category = self.request.GET.get('category', '').strip() or None
status = self.request.GET.get('status', '').strip() or None status = self.request.GET.get('status', '').strip() or None
manufacturer = self.request.GET.get('manufacturer', '').strip() or None manufacturer = self.request.GET.get('manufacturer', '').strip() or None
if search: if search:
if self.park:
queryset = queryset.filter(name__icontains=search)
else:
queryset = queryset.filter( queryset = queryset.filter(
Q(name__icontains=search) | Q(name__icontains=search) |
Q(park__name__icontains=search) Q(park__name__icontains=search)
@@ -106,18 +129,21 @@ class RideListView(ListView):
if status: if status:
queryset = queryset.filter(status=status) queryset = queryset.filter(status=status)
if manufacturer: if manufacturer:
# Example: Exclude null manufacturers in RideListView queryset = queryset.exclude(manufacturer__isnull=True)
queryset = Ride.objects.exclude(manufacturer__isnull=True)
return queryset return queryset
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context['park'] = self.park
# Get manufacturers for the filter dropdown
manufacturer_query = Ride.objects
if self.park:
manufacturer_query = manufacturer_query.filter(park=self.park)
# Exclude cases where manufacturer is null or an empty string
context['manufacturers'] = list( context['manufacturers'] = list(
Ride.objects.exclude(manufacturer__isnull=True) manufacturer_query.exclude(manufacturer__isnull=True)
.exclude(manufacturer__isnull=True)
.values_list('manufacturer__name', flat=True) .values_list('manufacturer__name', flat=True)
.distinct().order_by('manufacturer__name') .distinct().order_by('manufacturer__name')
) )

2
templates/base/base.html
View File

@@ -66,7 +66,7 @@
<i class="fas fa-map-marker-alt"></i> <i class="fas fa-map-marker-alt"></i>
<span>Parks</span> <span>Parks</span>
</a> </a>
<a href="{% url 'rides:ride_list' %}" class="nav-link"> <a href="{% url 'parks:all_rides' %}" class="nav-link">
<i class="fas fa-rocket"></i> <i class="fas fa-rocket"></i>
<span>Rides</span> <span>Rides</span>
</a> </a>

52
templates/companies/manufacturer_detail.html
View File

@@ -4,22 +4,22 @@
{% block title %}{{ manufacturer.name }} - ThrillWiki{% endblock %} {% block title %}{{ manufacturer.name }} - ThrillWiki{% endblock %}
{% block content %} {% block content %}
<div class="container mx-auto px-4"> <div class="container px-4 mx-auto">
<!-- Manufacturer Header --> <!-- Manufacturer Header -->
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 mb-6"> <div class="p-6 mb-6 bg-white rounded-lg shadow dark:bg-gray-800">
<div class="flex flex-col md:flex-row justify-between items-start md:items-center"> <div class="flex flex-col items-start justify-between md:flex-row md:items-center">
<div> <div>
<h1 class="text-3xl font-bold text-gray-900 dark:text-white mb-2">{{ manufacturer.name }}</h1> <h1 class="mb-2 text-3xl font-bold text-gray-900 dark:text-white">{{ manufacturer.name }}</h1>
{% if manufacturer.headquarters %} {% if manufacturer.headquarters %}
<p class="text-gray-600 dark:text-gray-400"> <p class="text-gray-600 dark:text-gray-400">
<i class="fas fa-map-marker-alt mr-2"></i>{{ manufacturer.headquarters }} <i class="mr-2 fas fa-map-marker-alt"></i>{{ manufacturer.headquarters }}
</p> </p>
{% endif %} {% endif %}
</div> </div>
{% if manufacturer.website %} {% if manufacturer.website %}
<a href="{{ manufacturer.website }}" target="_blank" rel="noopener noreferrer" <a href="{{ manufacturer.website }}" target="_blank" rel="noopener noreferrer"
class="btn-secondary mt-4 md:mt-0"> class="mt-4 btn-secondary md:mt-0">
<i class="fas fa-external-link-alt mr-2"></i>Visit Website <i class="mr-2 fas fa-external-link-alt"></i>Visit Website
</a> </a>
{% endif %} {% endif %}
</div> </div>
@@ -32,54 +32,54 @@
</div> </div>
<!-- Manufacturer Stats --> <!-- Manufacturer Stats -->
<div class="grid grid-cols-1 md:grid-cols-3 gap-6 mb-6"> <div class="grid grid-cols-1 gap-6 mb-6 md:grid-cols-3">
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 text-center"> <div class="p-6 text-center bg-white rounded-lg shadow dark:bg-gray-800">
<div class="text-3xl font-bold text-blue-600 dark:text-blue-400"> <div class="text-3xl font-bold text-blue-600 dark:text-blue-400">
{{ rides.count }} {{ rides.count }}
</div> </div>
<div class="text-gray-600 dark:text-gray-400 mt-1">Total Rides</div> <div class="mt-1 text-gray-600 dark:text-gray-400">Total Rides</div>
</div> </div>
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 text-center"> <div class="p-6 text-center bg-white rounded-lg shadow dark:bg-gray-800">
<div class="text-3xl font-bold text-blue-600 dark:text-blue-400"> <div class="text-3xl font-bold text-blue-600 dark:text-blue-400">
{{ rides|filter:"type='ROLLER_COASTER'"|length }} {{ rides|filter:"type='ROLLER_COASTER'"|length }}
</div> </div>
<div class="text-gray-600 dark:text-gray-400 mt-1">Roller Coasters</div> <div class="mt-1 text-gray-600 dark:text-gray-400">Roller Coasters</div>
</div> </div>
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 text-center"> <div class="p-6 text-center bg-white rounded-lg shadow dark:bg-gray-800">
<div class="text-3xl font-bold text-blue-600 dark:text-blue-400"> <div class="text-3xl font-bold text-blue-600 dark:text-blue-400">
{{ rides|regroup:"park"|length }} {{ rides|regroup:"park"|length }}
</div> </div>
<div class="text-gray-600 dark:text-gray-400 mt-1">Parks with Rides</div> <div class="mt-1 text-gray-600 dark:text-gray-400">Parks with Rides</div>
</div> </div>
</div> </div>
<!-- Rides List --> <!-- Rides List -->
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6"> <div class="p-6 bg-white rounded-lg shadow dark:bg-gray-800">
<h2 class="text-2xl font-bold text-gray-900 dark:text-white mb-6">Rides</h2> <h2 class="mb-6 text-2xl font-bold text-gray-900 dark:text-white">Rides</h2>
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6"> <div class="grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
{% for ride in rides %} {% for ride in rides %}
<div class="bg-gray-50 dark:bg-gray-700 rounded-lg overflow-hidden"> <div class="overflow-hidden rounded-lg bg-gray-50 dark:bg-gray-700">
{% if ride.photos.exists %} {% if ride.photos.exists %}
<img src="{{ ride.photos.first.image.url }}" <img src="{{ ride.photos.first.image.url }}"
alt="{{ ride.name }}" alt="{{ ride.name }}"
class="w-full h-48 object-cover"> class="object-cover w-full h-48">
{% else %} {% else %}
<div class="w-full h-48 bg-gray-200 dark:bg-gray-600 flex items-center justify-center"> <div class="flex items-center justify-center w-full h-48 bg-gray-200 dark:bg-gray-600">
<span class="text-gray-400">No image available</span> <span class="text-gray-400">No image available</span>
</div> </div>
{% endif %} {% endif %}
<div class="p-4"> <div class="p-4">
<h3 class="text-lg font-semibold mb-2"> <h3 class="mb-2 text-lg font-semibold">
<a href="{% url 'rides:ride_detail' ride.park.slug ride.slug %}" <a href="{% url 'parks:rides:ride_detail' ride.park.slug ride.slug %}"
class="text-blue-600 dark:text-blue-400 hover:underline"> class="text-blue-600 dark:text-blue-400 hover:underline">
{{ ride.name }} {{ ride.name }}
</a> </a>
</h3> </h3>
<p class="text-gray-600 dark:text-gray-400 mb-2"> <p class="mb-2 text-gray-600 dark:text-gray-400">
at <a href="{% url 'parks:park_detail' ride.park.slug %}" at <a href="{% url 'parks:park_detail' ride.park.slug %}"
class="hover:underline">{{ ride.park.name }}</a> class="hover:underline">{{ ride.park.name }}</a>
</p> </p>
@@ -105,8 +105,8 @@
{% endif %} {% endif %}
{% if ride.average_rating %} {% if ride.average_rating %}
<div class="mt-2 flex items-center"> <div class="flex items-center mt-2">
<span class="text-yellow-400 mr-1">★</span> <span class="mr-1 text-yellow-400">★</span>
<span class="text-gray-600 dark:text-gray-400"> <span class="text-gray-600 dark:text-gray-400">
{{ ride.average_rating|floatformat:1 }}/10 {{ ride.average_rating|floatformat:1 }}/10
</span> </span>
@@ -115,7 +115,7 @@
</div> </div>
</div> </div>
{% empty %} {% empty %}
<div class="col-span-full text-center py-8"> <div class="py-8 text-center col-span-full">
<p class="text-gray-500 dark:text-gray-400">No rides found for this manufacturer.</p> <p class="text-gray-500 dark:text-gray-400">No rides found for this manufacturer.</p>
</div> </div>
{% endfor %} {% endfor %}

4
templates/home.html
View File

@@ -18,7 +18,7 @@
class="px-8 py-3 text-lg btn-primary"> class="px-8 py-3 text-lg btn-primary">
Explore Parks Explore Parks
</a> </a>
<a href="{% url 'rides:ride_list' %}" <a href="{% url 'parks:all_rides' %}"
class="px-8 py-3 text-lg btn-secondary"> class="px-8 py-3 text-lg btn-secondary">
View Rides View Rides
</a> </a>
@@ -93,7 +93,7 @@
Popular Rides Popular Rides
</h2> </h2>
{% for ride in popular_rides %} {% for ride in popular_rides %}
<a href="{% url 'rides:ride_detail' ride.park.slug ride.slug %}" <a href="{% url 'parks:rides:ride_detail' ride.park.slug ride.slug %}"
class="block p-4 mb-4 transition-all rounded-lg hover:bg-gray-50 dark:hover:bg-gray-700 hover:translate-x-2"> class="block p-4 mb-4 transition-all rounded-lg hover:bg-gray-50 dark:hover:bg-gray-700 hover:translate-x-2">
<div class="text-lg font-semibold text-blue-600 dark:text-blue-400"> <div class="text-lg font-semibold text-blue-600 dark:text-blue-400">
{{ ride.name }} {{ ride.name }}

13
templates/parks/park_detail.html
View File

@@ -69,12 +69,12 @@
<!-- Park Stats --> <!-- Park Stats -->
<div class="grid grid-cols-1 gap-6 mb-6 md:grid-cols-3"> <div class="grid grid-cols-1 gap-6 mb-6 md:grid-cols-3">
<div class="p-6 text-center transition-transform transform bg-white rounded-lg shadow-lg dark:bg-gray-800 hover:-translate-y-1"> <a href="{% url 'parks:rides:ride_list' park.slug %}" class="p-6 text-center transition-transform transform bg-white rounded-lg shadow-lg dark:bg-gray-800 hover:-translate-y-1">
<div class="text-3xl font-bold text-blue-600 dark:text-blue-400"> <div class="text-3xl font-bold text-blue-600 dark:text-blue-400">
{{ rides.count }} {{ rides.count }}
</div> </div>
<div class="mt-1 text-gray-600 dark:text-gray-300">Total Attractions</div> <div class="mt-1 text-gray-600 dark:text-gray-300">Total Attractions</div>
</div> </a>
<div class="p-6 text-center transition-transform transform bg-white rounded-lg shadow-lg dark:bg-gray-800 hover:-translate-y-1"> <div class="p-6 text-center transition-transform transform bg-white rounded-lg shadow-lg dark:bg-gray-800 hover:-translate-y-1">
<div class="text-3xl font-bold text-blue-600 dark:text-blue-400"> <div class="text-3xl font-bold text-blue-600 dark:text-blue-400">
@@ -134,12 +134,17 @@
<!-- Rides List --> <!-- Rides List -->
<div class="p-6 bg-white rounded-lg shadow-lg dark:bg-gray-800"> <div class="p-6 bg-white rounded-lg shadow-lg dark:bg-gray-800">
<h2 class="mb-4 text-2xl font-bold text-gray-900 dark:text-white">Attractions</h2> <div class="flex items-center justify-between mb-4">
<h2 class="text-2xl font-bold text-gray-900 dark:text-white">Attractions</h2>
<a href="{% url 'parks:rides:ride_list' park.slug %}" class="text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">
View All <i class="ml-1 fas fa-arrow-right"></i>
</a>
</div>
<div class="grid grid-cols-1 gap-4 md:grid-cols-2"> <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
{% for ride in rides %} {% for ride in rides %}
<div class="p-4 transition-transform transform rounded-lg bg-gray-50 dark:bg-gray-700/50 hover:-translate-y-1"> <div class="p-4 transition-transform transform rounded-lg bg-gray-50 dark:bg-gray-700/50 hover:-translate-y-1">
<h3 class="mb-2 text-lg font-semibold"> <h3 class="mb-2 text-lg font-semibold">
<a href="{% url 'rides:ride_detail' park.slug ride.slug %}" <a href="{% url 'parks:rides:ride_detail' park.slug ride.slug %}"
class="text-blue-600 dark:text-blue-400 hover:text-blue-700 dark:hover:text-blue-300"> class="text-blue-600 dark:text-blue-400 hover:text-blue-700 dark:hover:text-blue-300">
{{ ride.name }} {{ ride.name }}
</a> </a>

11
templates/parks/park_list.html
View File

@@ -8,7 +8,7 @@
<div class="flex flex-col items-start justify-between gap-4 mb-6 md:flex-row md:items-center"> <div class="flex flex-col items-start justify-between gap-4 mb-6 md:flex-row md:items-center">
<h1 class="text-3xl font-bold text-gray-900 dark:text-white">Parks</h1> <h1 class="text-3xl font-bold text-gray-900 dark:text-white">Parks</h1>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<a href="{% url 'park_create' %}" class="btn-primary"> <a href="{% url 'parks:park_create' %}" class="btn-primary">
<i class="mr-2 fas fa-plus"></i>Add Park <i class="mr-2 fas fa-plus"></i>Add Park
</a> </a>
{% endif %} {% endif %}
@@ -70,7 +70,7 @@
{% endif %} {% endif %}
<div class="p-4"> <div class="p-4">
<h2 class="mb-2 text-xl font-bold"> <h2 class="mb-2 text-xl font-bold">
<a href="{% url 'park_detail' park.slug %}" <a href="{% url 'parks:park_detail' park.slug %}"
class="text-gray-900 hover:text-blue-600 dark:text-white dark:hover:text-blue-400"> class="text-gray-900 hover:text-blue-600 dark:text-white dark:hover:text-blue-400">
{{ park.name }} {{ park.name }}
</a> </a>
@@ -95,9 +95,10 @@
{% endif %} {% endif %}
</div> </div>
<div class="flex items-center justify-between mt-4"> <div class="flex items-center justify-between mt-4">
<div class="text-sm text-gray-600 dark:text-gray-400"> <a href="{% url 'parks:rides:ride_list' park.slug %}"
{{ park.rides.count }} attractions class="text-sm text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">
</div> {{ park.rides.count }} attractions <i class="ml-1 fas fa-arrow-right"></i>
</a>
{% if park.owner %} {% if park.owner %}
<a href="{% url 'companies:company_detail' park.owner.slug %}" <a href="{% url 'companies:company_detail' park.owner.slug %}"
class="text-sm text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300"> class="text-sm text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">

91
templates/rides/partials/ride_list.html
View File

@@ -1,60 +1,63 @@
{% for ride in rides %} {% for ride in rides %}
<div class="bg-white dark:bg-gray-800 shadow rounded-lg overflow-hidden transform transition-transform hover:-translate-y-1"> <div class="overflow-hidden transition-transform transform bg-white rounded-lg shadow-lg dark:bg-gray-800 hover:-translate-y-1">
{% if ride.photos.first %} {% if ride.photos.exists %}
<div class="aspect-w-16 aspect-h-9">
<img src="{{ ride.photos.first.image.url }}" <img src="{{ ride.photos.first.image.url }}"
alt="{{ ride.name }}" alt="{{ ride.name }}"
class="w-full h-48 object-cover"> class="object-cover w-full">
{% else %}
<div class="w-full h-48 bg-gray-200 dark:bg-gray-700 flex items-center justify-center">
<span class="text-gray-400">No image available</span>
</div> </div>
{% endif %} {% endif %}
<div class="p-4"> <div class="p-4">
<h3 class="text-xl font-semibold mb-2"> <h2 class="mb-2 text-xl font-bold">
<a href="{% url 'rides:ride_detail' park_slug=ride.park.slug ride_slug=ride.slug %}" <a href="{% url 'parks:rides:ride_detail' ride.park.slug ride.slug %}"
class="text-blue-600 dark:text-blue-400 hover:underline">{{ ride.name }}</a> class="text-gray-900 hover:text-blue-600 dark:text-white dark:hover:text-blue-400">
</h3> {{ ride.name }}
<p class="text-gray-600 dark:text-gray-400 mb-2"> </a>
at <a href="{% url 'parks:park_detail' slug=ride.park.slug %}" </h2>
class="text-blue-600 dark:text-blue-400 hover:underline">{{ ride.park.name }}</a> {% if not park %}
<p class="mb-3 text-gray-600 dark:text-gray-400">
at <a href="{% url 'parks:park_detail' ride.park.slug %}"
class="text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">
{{ ride.park.name }}
</a>
</p> </p>
<div class="flex justify-between items-center">
<span class="text-sm text-gray-500 dark:text-gray-400">{{ ride.get_category_display }}</span>
{% if ride.average_rating %}
<div class="flex items-center">
<span class="text-yellow-400 mr-1">★</span>
<span class="text-gray-600 dark:text-gray-400">{{ ride.average_rating|floatformat:1 }}/10</span>
</div>
{% endif %} {% endif %}
</div> <div class="flex flex-wrap gap-2">
{% if ride.category == 'RC' and ride.coaster_stats %} <span class="text-blue-800 bg-blue-100 status-badge dark:bg-blue-400/30 dark:text-blue-200 dark:ring-1 dark:ring-blue-400/30">
<div class="mt-2 text-sm text-gray-600 dark:text-gray-400"> {{ ride.get_category_display }}
{% if ride.coaster_stats.height_ft %} </span>
<div>Height: {{ ride.coaster_stats.height_ft|floatformat:0 }}ft</div> <span class="status-badge {% if ride.status == 'OPERATING' %}status-operating
{% endif %} {% elif ride.status == 'CLOSED_TEMP' or ride.status == 'CLOSED_PERM' %}status-closed
{% if ride.coaster_stats.speed_mph %} {% elif ride.status == 'UNDER_CONSTRUCTION' %}status-construction
<div>Speed: {{ ride.coaster_stats.speed_mph|floatformat:0 }}mph</div> {% elif ride.status == 'DEMOLISHED' %}status-demolished
{% endif %} {% elif ride.status == 'RELOCATED' %}status-relocated{% endif %}">
<div>Inversions: {{ ride.coaster_stats.inversions }}</div>
</div>
{% endif %}
{% if ride.status != 'OPERATING' %}
<div class="mt-2">
<span class="px-2 py-1 text-xs rounded-full
{% if ride.status == 'CLOSED_TEMP' %}bg-yellow-100 text-yellow-800
{% elif ride.status == 'CLOSED_PERM' %}bg-red-100 text-red-800
{% elif ride.status == 'UNDER_CONSTRUCTION' %}bg-blue-100 text-blue-800
{% elif ride.status == 'DEMOLISHED' %}bg-gray-100 text-gray-800
{% endif %}">
{{ ride.get_status_display }} {{ ride.get_status_display }}
</span> </span>
{% if ride.average_rating %}
<span class="text-yellow-800 bg-yellow-100 status-badge dark:bg-yellow-400/30 dark:text-yellow-200 dark:ring-1 dark:ring-yellow-400/30">
<i class="mr-1 text-yellow-500 fas fa-star dark:text-yellow-300"></i>
{{ ride.average_rating|floatformat:1 }}/10
</span>
{% endif %}
</div>
{% if ride.coaster_stats %}
<div class="grid grid-cols-2 gap-2 mt-4">
{% if ride.coaster_stats.height_ft %}
<div class="text-sm text-gray-600 dark:text-gray-400">
Height: {{ ride.coaster_stats.height_ft }}ft
</div>
{% endif %}
{% if ride.coaster_stats.speed_mph %}
<div class="text-sm text-gray-600 dark:text-gray-400">
Speed: {{ ride.coaster_stats.speed_mph }}mph
</div> </div>
{% endif %} {% endif %}
</div> </div>
</div> {% endif %}
</div>
</div>
{% empty %} {% empty %}
<div class="col-span-full text-center py-8"> <div class="col-span-3 py-8 text-center">
<p class="text-gray-500 dark:text-gray-400">No rides found matching your criteria.</p> <p class="text-gray-500 dark:text-gray-400">No rides found matching your criteria.</p>
</div> </div>
{% endfor %} {% endfor %}

13
templates/rides/ride_form.html
View File

@@ -1,18 +1,24 @@
{% extends 'base/base.html' %} {% extends 'base/base.html' %}
{% load static %} {% load static %}
{% block title %}Add Ride - ThrillWiki{% endblock %} {% block title %}Add Ride at {{ park.name }} - ThrillWiki{% endblock %}
{% block content %} {% block content %}
<div class="container px-4 mx-auto"> <div class="container px-4 mx-auto">
<div class="max-w-3xl mx-auto"> <div class="max-w-3xl mx-auto">
<div class="p-6 bg-white rounded-lg shadow dark:bg-gray-800"> <div class="p-6 bg-white rounded-lg shadow dark:bg-gray-800">
<h1 class="mb-6 text-3xl font-bold text-gray-900 dark:text-white">Add Ride</h1> <div class="mb-6">
<h1 class="text-3xl font-bold text-gray-900 dark:text-white">Add Ride at {{ park.name }}</h1>
<a href="{% url 'parks:rides:ride_list' park.slug %}" class="text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">
Back to {{ park.name }} Rides
</a>
</div>
<form method="post" class="space-y-6"> <form method="post" class="space-y-6">
{% csrf_token %} {% csrf_token %}
{% for field in form %} {% for field in form %}
{% if field.name != 'park' %}
<div> <div>
<label for="{{ field.id_for_label }}" class="block mb-1 text-sm font-medium text-gray-700 dark:text-gray-300"> <label for="{{ field.id_for_label }}" class="block mb-1 text-sm font-medium text-gray-700 dark:text-gray-300">
{{ field.label }} {{ field.label }}
@@ -49,6 +55,7 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% endif %}
{% endfor %} {% endfor %}
{% if not user.role == 'MODERATOR' and not user.role == 'ADMIN' and not user.role == 'SUPERUSER' %} {% if not user.role == 'MODERATOR' and not user.role == 'ADMIN' and not user.role == 'SUPERUSER' %}
@@ -78,7 +85,7 @@
{% endif %} {% endif %}
<div class="flex justify-end space-x-4"> <div class="flex justify-end space-x-4">
<a href="{% url 'rides:ride_list' %}" class="px-4 py-2 text-gray-700 bg-gray-200 rounded-lg hover:bg-gray-300 dark:bg-gray-600 dark:text-gray-200 dark:hover:bg-gray-500"> <a href="{% url 'parks:rides:ride_list' park.slug %}" class="px-4 py-2 text-gray-700 bg-gray-200 rounded-lg hover:bg-gray-300 dark:bg-gray-600 dark:text-gray-200 dark:hover:bg-gray-500">
Cancel Cancel
</a> </a>
<button type="submit" class="px-4 py-2 text-white bg-blue-600 rounded-lg hover:bg-blue-700 dark:bg-blue-500 dark:hover:bg-blue-600"> <button type="submit" class="px-4 py-2 text-white bg-blue-600 rounded-lg hover:bg-blue-700 dark:bg-blue-500 dark:hover:bg-blue-600">

40
templates/rides/ride_list.html
View File

@@ -1,14 +1,29 @@
{% extends 'base/base.html' %} {% extends 'base/base.html' %}
{% load static %} {% load static %}
{% block title %}Rides - ThrillWiki{% endblock %} {% block title %}
{% if park %}
Rides at {{ park.name }} - ThrillWiki
{% else %}
All Rides - ThrillWiki
{% endif %}
{% endblock %}
{% block content %} {% block content %}
<div class="container px-4 mx-auto"> <div class="container px-4 mx-auto">
<div class="flex flex-col items-start justify-between gap-4 mb-6 md:flex-row md:items-center"> <div class="flex flex-col items-start justify-between gap-4 mb-6 md:flex-row md:items-center">
<h1 class="text-3xl font-bold text-gray-900 dark:text-white">Rides</h1> <div>
{% if user.is_authenticated %} {% if park %}
<a href="{% url 'rides:ride_create' %}" class="btn-primary"> <h1 class="text-3xl font-bold text-gray-900 dark:text-white">Rides at {{ park.name }}</h1>
<a href="{% url 'parks:park_detail' park.slug %}" class="text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">
Back to {{ park.name }}
</a>
{% else %}
<h1 class="text-3xl font-bold text-gray-900 dark:text-white">All Rides</h1>
{% endif %}
</div>
{% if park and user.is_authenticated %}
<a href="{% url 'parks:rides:ride_create' park.slug %}" class="btn-primary">
<i class="mr-2 fas fa-plus"></i>Add Ride <i class="mr-2 fas fa-plus"></i>Add Ride
</a> </a>
{% endif %} {% endif %}
@@ -16,7 +31,11 @@
<!-- Filters --> <!-- Filters -->
<div class="p-4 mb-6 bg-white rounded-lg shadow dark:bg-gray-800"> <div class="p-4 mb-6 bg-white rounded-lg shadow dark:bg-gray-800">
<form method="get" class="grid grid-cols-1 gap-4 md:grid-cols-4"> <form class="grid grid-cols-1 gap-4 md:grid-cols-3"
hx-get="{% if park %}{% url 'parks:rides:ride_list' park.slug %}{% else %}{% url 'parks:all_rides' %}{% endif %}"
hx-trigger="change from:select, input from:input[type='text']"
hx-target="#rides-grid"
hx-push-url="true">
<div> <div>
<label for="search" class="block mb-1 text-sm font-medium text-gray-700 dark:text-gray-300">Search</label> <label for="search" class="block mb-1 text-sm font-medium text-gray-700 dark:text-gray-300">Search</label>
<input type="text" name="search" id="search" <input type="text" name="search" id="search"
@@ -50,16 +69,11 @@
<option value="RELOCATED" {% if current_filters.status == 'RELOCATED' %}selected{% endif %}>Relocated</option> <option value="RELOCATED" {% if current_filters.status == 'RELOCATED' %}selected{% endif %}>Relocated</option>
</select> </select>
</div> </div>
<div class="flex items-end">
<button type="submit" class="w-full btn-primary">
<i class="mr-2 fas fa-filter"></i>Filter
</button>
</div>
</form> </form>
</div> </div>
<!-- Rides Grid --> <!-- Rides Grid -->
<div class="grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3"> <div id="rides-grid" class="grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
{% for ride in rides %} {% for ride in rides %}
<div class="overflow-hidden transition-transform transform bg-white rounded-lg shadow-lg dark:bg-gray-800 hover:-translate-y-1"> <div class="overflow-hidden transition-transform transform bg-white rounded-lg shadow-lg dark:bg-gray-800 hover:-translate-y-1">
{% if ride.photos.exists %} {% if ride.photos.exists %}
@@ -71,17 +85,19 @@
{% endif %} {% endif %}
<div class="p-4"> <div class="p-4">
<h2 class="mb-2 text-xl font-bold"> <h2 class="mb-2 text-xl font-bold">
<a href="{% url 'rides:ride_detail' ride.park.slug ride.slug %}" <a href="{% url 'parks:rides:ride_detail' ride.park.slug ride.slug %}"
class="text-gray-900 hover:text-blue-600 dark:text-white dark:hover:text-blue-400"> class="text-gray-900 hover:text-blue-600 dark:text-white dark:hover:text-blue-400">
{{ ride.name }} {{ ride.name }}
</a> </a>
</h2> </h2>
{% if not park %}
<p class="mb-3 text-gray-600 dark:text-gray-400"> <p class="mb-3 text-gray-600 dark:text-gray-400">
at <a href="{% url 'parks:park_detail' ride.park.slug %}" at <a href="{% url 'parks:park_detail' ride.park.slug %}"
class="text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300"> class="text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">
{{ ride.park.name }} {{ ride.park.name }}
</a> </a>
</p> </p>
{% endif %}
<div class="flex flex-wrap gap-2"> <div class="flex flex-wrap gap-2">
<span class="text-blue-800 bg-blue-100 status-badge dark:bg-blue-400/30 dark:text-blue-200 dark:ring-1 dark:ring-blue-400/30"> <span class="text-blue-800 bg-blue-100 status-badge dark:bg-blue-400/30 dark:text-blue-200 dark:ring-1 dark:ring-blue-400/30">
{{ ride.get_category_display }} {{ ride.get_category_display }}

7
templates/search_results.html
View File

@@ -43,9 +43,10 @@
</h3> </h3>
<p class="mb-2 text-gray-600 dark:text-gray-400">{{ park.location }}</p> <p class="mb-2 text-gray-600 dark:text-gray-400">{{ park.location }}</p>
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<span class="text-sm text-gray-500 dark:text-gray-400"> <a href="{% url 'parks:rides:ride_list' park.slug %}"
class="text-sm text-blue-600 hover:underline dark:text-blue-400">
{{ park.rides.count }} attractions {{ park.rides.count }} attractions
</span> </a>
{% if park.average_rating %} {% if park.average_rating %}
<div class="flex items-center"> <div class="flex items-center">
<span class="mr-1 text-yellow-400">★</span> <span class="mr-1 text-yellow-400">★</span>
@@ -81,7 +82,7 @@
<div class="p-4"> <div class="p-4">
<h3 class="mb-2 text-lg font-semibold"> <h3 class="mb-2 text-lg font-semibold">
<a href="{% url 'rides:ride_detail' ride.park.slug ride.slug %}" <a href="{% url 'parks:rides:ride_detail' ride.park.slug ride.slug %}"
class="text-blue-600 hover:underline dark:text-blue-400"> class="text-blue-600 hover:underline dark:text-blue-400">
{{ ride.name }} {{ ride.name }}
</a> </a>

BIN
thrillwiki/__pycache__/urls.cpython-312.pyc
View File

Binary file not shown.

1
thrillwiki/urls.py
View File

@@ -14,7 +14,6 @@ urlpatterns = [
# Parks URLs # Parks URLs
path('parks/', include('parks.urls', namespace='parks')), path('parks/', include('parks.urls', namespace='parks')),
path('rides/', include('rides.urls', namespace='rides')),
# Other URLs # Other URLs
path('reviews/', include('reviews.urls')), path('reviews/', include('reviews.urls')),