From 298e2a80cb41d66097e98438b60ca87e86fc5700 Mon Sep 17 00:00:00 2001
From: pacnpal <183241239+pacnpal@users.noreply.github.com>
Date: Tue, 29 Oct 2024 23:11:55 -0400
Subject: [PATCH] lol

---
 moderation/mixins.py                        |  16 ++-
 parks/__pycache__/urls.cpython-312.pyc      | Bin 880 -> 705 bytes
 parks/__pycache__/views.cpython-312.pyc     | Bin 8966 -> 8934 bytes
 parks/urls.py                               |   2 -
 parks/views.py                              |   8 +-
 rides/__pycache__/urls.cpython-312.pyc      | Bin 729 -> 567 bytes
 rides/__pycache__/views.cpython-312.pyc     | Bin 8661 -> 8646 bytes
 rides/urls.py                               |   1 -
 rides/views.py                              |   6 +-
 static/css/tailwind.css                     |   8 +-
 templates/accounts/turnstile_widget.html    |   6 +-
 templates/base/base.html                    | 132 ++++++++++----------
 templates/home.html                         |  44 +++----
 templates/parks/park_detail.html            |   4 +-
 templates/parks/park_list.html              |   4 +-
 templates/rides/ride_detail.html            |  16 +++
 templates/rides/ride_list.html              |   2 +-
 templates/search_results.html               |  68 +++++-----
 thrillwiki/__pycache__/urls.cpython-312.pyc | Bin 2758 -> 2648 bytes
 thrillwiki/urls.py                          |  11 +-
 20 files changed, 175 insertions(+), 153 deletions(-)

diff --git a/moderation/mixins.py b/moderation/mixins.py
index 28008ff5..9dc8ecf1 100644
--- a/moderation/mixins.py
+++ b/moderation/mixins.py
@@ -6,7 +6,7 @@ from django.utils import timezone
 import json
 from .models import EditSubmission, PhotoSubmission
 
-class EditSubmissionMixin(LoginRequiredMixin):
+class EditSubmissionMixin:
     """
     Mixin for handling edit submissions with proper moderation.
     """
@@ -67,6 +67,12 @@ class EditSubmissionMixin(LoginRequiredMixin):
 
     def post(self, request, *args, **kwargs):
         """Handle POST requests for editing"""
+        if not request.user.is_authenticated:
+            return JsonResponse({
+                'status': 'error',
+                'message': 'You must be logged in to make edits.'
+            }, status=403)
+
         try:
             data = json.loads(request.body)
             changes = data.get('changes', {})
@@ -101,12 +107,18 @@ class EditSubmissionMixin(LoginRequiredMixin):
                 'message': str(e)
             }, status=500)
 
-class PhotoSubmissionMixin(LoginRequiredMixin):
+class PhotoSubmissionMixin:
     """
     Mixin for handling photo submissions with proper moderation.
     """
     def handle_photo_submission(self, request):
         """Handle a photo submission based on user's role"""
