major changes, including tailwind v4

thrillwiki/views.py

@@ -3,12 +3,10 @@ from django.views.generic import TemplateView
 from django.db.models import Count, Q, Value, CharField
 from django.db.models.functions import Concat
 from django.core.cache import cache
-from parks.models import Park
+from parks.models.parks import Park
+from parks.models.companies import Company
 from rides.models import Ride
-from operators.models import Operator
-from property_owners.models import PropertyOwner
-from manufacturers.models import Manufacturer
-from analytics.models import PageView
+from core.analytics import PageView
 from django.conf import settings
 import os
 import secrets
@@ -102,7 +100,7 @@ class SearchView(TemplateView):
                 Q(name__icontains=query) |
                 Q(location__icontains=query) |
                 Q(description__icontains=query)
-            ).select_related('operator').prefetch_related('photos')[:10]
+            ).select_related('operating_company').prefetch_related('photos')[:10]
 
             # Search rides
             context['rides'] = Ride.objects.filter(
@@ -111,26 +109,11 @@ class SearchView(TemplateView):
                 Q(manufacturer__name__icontains=query)
             ).select_related('park', 'coaster_stats').prefetch_related('photos')[:10]
 
-            # Search operators
-            context['operators'] = Operator.objects.filter(
+            # Search companies
+            context['companies'] = Company.objects.filter(
                 Q(name__icontains=query) |
-                Q(headquarters__icontains=query) |
                 Q(description__icontains=query)
-            ).prefetch_related('operated_parks')[:10]
-
-            # Search property owners
-            context['property_owners'] = PropertyOwner.objects.filter(
-                Q(name__icontains=query) |
-                Q(headquarters__icontains=query) |
-                Q(description__icontains=query)
-            ).prefetch_related('owned_parks')[:10]
-
-            # Search manufacturers
-            context['manufacturers'] = Manufacturer.objects.filter(
-                Q(name__icontains=query) |
-                Q(headquarters__icontains=query) |
-                Q(description__icontains=query)
-            ).prefetch_related('rides')[:10]
+            ).prefetch_related('operated_parks', 'owned_parks')[:10]
 
         return context