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

templates/rides/partials/ride_list.html

@@ -1,60 +1,63 @@
 {% for ride in rides %}
-<div class="bg-white dark:bg-gray-800 shadow rounded-lg overflow-hidden transform transition-transform hover:-translate-y-1">
-    {% if ride.photos.first %}
-        <img src="{{ ride.photos.first.image.url }}" 
-             alt="{{ ride.name }}"
-             class="w-full h-48 object-cover">
-    {% 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>
-    {% endif %}
-    
-    <div class="p-4">
-        <h3 class="text-xl font-semibold mb-2">
-            <a href="{% url 'rides:ride_detail' park_slug=ride.park.slug ride_slug=ride.slug %}" 
-               class="text-blue-600 dark:text-blue-400 hover:underline">{{ ride.name }}</a>
-        </h3>
-        <p class="text-gray-600 dark:text-gray-400 mb-2">
-            at <a href="{% url 'parks:park_detail' slug=ride.park.slug %}" 
-                  class="text-blue-600 dark:text-blue-400 hover:underline">{{ ride.park.name }}</a>
-        </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 class="overflow-hidden transition-transform transform bg-white rounded-lg shadow-lg dark:bg-gray-800 hover:-translate-y-1">
+        {% if ride.photos.exists %}
+            <div class="aspect-w-16 aspect-h-9">
+                <img src="{{ ride.photos.first.image.url }}" 
+                     alt="{{ ride.name }}"
+                     class="object-cover w-full">
+            </div>
+        {% endif %}
+        <div class="p-4">
+            <h2 class="mb-2 text-xl font-bold">
+                <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">
+                    {{ ride.name }}
+                </a>
+            </h2>
+            {% 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>
+            {% endif %}
+            <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">
+                    {{ ride.get_category_display }}
+                </span>
+                <span class="status-badge {% if ride.status == 'OPERATING' %}status-operating
+                           {% elif ride.status == 'CLOSED_TEMP' or ride.status == 'CLOSED_PERM' %}status-closed
+                           {% elif ride.status == 'UNDER_CONSTRUCTION' %}status-construction
+                           {% elif ride.status == 'DEMOLISHED' %}status-demolished
+                           {% elif ride.status == 'RELOCATED' %}status-relocated{% endif %}">
+                    {{ ride.get_status_display }}
+                </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>
+                    {% endif %}
                 </div>
             {% endif %}
         </div>
-        {% if ride.category == 'RC' and ride.coaster_stats %}
-            <div class="mt-2 text-sm text-gray-600 dark:text-gray-400">
-                {% if ride.coaster_stats.height_ft %}
-                    <div>Height: {{ ride.coaster_stats.height_ft|floatformat:0 }}ft</div>
-                {% endif %}
-                {% if ride.coaster_stats.speed_mph %}
-                    <div>Speed: {{ ride.coaster_stats.speed_mph|floatformat:0 }}mph</div>
-                {% 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 }}
-                </span>
-            </div>
-        {% endif %}
     </div>
-</div>
 {% empty %}
-<div class="col-span-full text-center py-8">
-    <p class="text-gray-500 dark:text-gray-400">No rides found matching your criteria.</p>
-</div>
+    <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>
+    </div>
 {% endfor %}

templates/rides/ride_form.html

@@ -1,18 +1,24 @@
 {% extends 'base/base.html' %}
 {% load static %}
 
-{% block title %}Add Ride - ThrillWiki{% endblock %}
+{% block title %}Add Ride at {{ park.name }} - ThrillWiki{% endblock %}
 
 {% block content %}
 <div class="container px-4 mx-auto">
     <div class="max-w-3xl mx-auto">
         <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">
                 {% csrf_token %}
                 
                 {% for field in form %}
+                {% if field.name != 'park' %}
                 <div>
                     <label for="{{ field.id_for_label }}" class="block mb-1 text-sm font-medium text-gray-700 dark:text-gray-300">
                         {{ field.label }}
@@ -49,6 +55,7 @@
                         </div>
                     {% endif %}
                 </div>
+                {% endif %}
                 {% endfor %}
 
                 {% if not user.role == 'MODERATOR' and not user.role == 'ADMIN' and not user.role == 'SUPERUSER' %}
@@ -78,7 +85,7 @@
                 {% endif %}
 
                 <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
                     </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">

templates/rides/ride_list.html

@@ -1,14 +1,29 @@
 {% extends 'base/base.html' %}
 {% load static %}
 
-{% block title %}Rides - ThrillWiki{% endblock %}
+{% block title %}
+    {% if park %}
+        Rides at {{ park.name }} - ThrillWiki
+    {% else %}
+        All Rides - ThrillWiki
+    {% endif %}
+{% endblock %}
 
 {% block content %}
 <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">
-        <h1 class="text-3xl font-bold text-gray-900 dark:text-white">Rides</h1>
-        {% if user.is_authenticated %}
-            <a href="{% url 'rides:ride_create' %}" class="btn-primary">
+        <div>
+            {% if park %}
+                <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
             </a>
         {% endif %}
@@ -16,7 +31,11 @@
 
     <!-- Filters -->
     <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>
                 <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" 
@@ -50,16 +69,11 @@
                     <option value="RELOCATED" {% if current_filters.status == 'RELOCATED' %}selected{% endif %}>Relocated</option>
                 </select>
             </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>
     </div>
 
     <!-- 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 %}
             <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 %}
@@ -71,17 +85,19 @@
                 {% endif %}
                 <div class="p-4">
                     <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">
                             {{ ride.name }}
                         </a>
                     </h2>
-                    <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>
+                    {% 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>
+                    {% endif %}
                     <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">
                             {{ ride.get_category_display }}