Merge branch 'main' into main

src/scoreboard/templates/scoreboard/network.html

@@ -0,0 +1,29 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% block content %}
+<div class="row">
+  <div class="col-12">
+    <div>
+      <h4>Scoreboard</h4>
+      <table class="table table-dark">
+        <thead>
+          <tr>
+            <th scope="col">{% trans "Rank" %}</th>
+            <th scope="col">{% trans "Campus" %}</th>
+            <th scope="col">{% trans "Score" %}</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for name, score in scores.items %}
+          <tr>
+            <th scope="row"># {{ forloop.counter0|add:1 }}</th>
+            <th><a href="{% url 'scoreboard:campus' campus=name %}"> {{ name }}</a></th>
+            <td>{{ score}}</td>
+          </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+{% endblock %}

src/scoreboard/urls.py

@@ -4,6 +4,7 @@ from . import views
 app_name = "scoreboard"
 
 urlpatterns = [
-        path('', views.scoreboard, name='scoreboard'),
+        path('', views.scoreboard, name='main'),
-        path('campus/<str:campus>', views.campus, name='campus')
+        path('campus/<str:campus>', views.campus, name='campus'),
+        path('network/', views.network, name='network')
 ]

src/scoreboard/views.py

@@ -1,6 +1,6 @@
 from django.shortcuts import render
 from django.core.paginator import Paginator
-from accounts.models import UserProfileInfo
+from accounts.models import UserProfileInfo, Campus
 
 def scoreboard(request):
     scores      = UserProfileInfo.objects.filter(score__gt=0).select_related().order_by('-score', 'last_submission_date', 'user__username')
@@ -16,4 +16,15 @@ def campus(request, campus):
     scores_p    = paginator.get_page(page)
     return render(request, 'scoreboard/scoreboard.html', {'scores':scores_p})
 
+def network(request):
+    campuses    = Campus.objects.all()
+    scores      = {}
+
+    for campus in campuses:
+        users = UserProfileInfo.objects.filter(score__gt=0, campus__name__exact=campus).select_related().order_by('-score', 'last_submission_date', 'user__username')[:10]
+        scores[campus] = sum([u.score for u in users])
+
+    sorted_scores = {k: v for k, v in sorted(scores.items(), key=lambda item: item[1], reverse=True)}
+    return render(request, 'scoreboard/network.html', {'scores':sorted_scores})
+
 # Create your views here.

src/templates/base.html

@@ -60,20 +60,26 @@
 						</div>
 					</li>
 					
-					<li class="nav-item">
+					<li class="nav-item dropdown">
-						<a class="nav-link" href="{% url 'scoreboard:scoreboard' %}">{% translate "Scoreboard" %}</a>
+						<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+							{% trans "Scoreboard" %}
+						</a>
+						<div class="dropdown-menu" aria-labelledby="navbarDropdown">
+							<a class="dropdown-item" href="{% url 'scoreboard:main' %}">{% trans "Main" %}</a>
+							<a class="dropdown-item" href="{% url 'scoreboard:network' %}">{% trans "42 Network" %}</a>
+						</div>
 					</li>
 					<li class="nav-item">
 						<a class="nav-link" href="{% url 'events:events' %}">{% translate "Events" %}</a>
 					</li>
 					<li class="nav-item dropdown">
 						<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-							Resources
+							{% trans "Resources" %}
 						</a>
 						<div class="dropdown-menu" aria-labelledby="navbarDropdown">
-							<a class="dropdown-item" href="{% url 'resources:about' %}">About</a>
+							<a class="dropdown-item" href="{% url 'resources:about' %}">{% trans "About"%}</a>
-							<a class="dropdown-item" href="{% url 'resources:howToStart' %}">How To Start</a>
+							<a class="dropdown-item" href="{% url 'resources:howToStart' %}">{% trans "How To Start" %}</a>
-							<a class="dropdown-item" href="{% url 'resources:contribute' %}">Contribute</a>
+							<a class="dropdown-item" href="{% url 'resources:contribute' %}">{% trans "Contribute" %}</a>
 						</div>
 					</li>
 				</ul>