+        if not request.user.is_authenticated:
+            return JsonResponse({
+                'status': 'error',
+                'message': 'You must be logged in to upload photos.'
+            }, status=403)
+
         if not request.FILES.get('photo'):
             return JsonResponse({
                 'status': 'error',
diff --git a/parks/__pycache__/urls.cpython-312.pyc b/parks/__pycache__/urls.cpython-312.pyc
index 47b164f7e4e3220ed35c281651d10ca61fee7b23..f91255555beb7a4cc96d2a9d01d484f7bb0052f3 100644
GIT binary patch
delta 281
zcmeysc92!$G%qg~0}z~FpqQ@9$iVOz#DM{JDC6@7hKU-oiY!qqObn@vDXgi?Szt{t
zbr3p>cd`znv?kjc_SMV~5wL0wplUu;l^`BeH7A;CE}&`wT&jh+5vtRfqc|&hG<hdS
zF-lKvXY`fv)8x9vosyN9m!7XzT9i{<1ad?X$O}cRlZ}~{N{9iOKp!#`X90;1%#4hT
bcNt{vG6+xp%oM@%ft`h)sgb)#1Skgpy|*iQ

delta 431
zcmX@e`hiX3G%qg~0}x2IDW-2?WMFs<;=lk0l<`@QaiWH-E<*}S4ofa;6e}Y`3TqS_
z6GJLv3R^0379UJKg3c10_)c1reGSKIW{4nIF(**55JC}*1yRg}rkES3SOlg7L4y^G
z^Pnl_1)9&AB>=Qkm=7V9&Jx94$*(CeS%y(sNR#mvUr=UBs!M7~VrEWQW@`Clb4K6z
zDkYoZoYHiwg2bZico54@A0ki$R0|cj#SP}9fOYz5^4#K1$x6&i&(|w0$|)`a`LGBS
zR7I>n0;0B9uMB8GaS_|(1&m9jC4u6=uw^K20}>yY85tSxGRWLz5WdTxHaV6lLiHvK
n#|2K^3;M1r>aOd%UetHJtnYpz_X<nQ2ToRgrbg}}aiBf`=$Bqv

diff --git a/parks/__pycache__/views.cpython-312.pyc b/parks/__pycache__/views.cpython-312.pyc
index a665879b314a1272be3d198163f074478d033332..12a837fb9bb4ec420978d24c33b38d7574828b73 100644
GIT binary patch
delta 1487
zcmah|QEXFH81CuXyKe1mm(j7&*{$8C&>=*0E@kK()^;0XC1X>}fL*$~+p_I;9p~Qa
z)=X@SQJ;*-c`-5J!GvUegEY}scpyCRat$Ps8#O)=eK0XFO?WWjeCIM`N<x!<{rjKq
zob&(R_n*%)_tNq$S#Eamk9sLyNMDuLCAZzgzLaWYkR=;GC;zZ(jeq$!CvNv8Z-)+B
zzQgRgZ^>=@*=tR`(E+}XW;oOc9p*m<;Si%ok$#;SP5b(~cvyA)6x#jON1OR83*Rqa
zUH)+}^TS}qIxu=CG-mn6Xo_8H%4XjddpOiwG=*3k(t!vN<X@wk!>6vhftG6eZn(cX
zdEZTfv!t52FNM8B4_+qTapLUlU?c5&>K`;ukcm;8kmO(o4ZU1Y%2ZdDKg`hrJ&vTm
zpqa}2x`MStgJ{C`T_|gG-Ox<Yn$f^{u^8`)1p*r+#j?Bh)V~e52|39w%W-mo-IV)+
zLpV&zFY2a7=>U5ucS;b1j<QHFE{R^|*wNr6zW>)?JW_LKX&UP%0An1srDL6;>5pF!
zZPZ9M;iuzZ90N=MAcQELPV&g!rIuDqZOv3l^Glj)Dl567M&Ac#4v+^&Ruomw8HTFq
zx}tEaRGt<0jW{Y#feJW)g&r6CBh>4QI#NyvDG#;$Mo5W8TDwy-AU{#nDdj!nP699t
zcHo_oW@JlddTr4#6OvGsp2G44K#6U%#{EJQR9cC$T)3UR5|G%9)-Qy>*C$s%oCTZ)
zK&C_^J&Ra0)`AG4Qw1Of@f@NY2gAdGTUK@2n`39fRY&+Z)j;~6>PSMX%6?JHWGL)E
zgIocSV)-_<*D0O<=VKzSd(!Vt|6;o@s$zi8gDd~nzYtEu=n4PmBBFNzJ58f&$Snbu
zIXvxF5y>JW?XSwwza@{i*)ghEA8G&HO-{4^$n3mO<{T&5Evr<^Yo>Z$p_-mEwFP<z
z>4wqtjPoqKhDjG!g^UUBQ&wHXH4#7;2gA#OONw`Z+)VvmBtS^2{-E<0k`>(kZ7vsR
z=Vm*kmMPU%OvQO1hU2IIUq5Y+&PT-=?jhFQ^<pooq@MtifM?oT==z!4n(qGk2;PEo
z8ra)?h)zBHtsBn3in-rz<neGMSx4;H3=DhTTXVb;<3ES%L|xBxsDkAR`z|&hiAku`
z|BOwO#1zuPJwXsdDAu8<?R%qGS}5z<F#U$<J#Qt(iPg4uGqUB1l5w&%+(x2S+e_BI
aBi5T!*7Ur!uxinbEf-I-J3R+IIOh@dFHeC0

delta 1500
zcmah|OKcNY6!lB&i4%KlH^d1Th4@1NM^IG>2m$#RH+BFglSEEiHEKHb=fxP0<M3t-
zP85L`RbkadpM=^?*UgS%7QhCvVbjf^R05e6shg_plBQKvsh@k_B$TvB&En+xzWeUH
zd(OGvCq7EbU&(TZ4gQ{93l$c=lvgC@s&_fVO8QBDU0Nr{_+Z;L@+ZI7_KVv*JhHKW
zbi+GlI>-1u=LP5QuWeNxXpi&`K@*k$SSM@*{^<lD$YOx(C|_(p)ZYhT-S&;Q+w2**
znY=T8KXo_tczE*B@T563^|e<qoeGQdTkXp9X>kc)-Nxb=#}IaJg9idV2=JlpiQ89C
zJn0&!Pd#rTo_SJFK9{;2G4k_a;+Q7Z<=s5kv!_w$NRd<$TO0>ydUUN?P^(N+OP4dO
zz*3lW6{w+RS5!QUwu&*D&WlybR&;8J;q+Fh3kG2>{)cOg#QE5+Jq_+|A!L@{kV8b_
zcjWz^6WB~zENTX2Y>59P@0E}emgFu^NQz;&zz02_!~I8|P$1f(uyIT(2onI?<Z-t*
zeKjn`SSL!<#m->GS%h;4$b@)0n}n#jD_2=EXw6V7*$Xshs7skLW$$3k0zw{ZWL3>+
z8C}m&O;c46D+^iiy_iMw43;7s!Go}kKl4VM5sS(hL1ozY10iMZ>g;<njm0lmwVv`8
z=4KJl4o&xXh3ZPhNYskD5tRh1>}@=*Ae4EzGvtb4h%a63<vxE8zuEb*AoszPh9~bL
z%p)L0(KhxT#$qTRMo2h&A3@kq#pnY7-3|b9)veJM_*7TjBK-)EzPjb#45Jw}PmN4b
z`>zDpD$ia1V-m$M&XazA(0V!i2A7C0z8H6he4lh*$qD~1VyXOZ^}N^+jVIJ&1&rnp
zc1p%BVeULa5#VL5N|-G1@45%&$gh&!(P7C{Y6N?JY$5Z!BQT#8+#n-O-!h|%)X1Gz
z8Pzfd&9gT!-8zw&vzEf48?3l2h>SX35^4=U6F}GppgRD7RNMm0r5g_eZbIUXjlIu^
zB5DUPkF~(h&dW`2uF4o)GE{3lbW2g!KZ-W(8W_d0_6h!1Z+`?|$?6EWx~~>?V&AtQ
zY=7UUr*IRjZdkoNhnUn3o32}S6|UbNWXm4M`EPya=1{Qz+cZlnVSZsk@vc`YRKwTQ
z_>JIENjRa_FoS6lox!wFPZWs77w0iJXgY_>m3&pBqwF(286JyH6Vre2i@>I>mrRq*
iQ9p^8{sZQrQ|8F5na-N|Ws|LK+91tuhhMj2pT7Z^fLBid

diff --git a/parks/urls.py b/parks/urls.py
index 62bbe7b9..89ff7afc 100644
--- a/parks/urls.py
+++ b/parks/urls.py
@@ -1,6 +1,5 @@
 from django.urls import path
 from . import views
-from rides.views import RideDetailView
 
 app_name = 'parks'
 
@@ -8,5 +7,4 @@ urlpatterns = [
     path('', views.ParkListView.as_view(), name='park_list'),
     path('create/', views.ParkCreateView.as_view(), name='park_create'),
     path('<slug:slug>/', views.ParkDetailView.as_view(), name='park_detail'),
-    path('<slug:park_slug>/<slug:ride_slug>/', RideDetailView.as_view(), name='ride_detail'),
 ]
diff --git a/parks/views.py b/parks/views.py
index 15165f54..2dbcf5ce 100644
--- a/parks/views.py
+++ b/parks/views.py
@@ -37,10 +37,10 @@ class ParkCreateView(LoginRequiredMixin, CreateView):
             reason=self.request.POST.get('reason', ''),
             source=self.request.POST.get('source', '')
         )
-        return HttpResponseRedirect(reverse('parks:park_list'))
+        return HttpResponseRedirect(reverse('park_list'))
 
     def get_success_url(self):
-        return reverse('parks:park_detail', kwargs={'slug': self.object.slug})
+        return reverse('park_detail', kwargs={'slug': self.object.slug})
 
 class ParkDetailView(SlugRedirectMixin, EditSubmissionMixin, PhotoSubmissionMixin, InlineEditMixin, HistoryMixin, DetailView):
     model = Park
@@ -63,7 +63,7 @@ class ParkDetailView(SlugRedirectMixin, EditSubmissionMixin, PhotoSubmissionMixi
         return context
 
     def get_redirect_url_pattern(self):
-        return 'parks:park_detail'
+        return 'park_detail'
 
 class ParkAreaDetailView(SlugRedirectMixin, EditSubmissionMixin, PhotoSubmissionMixin, InlineEditMixin, HistoryMixin, DetailView):
     model = ParkArea
@@ -90,7 +90,7 @@ class ParkAreaDetailView(SlugRedirectMixin, EditSubmissionMixin, PhotoSubmission
         return context
 
     def get_redirect_url_pattern(self):
-        return 'parks:area_detail'
+        return 'park_detail'
 
     def get_redirect_url_kwargs(self):
         return {
diff --git a/rides/__pycache__/urls.cpython-312.pyc b/rides/__pycache__/urls.cpython-312.pyc
index e77dfb0c1c80ccc57bee1cd18484cc3a2f39385c..e5ed3298eea9fc28526b4ca58c8063e8ae1e282e 100644
GIT binary patch
delta 100
zcmcb~x}8P+G%qg~0}$L?pqPFiNIwQ~V1NzE_`GJK`bv&;rYMd|E=}&qGK{{=ewv(<
k=Q8?D{>_-cB?45&2*kzylT(?zc|Nc*^D{Ma7YPA{03IV0JOBUy

delta 214
zcmdnaa+6j4G%qg~0}x2JDW*F!GB7*_abSQQ%J}?YqWVfMCWchT6s}a}EP;vB^o6<C
zu&-u@$fq+$aaQtZ@=m<rYf`0TQ=C(pZdH(2lpPOZ+37<BiZWADp#rzK!JL%TlElm$
zKTWR58jOD2d_h13E?}X_g^a0OVnDNj?qMj-nf!p!Tk|Fh#|2K^6{XkpoiFM;U)T4(
bsPBDQ-}gdD;uV&p59}=bOpV+{B0%*3B%M1p

diff --git a/rides/__pycache__/views.cpython-312.pyc b/rides/__pycache__/views.cpython-312.pyc
index 8205004c2168186a489c3d58ea117e130cac7357..e15de14f1e7fbaf7c56580d16dc468303de9db76 100644
GIT binary patch
delta 1026
zcmaJ<%}*0S6z{a#(stQ?NJI#wv`~zz@goLMD3U4=tkr^o1VOUavMrS*m6>e-38o=_
zos2jk;b1t^qwLAVGZ!u<#Dg0T9{dALKobup&YK0J7dP2o-n_4Q@AsRJz1zLgjwE?)
z?7OrP&A)pq%~aV<4=q<!P&Ym4evW#LEq5G=o2lK{#a(~r2X`m^>DjcKBCUAaTe?^w
zZeU;vL@VVh2=}oAK@1{z0D^If#1mo%Gt0Km{@Pc|v|ViRo$>D590Bp0&EXMolIFy8
z>s6l3pkl*Guz7hsSO9+ZlQ8`xHn_X?+5{(*{Swzu+Mv}F$aMqq(sW-sof-tQ2jDgX
zQ_QQna(_{Q`S_@K2;9|uMU|wBdjCR!=(3B?ZMx@5DqbY2jt}~2z9<@?FMV4mNiX}q
zADw_wDO=1CUBwE~GdjUzG!<w%#hGY?TLS<INOa{28p|`CxdJA7Mc|j<LAn-*y7+d}
z^nKtdYkeiyTAPBhF@T#44k@I|!C^;;?YbLWZNAO|vIGAiop17Q`m-aCV!)n^(z1ka
zLAzmq5dh$jlY&QStVWJ!;XDmc1ejxBN{W)zGK6GRO;Z#m=q&T{X%dzq<B&Q|U(}or
zH2!c2POqgFxM|s5YkaAB<3KsOd~5|JUe_J(xBy)p1N|dh6Vpj_TzH5J(8U9xDs>^N
zm8R4K4e&jPEYZ7lVT+?lqg<CoC~17HAF`vzv^{h-v;;Zl0660ju)+*vfmN16v1Z^=
zuEu!?z=EcrF_|p_65xD7w?nNhFdJS0;O}LISwvtEiA2iQw$p~MG01MGk??wa6f${F
zNSB?Ko_s+egYyLQr^g9%T3rs?^w7QVwGl3i_#aiEKL(ft;L7m9bU2n6{4K;hIOpkV
pQ=1DK<9TDJ=>dvyeRzyNCLV&vX1cp)i&G^{?ZF%LPIN(l$Zsn>>k0q>

delta 1042
zcmaJ=OH30%81B$*X}ew8N_d6Z2QBFOhz1cO1xmuJ0jVeuL@}FEmRejXo!KHZF(N)V
zn~8}Bz1u_&+JhI5#tRn=;j;0lSK|Xbc+vT1!RW;%{qoQJ|9tcR-#7cNce_{GkR+Fd
z{dU*GnT?my^-4$4gR`?L>7d2R5{l8NV;%LCpF3j6y?Lx_E84x~iEldM^qcdU<EL-0
z^oi?q<Sb*sjSLKdXoXA(;a;{Nh(QPsK(d4GxDLC|uyED#!Be|gcZ41iBUNp#9gEc~
zez91cB2LgtVzPOVmoq3?Z~|g}z5yZt5BrlK-4Gj{J?MLzV1sj?#YbqQe9wIa+0Q}Y
z2>m1-A5KEp1u)LQ5HqT-%&aKTA#WC+hi!LXP9@2l-oKnBx@_m28;*QI#VbVB@gCpR
zsxTU$x2s;E1a0-~)?9|8QaYC+x{4K|r*wiRX{R@MlxuMiZuJ7hq0l~;)mWWjo6BON
zmjr$ZPSOY7u$_;Wp)b7m8TBb&bL|iun*<nTurDHA@QqoU*sO1T51WQrLbl>Rvhzv)
zEx&o77zO!cl$0fW0q8CQi~)d%TogP(YpUhg46HK%3jm7@3`tSaT8fags%eVCEY;X9
z@21DJWC}{B=t^~~H}b<S*j%PvuuWGhYRm7dpIDJf7wXnfoPMoqX>SKw>tO#lH^s0K
z9cLHuHK1`qs#0A}YlT^L&jhSMrbtKX1ExsR<$Qe_p+tGRVYC9>qAmUt{vy<z1mKc~
zAPO*$1$Hv;k2ZmjvK!Aq0wy#BjrnXU0N&uc^tHb^0=?lo0Q|wsvxo=`LZQ&AIc}!>
z%kN{iQ(xe5Yyv7dCzQ)J(@;L3kir>)`P<`)*-VywnlAb=Ff`7c5&vTg@aF-h0k}21
zF#=1S!QW0S!R8WO3%1$$7qe7;6P!m;ZV=D$*Thrs+6+hMjofTOQ@im~Iuu?OAoCk*
C>G2!@

diff --git a/rides/urls.py b/rides/urls.py
index 0f21d5e2..e7a90588 100644
--- a/rides/urls.py
+++ b/rides/urls.py
@@ -6,5 +6,4 @@ app_name = 'rides'
 urlpatterns = [
     path('', views.RideListView.as_view(), name='ride_list'),
     path('create/', views.RideCreateView.as_view(), name='ride_create'),
-    path('<slug:park_slug>/<slug:ride_slug>/', views.RideDetailView.as_view(), name='ride_detail'),
 ]
diff --git a/rides/views.py b/rides/views.py
index c8ca8366..be3e22a5 100644
--- a/rides/views.py
+++ b/rides/views.py
@@ -43,10 +43,10 @@ class RideCreateView(LoginRequiredMixin, CreateView):
             reason=self.request.POST.get('reason', ''),
             source=self.request.POST.get('source', '')
         )
-        return HttpResponseRedirect(reverse('rides:ride_list'))
+        return HttpResponseRedirect(reverse('ride_list'))
 
     def get_success_url(self):
-        return reverse('rides:ride_detail', kwargs={
+        return reverse('ride_detail', kwargs={
             'park_slug': self.object.park.slug,
             'ride_slug': self.object.slug
         })
@@ -75,7 +75,7 @@ class RideDetailView(SlugRedirectMixin, EditSubmissionMixin, PhotoSubmissionMixi
         return context
 
     def get_redirect_url_pattern(self):
-        return 'rides:ride_detail'
+        return 'ride_detail'
 
     def get_redirect_url_kwargs(self):
         return {
diff --git a/static/css/tailwind.css b/static/css/tailwind.css
index c92493cb..790cbd27 100644
--- a/static/css/tailwind.css
+++ b/static/css/tailwind.css
@@ -2943,14 +2943,14 @@ select {
   --tw-gradient-stops: var(--tw-gradient-from), #eff6ff var(--tw-gradient-via-position), var(--tw-gradient-to);
 }
 
-.to-secondary {
-  --tw-gradient-to: #e11d48 var(--tw-gradient-to-position);
-}
-
 .to-indigo-50 {
   --tw-gradient-to: #eef2ff var(--tw-gradient-to-position);
 }
 
+.to-secondary {
+  --tw-gradient-to: #e11d48 var(--tw-gradient-to-position);
+}
+
 .bg-clip-text {
   -webkit-background-clip: text;
           background-clip: text;
diff --git a/templates/accounts/turnstile_widget.html b/templates/accounts/turnstile_widget.html
index 28be5ce4..4723c9f6 100644
--- a/templates/accounts/turnstile_widget.html
+++ b/templates/accounts/turnstile_widget.html
@@ -8,17 +8,15 @@
     id="turnstile-widget"
     class="cf-turnstile"
     data-sitekey="{{ site_key }}"
-    data-theme="dark"
   ></div>
 </div>
 
 <script>
-  // Apply theme to the Turnstile widget based on system preference
+  // Apply theme to the Turnstile widget based on the retrieved theme
   document.addEventListener("DOMContentLoaded", function () {
     const turnstileWidget = document.getElementById("turnstile-widget");
     if (turnstileWidget) {
-      const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
-      turnstileWidget.setAttribute("data-theme", prefersDark ? "dark" : "light");
+      turnstileWidget.setAttribute("data-theme", theme);
     }
   });
 </script>
diff --git a/templates/base/base.html b/templates/base/base.html
index 681b94a8..b3de5d28 100644
--- a/templates/base/base.html
+++ b/templates/base/base.html
@@ -4,7 +4,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="csrf-token" content="{{ csrf_token }}">
+    <meta name="csrf-token" content="{{ csrf_token }}" />
     <title>{% block title %}ThrillWiki{% endblock %}</title>
 
     <!-- Google Fonts -->
@@ -101,78 +101,74 @@
             </label>
 
             <!-- User Menu -->
-            {% if user.is_authenticated %}
-              {% if has_moderation_access %}
-                <a href="{% url 'moderation:edit_submissions' %}" class="nav-link">
-                  <i class="fas fa-shield-alt"></i>
-                  <span>Moderation</span>
-                </a>
-              {% endif %}
-              <div class="relative" x-data="{ open: false }">
-                <button
-                  @click="open = !open"
-                  class="flex items-center space-x-2 transition-transform hover:scale-105"
-                >
-                  {% if user.profile.avatar %}
-                  <img
-                    src="{{ user.profile.avatar.url }}"
-                    alt="{{ user.username }}"
-                    class="w-8 h-8 rounded-full ring-2 ring-primary/20"
-                  />
-                  {% else %}
-                  <div
-                    class="flex items-center justify-center w-8 h-8 text-white rounded-full bg-gradient-to-br from-primary to-secondary"
-                  >
-                    {{ user.username.0|upper }}
-                  </div>
-                  {% endif %}
-                  <span>{{ user.username }}</span>
-                </button>
-
-                <!-- Dropdown Menu -->
+            {% if user.is_authenticated %} {% if has_moderation_access %}
+            <a href="{% url 'moderation:edit_submissions' %}" class="nav-link">
+              <i class="fas fa-shield-alt"></i>
+              <span>Moderation</span>
+            </a>
+            {% endif %}
+            <div class="relative" x-data="{ open: false }">
+              <button
+                @click="open = !open"
+                class="flex items-center space-x-2 transition-transform hover:scale-105"
+              >
+                {% if user.profile.avatar %}
+                <img
+                  src="{{ user.profile.avatar.url }}"
+                  alt="{{ user.username }}"
+                  class="w-8 h-8 rounded-full ring-2 ring-primary/20"
+                />
+                {% else %}
                 <div
-                  x-show="open"
-                  @click.away="open = false"
-                  class="absolute right-0 w-48 py-1 mt-2 bg-white rounded-md shadow-lg dark:bg-gray-800"
+                  class="flex items-center justify-center w-8 h-8 text-white rounded-full bg-gradient-to-br from-primary to-secondary"
                 >
-                  <a
-                    href="{% url 'profile' user.username %}"
-                    class="menu-item"
-                  >
-                    <i class="w-5 fas fa-user"></i>
-                    <span>Profile</span>
-                  </a>
-                  <a href="{% url 'settings' %}" class="menu-item">
-                    <i class="w-5 fas fa-cog"></i>
-                    <span>Settings</span>
-                  </a>
-                  {% if has_admin_access %}
-                  <a href="{% url 'admin:index' %}" class="menu-item">
-                    <i class="w-5 fas fa-shield-alt"></i>
-                    <span>Admin</span>
-                  </a>
-                  {% endif %}
-                  <form method="post" action="{% url 'account_logout' %}">
-                    {% csrf_token %}
-                    <button type="submit" class="w-full menu-item">
-                      <i class="w-5 fas fa-sign-out-alt"></i>
-                      <span>Logout</span>
-                    </button>
-                  </form>
+                  {{ user.username.0|upper }}
                 </div>
+                {% endif %}
+                <span>{{ user.username }}</span>
+              </button>
+
+              <!-- Dropdown Menu -->
+              <div
+                x-show="open"
+                @click.away="open = false"
+                class="absolute right-0 w-48 py-1 mt-2 bg-white rounded-md shadow-lg dark:bg-gray-800"
+              >
+                <a href="{% url 'profile' user.username %}" class="menu-item">
+                  <i class="w-5 fas fa-user"></i>
+                  <span>Profile</span>
+                </a>
+                <a href="{% url 'settings' %}" class="menu-item">
+                  <i class="w-5 fas fa-cog"></i>
+                  <span>Settings</span>
+                </a>
+                {% if has_admin_access %}
+                <a href="{% url 'admin:index' %}" class="menu-item">
+                  <i class="w-5 fas fa-shield-alt"></i>
+                  <span>Admin</span>
+                </a>
+                {% endif %}
+                <form method="post" action="{% url 'account_logout' %}">
+                  {% csrf_token %}
+                  <button type="submit" class="w-full menu-item">
+                    <i class="w-5 fas fa-sign-out-alt"></i>
+                    <span>Logout</span>
+                  </button>
+                </form>
               </div>
+            </div>
             {% else %}
-              <!-- Login/Register (Desktop) -->
-              <div class="hidden space-x-3 lg:flex">
-                <a href="{% url 'account_login' %}" class="btn-secondary">
-                  <i class="mr-2 fas fa-sign-in-alt"></i>
-                  Login
-                </a>
-                <a href="{% url 'account_signup' %}" class="btn-primary">
-                  <i class="mr-2 fas fa-user-plus"></i>
-                  Register
-                </a>
-              </div>
+            <!-- Login/Register (Desktop) -->
+            <div class="hidden space-x-3 lg:flex">
+              <a href="{% url 'account_login' %}" class="btn-secondary">
+                <i class="mr-2 fas fa-sign-in-alt"></i>
+                Login
+              </a>
+              <a href="{% url 'account_signup' %}" class="btn-primary">
+                <i class="mr-2 fas fa-user-plus"></i>
+                Register
+              </a>
+            </div>
             {% endif %}
 
             <!-- Mobile Menu Button -->
diff --git a/templates/home.html b/templates/home.html
index 7f80deed..08b3ae78 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -5,21 +5,21 @@
 
 {% block content %}
 <!-- Hero Section -->
-<div class="bg-white dark:bg-gray-800 rounded-lg shadow-lg border border-gray-200 dark:border-gray-700 mb-12">
-    <div class="py-12 px-4 text-center">
-        <h1 class="text-4xl md:text-5xl lg:text-6xl font-bold mb-6 text-gray-900 dark:text-white">
+<div class="mb-12 bg-white border border-gray-200 rounded-lg shadow-lg dark:bg-gray-800 dark:border-gray-700">
+    <div class="px-4 py-12 text-center">
+        <h1 class="mb-6 text-4xl font-bold text-gray-900 md:text-5xl lg:text-6xl dark:text-white">
             Welcome to ThrillWiki
         </h1>
-        <p class="text-xl md:text-2xl text-gray-600 dark:text-gray-300 mb-8 max-w-3xl mx-auto">
+        <p class="max-w-3xl mx-auto mb-8 text-xl text-gray-600 md:text-2xl dark:text-gray-300">
             Your ultimate guide to theme parks and attractions worldwide
         </p>
         <div class="flex flex-wrap justify-center gap-4">
             <a href="{% url 'parks:park_list' %}" 
-               class="btn-primary text-lg px-8 py-3">
+               class="px-8 py-3 text-lg btn-primary">
                 Explore Parks
             </a>
             <a href="{% url 'rides:ride_list' %}" 
-               class="btn-secondary text-lg px-8 py-3">
+               class="px-8 py-3 text-lg btn-secondary">
                 View Rides
             </a>
         </div>
@@ -27,10 +27,10 @@
 </div>
 
 <!-- Stats Section -->
-<div class="grid grid-cols-1 md:grid-cols-3 gap-6 mb-12">
+<div class="grid grid-cols-1 gap-6 mb-12 md:grid-cols-3">
     <!-- Total Parks -->
-    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-lg p-6 text-center transform transition-transform hover:-translate-y-1">
-        <div class="text-4xl font-bold text-blue-600 dark:text-blue-400 mb-2">
+    <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="mb-2 text-4xl font-bold text-blue-600 dark:text-blue-400">
             {{ stats.total_parks }}
         </div>
         <div class="text-xl text-gray-600 dark:text-gray-300">
@@ -39,8 +39,8 @@
     </div>
 
     <!-- Total Attractions -->
-    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-lg p-6 text-center transform transition-transform hover:-translate-y-1">
-        <div class="text-4xl font-bold text-blue-600 dark:text-blue-400 mb-2">
+    <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="mb-2 text-4xl font-bold text-blue-600 dark:text-blue-400">
             {{ stats.total_rides }}
         </div>
         <div class="text-xl text-gray-600 dark:text-gray-300">
@@ -49,8 +49,8 @@
     </div>
 
     <!-- Total Roller Coasters -->
-    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-lg p-6 text-center transform transition-transform hover:-translate-y-1">
-        <div class="text-4xl font-bold text-blue-600 dark:text-blue-400 mb-2">
+    <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="mb-2 text-4xl font-bold text-blue-600 dark:text-blue-400">
             {{ stats.total_roller_coasters }}
         </div>
         <div class="text-xl text-gray-600 dark:text-gray-300">
@@ -60,15 +60,15 @@
 </div>
 
 <!-- Featured Content -->
-<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+<div class="grid grid-cols-1 gap-6 md:grid-cols-2">
     <!-- Popular Parks -->
-    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-lg p-6">
-        <h2 class="text-2xl font-bold mb-6 text-gray-900 dark:text-white">
+    <div class="p-6 bg-white rounded-lg shadow-lg dark:bg-gray-800">
+        <h2 class="mb-6 text-2xl font-bold text-gray-900 dark:text-white">
             Popular Parks
         </h2>
         {% for park in popular_parks %}
             <a href="{% url 'parks:park_detail' park.slug %}" 
-               class="block mb-4 p-4 rounded-lg transition-all 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">
                     {{ park.name }}
                 </div>
@@ -76,7 +76,7 @@
                     {{ park.location }}
                 </div>
                 {% if park.average_rating %}
-                    <div class="mt-1 flex items-center text-yellow-500">
+                    <div class="flex items-center mt-1 text-yellow-500">
                         <span class="mr-1">★</span>
                         <span>{{ park.average_rating|floatformat:1 }}/10</span>
                     </div>
@@ -88,13 +88,13 @@
     </div>
 
     <!-- Popular Rides -->
-    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-lg p-6">
-        <h2 class="text-2xl font-bold mb-6 text-gray-900 dark:text-white">
+    <div class="p-6 bg-white rounded-lg shadow-lg dark:bg-gray-800">
+        <h2 class="mb-6 text-2xl font-bold text-gray-900 dark:text-white">
             Popular Rides
         </h2>
         {% for ride in popular_rides %}
             <a href="{% url 'rides:ride_detail' ride.park.slug ride.slug %}" 
-               class="block mb-4 p-4 rounded-lg transition-all 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">
                     {{ ride.name }}
                 </div>
@@ -102,7 +102,7 @@
                     at {{ ride.park.name }}
                 </div>
                 {% if ride.average_rating %}
-                    <div class="mt-1 flex items-center text-yellow-500">
+                    <div class="flex items-center mt-1 text-yellow-500">
                         <span class="mr-1">★</span>
                         <span>{{ ride.average_rating|floatformat:1 }}/10</span>
                     </div>
diff --git a/templates/parks/park_detail.html b/templates/parks/park_detail.html
index 86664e60..588e122b 100644
--- a/templates/parks/park_detail.html
+++ b/templates/parks/park_detail.html
@@ -116,7 +116,7 @@
                         {% for area in areas %}
                             <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 text-gray-900 dark:text-white">
-                                    <a href="{% url 'parks:area_detail' park.slug area.slug %}">{{ area.name }}</a>
+                                    {{ area.name }}
                                 </h3>
                                 {% if area.description %}
                                     <p class="mb-2 text-gray-600 dark:text-gray-300">
@@ -281,7 +281,7 @@
                             </div>
                         </div>
                     {% empty %}
-                        <p class="text-gray-500 dark:text-gray-400">No history available.</p>
+                        <p class="text-gray-500">No history available.</p>
                     {% endfor %}
                 </div>
             </div>
diff --git a/templates/parks/park_list.html b/templates/parks/park_list.html
index 489ffc84..4bb3fcf9 100644
--- a/templates/parks/park_list.html
+++ b/templates/parks/park_list.html
@@ -8,7 +8,7 @@
     <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>
         {% if user.is_authenticated %}
-            <a href="{% url 'parks:park_create' %}" class="btn-primary">
+            <a href="{% url 'park_create' %}" class="btn-primary">
                 <i class="mr-2 fas fa-plus"></i>Add Park
             </a>
         {% endif %}
@@ -70,7 +70,7 @@
                 {% endif %}
                 <div class="p-4">
                     <h2 class="mb-2 text-xl font-bold">
-                        <a href="{% url 'parks:park_detail' park.slug %}" 
+                        <a href="{% url 'park_detail' park.slug %}" 
                            class="text-gray-900 hover:text-blue-600 dark:text-white dark:hover:text-blue-400">
                             {{ park.name }}
                         </a>
diff --git a/templates/rides/ride_detail.html b/templates/rides/ride_detail.html
index c17e758b..c48d808c 100644
--- a/templates/rides/ride_detail.html
+++ b/templates/rides/ride_detail.html
@@ -275,6 +275,22 @@
                     {% endfor %}
                 </div>
             </div>
+
+            <!-- Photos -->
+            {% if ride.photos.exists %}
+                <div class="p-6 bg-white rounded-lg shadow dark:bg-gray-800">
+                    <h2 class="mb-4 text-xl font-semibold text-gray-900 dark:text-white">Photos</h2>
+                    <div class="grid grid-cols-2 gap-2">
+                        {% for photo in ride.photos.all %}
+                            <div class="aspect-w-16 aspect-h-9">
+                                <img src="{{ photo.image.url }}" 
+                                     alt="{{ photo.caption|default:ride.name }}"
+                                     class="object-cover rounded-lg">
+                            </div>
+                        {% endfor %}
+                    </div>
+                </div>
+            {% endif %}
         </div>
     </div>
 
diff --git a/templates/rides/ride_list.html b/templates/rides/ride_list.html
index 648b5e6e..80725383 100644
--- a/templates/rides/ride_list.html
+++ b/templates/rides/ride_list.html
@@ -83,7 +83,7 @@
                         </a>
                     </p>
                     <div class="flex flex-wrap gap-2">
-                        <span class="text-blue-800 bg-blue-100 status-badge dark:bg-blue-700 dark:text-blue-50">
+                        <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
diff --git a/templates/search_results.html b/templates/search_results.html
index 155635eb..35076d4a 100644
--- a/templates/search_results.html
+++ b/templates/search_results.html
@@ -4,10 +4,10 @@
 {% block title %}Search Results - ThrillWiki{% endblock %}
 
 {% block content %}
-<div class="container mx-auto px-4 py-8">
+<div class="container px-4 py-8 mx-auto">
     <!-- Search Header -->
     <div class="mb-8">
-        <h1 class="text-3xl font-bold mb-2">Search Results</h1>
+        <h1 class="mb-2 text-3xl font-bold">Search Results</h1>
         <p class="text-gray-600 dark:text-gray-400">
             {% if request.GET.q %}
                 Results for "{{ request.GET.q }}"
@@ -19,36 +19,36 @@
 
     {% if request.GET.q %}
         <!-- Parks Results -->
-        <div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 mb-6">
-            <h2 class="text-xl font-semibold mb-4">Theme Parks</h2>
-            <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+        <div class="p-6 mb-6 bg-white rounded-lg shadow dark:bg-gray-800">
+            <h2 class="mb-4 text-xl font-semibold">Theme Parks</h2>
+            <div class="grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
                 {% for park in parks %}
-                    <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 park.photos.exists %}
                             <img src="{{ park.photos.first.image.url }}" 
                                  alt="{{ park.name }}"
-                                 class="w-full h-48 object-cover">
+                                 class="object-cover w-full h-48">
                         {% 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>
                             </div>
                         {% endif %}
                         
                         <div class="p-4">
-                            <h3 class="text-lg font-semibold mb-2">
+                            <h3 class="mb-2 text-lg font-semibold">
                                 <a href="{% url 'parks:park_detail' park.slug %}" 
-                                   class="text-blue-600 dark:text-blue-400 hover:underline">
+                                   class="text-blue-600 hover:underline dark:text-blue-400">
                                     {{ park.name }}
                                 </a>
                             </h3>
-                            <p class="text-gray-600 dark:text-gray-400 mb-2">{{ park.location }}</p>
-                            <div class="flex justify-between items-center">
+                            <p class="mb-2 text-gray-600 dark:text-gray-400">{{ park.location }}</p>
+                            <div class="flex items-center justify-between">
                                 <span class="text-sm text-gray-500 dark:text-gray-400">
                                     {{ park.rides.count }} attractions
                                 </span>
                                 {% if park.average_rating %}
                                     <div class="flex items-center">
-                                        <span class="text-yellow-400 mr-1">★</span>
+                                        <span class="mr-1 text-yellow-400">★</span>
                                         <span>{{ park.average_rating|floatformat:1 }}/10</span>
                                     </div>
                                 {% endif %}
@@ -56,7 +56,7 @@
                         </div>
                     </div>
                 {% empty %}
-                    <div class="col-span-full text-center py-4">
+                    <div class="py-4 text-center col-span-full">
                         <p class="text-gray-500 dark:text-gray-400">No parks found matching your search.</p>
                     </div>
                 {% endfor %}
@@ -64,39 +64,39 @@
         </div>
 
         <!-- Rides Results -->
-        <div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 mb-6">
-            <h2 class="text-xl font-semibold mb-4">Rides & Attractions</h2>
-            <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+        <div class="p-6 mb-6 bg-white rounded-lg shadow dark:bg-gray-800">
+            <h2 class="mb-4 text-xl font-semibold">Rides & Attractions</h2>
+            <div class="grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
                 {% 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 %}
                             <img src="{{ ride.photos.first.image.url }}" 
                                  alt="{{ ride.name }}"
-                                 class="w-full h-48 object-cover">
+                                 class="object-cover w-full h-48">
                         {% 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>
                             </div>
                         {% endif %}
                         
                         <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 %}" 
-                                   class="text-blue-600 dark:text-blue-400 hover:underline">
+                                   class="text-blue-600 hover:underline dark:text-blue-400">
                                     {{ ride.name }}
                                 </a>
                             </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 %}" 
                                      class="hover:underline">{{ ride.park.name }}</a>
                             </p>
                             <div class="flex flex-wrap gap-2 mb-2">
-                                <span class="px-2 py-1 text-xs rounded-full bg-blue-100 text-blue-800">
+                                <span class="px-2 py-1 text-xs text-blue-800 bg-blue-100 rounded-full">
                                     {{ ride.get_category_display }}
                                 </span>
                                 {% if ride.average_rating %}
                                     <div class="flex items-center">
-                                        <span class="text-yellow-400 mr-1">★</span>
+                                        <span class="mr-1 text-yellow-400">★</span>
                                         <span>{{ ride.average_rating|floatformat:1 }}/10</span>
                                     </div>
                                 {% endif %}
@@ -104,7 +104,7 @@
                         </div>
                     </div>
                 {% empty %}
-                    <div class="col-span-full text-center py-4">
+                    <div class="py-4 text-center col-span-full">
                         <p class="text-gray-500 dark:text-gray-400">No rides found matching your search.</p>
                     </div>
                 {% endfor %}
@@ -112,26 +112,26 @@
         </div>
 
         <!-- Companies Results -->
-        <div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6">
-            <h2 class="text-xl font-semibold mb-4">Companies</h2>
-            <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+        <div class="p-6 bg-white rounded-lg shadow dark:bg-gray-800">
+            <h2 class="mb-4 text-xl font-semibold">Companies</h2>
+            <div class="grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
                 {% for company in companies %}
-                    <div class="bg-gray-50 dark:bg-gray-700 rounded-lg p-4">
-                        <h3 class="text-lg font-semibold mb-2">
+                    <div class="p-4 rounded-lg bg-gray-50 dark:bg-gray-700">
+                        <h3 class="mb-2 text-lg font-semibold">
                             <a href="{% url 'companies:company_detail' company.slug %}" 
-                               class="text-blue-600 dark:text-blue-400 hover:underline">
+                               class="text-blue-600 hover:underline dark:text-blue-400">
                                 {{ company.name }}
                             </a>
                         </h3>
                         {% if company.headquarters %}
-                            <p class="text-gray-600 dark:text-gray-400 mb-2">{{ company.headquarters }}</p>
+                            <p class="mb-2 text-gray-600 dark:text-gray-400">{{ company.headquarters }}</p>
                         {% endif %}
                         <div class="text-sm text-gray-500 dark:text-gray-400">
                             {{ company.parks.count }} parks owned
                         </div>
                     </div>
                 {% empty %}
-                    <div class="col-span-full text-center py-4">
+                    <div class="py-4 text-center col-span-full">
                         <p class="text-gray-500 dark:text-gray-400">No companies found matching your search.</p>
                     </div>
                 {% endfor %}
diff --git a/thrillwiki/__pycache__/urls.cpython-312.pyc b/thrillwiki/__pycache__/urls.cpython-312.pyc
index 4679106771cbafb0d964472803bed3a05a023e58..d50711a0d6c1297c2d67dc1e92eac26a1b076fca 100644
GIT binary patch
delta 615
zcmX>mdP79xG%qg~0}#AgpqQS@!NBks#DM{EDC6@V=7}2D*i!h{2&`tBEW;=jlp+jb
zLZo3d6GJL<iU^QoNfBMmh(%5eEGLdtPGWKfqoSbX8lKh65S?Jtq$Xcrlw_7(BQyC8
zqwM6%jAEhkYh+;hQxwotD}v2eg2|(}3nHhCRZeBH9h11ADw=6(lix8J3#y}uYJfyV
zHPJ-1Qn|CVCa+`C57kDK(E-ZnK!Xv9O3_7Arw4Yseu@ERxTXtk-o@<5sCSFCAh9UB
zSd;M<XI^4%YH>kga%vS@QD#bNv3?a7nAR&T$|=6Z3Sv*@WBtS`Qd*o^G?|S}esTa?
z$>xh}jEs!plP|MB=Q0Jl1r$Za&n6$?@Yeju#=y$iAu-W>hRp`^E5g>7S!`~yaG(l+
z)l4?vTq!QUK<>Jt^+iSN>x#}76`e0Dx}Na6!V*21mn(tOl~I|Wse${0&*V}rUlwDa
F6#xfNf&Tyi

delta 649
zcmca1a!gd?G%qg~0}v=RDyCO(Ffcp@abQ3K%J^)-GEw8&WCJEqc77&?RF)J0Fk2AJ
z76P+{!E6x_n^AOf0i$BF*czVI%n$>Ba?B~>K$1601!gvaPLWt6xtbBePmw~?C5=;;
z%o@qb`xs@JSyJS|E|3GeKmo+oR7~a0QbX7PW2GpenXWuJkI7h21x-{HEUJbksty*_
zKoixR{Ef*tR0~a18)&}{%vJ=QqJySR7wl%e6#X>@tC=9`V060B<~n9aM&T;9qRf=k
zV*M&EFs)Zwlr#A)%O@4l(&E&jVtt$9k|HY*GcPeW)lUBw4~QLKP?VpRnUgyC9;-Nq
zaB*f{dQNKm<ZrBvT$~_f#RZAUshdmKSQr^aCRegQ=Q06W4T^x`Uz4*qycKV<aCAsa
zG@oH}Sy<yTizX&_@;#1~CJGDmt}EGGRI<6Q<Z@BT<+767iMT5)F+kN9IOP|}U01Ze
ssAzp%(fOjH^JPWX3qFZgSdu2s<4oYNSKw!A;Qrt?nVrj*#RzCE0Iye!wEzGB

diff --git a/thrillwiki/urls.py b/thrillwiki/urls.py
index a3cd2916..94870535 100644
--- a/thrillwiki/urls.py
+++ b/thrillwiki/urls.py
@@ -11,8 +11,12 @@ urlpatterns = [
     
     # Main app URLs
     path('', HomeView.as_view(), name='home'),
-    path('parks/', include('parks.urls')),
-    path('rides/', include('rides.urls')),
+    
+    # Parks URLs
+    path('parks/', include('parks.urls', namespace='parks')),
+    path('rides/', include('rides.urls', namespace='rides')),
+    
+    # Other URLs
     path('reviews/', include('reviews.urls')),
     path('companies/', include('companies.urls')),
     path('search/', SearchView.as_view(), name='search'),
@@ -28,8 +32,7 @@ urlpatterns = [
     path('accounts/email-required/', accounts_views.email_required, name='email_required'),
     
     # User profile URLs
-    path('users/<str:username>/', accounts_views.ProfileView.as_view(), name='user_profile'),
-    path('user/<str:username>/', accounts_views.ProfileView.as_view(), name='single_user_profile'),
+    path('user/<str:username>/', accounts_views.ProfileView.as_view(), name='user_profile'),
     path('profile/<str:username>/', accounts_views.ProfileView.as_view(), name='profile'),
     path('settings/', accounts_views.SettingsView.as_view(), name='settings'),