Fix urls for about and events to fit with collapsible menus

Author: sdelquin

apps/about/urls.py

@@ -6,6 +6,7 @@
 
 urlpatterns = [
     path('', views.index, name='index'),
+    path('us/', views.us, name='us'),
     path('join/', views.join, name='join'),
     path('history/', views.history, name='history'),
 ]

apps/about/views.py

@@ -1,13 +1,17 @@
 import logging
 
-from django.shortcuts import render
+from django.shortcuts import redirect, render
 
 from apps.members.models import Position
 
 logger = logging.getLogger(__name__)
 
 
 def index(request):
+    return redirect('about:us')
+
+
+def us(request):
     positions = [p for p in Position.objects.all() if p.active]
     return render(
         request,

apps/commons/templates/header.html

@@ -21,7 +21,7 @@
          Asociación
          </a>
           <div class="navbar-dropdown is-boxed js-nav-dropdown collapsable--close">
-              <a class="navbar-item {% is_active 'about:index' %}" href="{% url 'about:index' %}">Información</a>
+              <a class="navbar-item {% is_active 'about:us' %}" href="{% url 'about:us' %}">Información</a>
               <a class="navbar-item {% is_active 'about:history' %}" href="{% url 'about:history' %}">Historia</a>
               <a class="navbar-item {% is_active 'about:join' %}" href="{% url 'about:join' %}">¡Únete!</a>
           </div>
@@ -32,7 +32,7 @@
           Eventos
           </a>
           <div class="navbar-dropdown is-boxed js-nav-dropdown collapsable--close">
-            <a class="navbar-item {% is_active 'events:index' %}" href="{% url 'events:index' %}">Próximo evento</a>
+            <a class="navbar-item {% is_active 'events:next' %}" href="{% url 'events:next' %}">Próximo evento</a>
             <a class="navbar-item {% is_active 'events:past_events' %}" href="{% url 'events:past_events' %}">Eventos pasados</a>
             </div>
       </div>
@@ -55,4 +55,4 @@
     </div>
   </div>
   </div>
-</nav>
+</nav>

apps/events/urls.py

@@ -6,6 +6,7 @@
 
 urlpatterns = [
     path('', views.index, name='index'),
+    path('next/', views.next, name='next'),
     path('archive/', views.past_events, name='past_events'),
     path('<slug:slug>/', views.detail_event, name='detail_event'),
     path(
@@ -60,13 +61,20 @@
         name='ticket_purchase_nocc',
     ),
     path('<slug:slug>/raffle/', views.raffle, name='raffle'),
-    path('<slug:slug>/raffle/<int:gift_id>/',
-         views.raffle_gift,
-         name='raffle_gift'),
-    path('<slug:slug>/raffle/<int:gift_id>/match/',
-         views.raffle_gift, {'match': True},
-         name='raffle_gift_match'),
-    path('<slug:slug>/raffle/results/',
-         views.raffle_results,
-         name='raffle_results'),
+    path(
+        '<slug:slug>/raffle/<int:gift_id>/',
+        views.raffle_gift,
+        name='raffle_gift',
+    ),
+    path(
+        '<slug:slug>/raffle/<int:gift_id>/match/',
+        views.raffle_gift,
+        {'match': True},
+        name='raffle_gift_match',
+    ),
+    path(
+        '<slug:slug>/raffle/results/',
+        views.raffle_results,
+        name='raffle_results',
+    ),
 ]

apps/events/views.py

@@ -18,6 +18,10 @@
 
 
 def index(request):
+    return redirect('events:next')
+
+
+def next(request):
     events = Event.objects.filter(active=True)
     num_events = events.count()
     if num_events == 0: