Merge pull request 'Podium added and working, logo and website of campuses added in campus model' (#76) from ix/website:main into main

Reviewed-on: 42CTF/website#76
Reviewed-by: Danhia <danhia@protonmail.com>

src/accounts/migrations/0013_auto_20220818_1741.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.2.11 on 2022-08-18 15:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0012_auto_20220801_2212'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='campus',
+            name='logo',
+            field=models.URLField(default='https://42.fr'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='campus',
+            name='url',
+            field=models.URLField(default='https://42.fr', max_length=100),
+            preserve_default=False,
+        ),
+    ]

src/accounts/migrations/0014_auto_20220818_1744.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.11 on 2022-08-18 15:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0013_auto_20220818_1741'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='campus',
+            name='logo',
+            field=models.URLField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='campus',
+            name='url',
+            field=models.URLField(blank=True, max_length=100),
+        ),
+    ]

src/accounts/models.py

@@ -28,6 +28,8 @@ class UserProfileInfo(models.Model):
 class Campus(models.Model):
     id                       =   models.IntegerField(primary_key=True, unique=True)
     name                     =   models.CharField(max_length=50)
+    url                     =   models.URLField(max_length=100,blank=True)
+    logo                     =   models.URLField(max_length=200,blank=True)
     def __str__(self):
         return self.name
     class Meta:

src/ctfs/sitemaps.py

@@ -0,0 +1,26 @@
+from django.contrib import sitemaps
+from django.urls import reverse
+from .models import Category, CTF
+from .views import category, ctf
+
+class CategorySitemap(sitemaps.Sitemap):
+    changefreq = "weekly"
+    priority = 0.7
+    i18n = True
+
+    def items(self):
+        return Category.objects.all()
+
+    def location(self, obj):
+        return reverse(category, kwargs={'cat_slug': obj.slug})
+
+class CTFSitemap(sitemaps.Sitemap):
+    changefreq = "weekly"
+    priority = 0.7
+    i18n = True
+
+    def items(self):
+        return CTF.objects.all()
+
+    def location(self, obj):
+        return reverse(ctf, kwargs={'cat_slug': obj.category.slug, 'ctf_slug': obj.slug})

src/ctfs/templates/ctfs/ctf_info.html

@@ -8,7 +8,7 @@
   <div class="col-sm-12 col-md-9">
     <div class="ctf-block">
       <div class="ctf-head">
-        <h3>{{ ctf.name }}</h3>
+        <h1>{{ ctf.name }}</h1>
         <small>{% trans "Published date" %} : {{ ctf.pub_date }}</small>
       </div>
       {% if date < ctf.pub_date %}

src/ctfs/templates/ctfs/ctfs_list.html

@@ -2,8 +2,10 @@
 {% block content %}
 {% load i18n %}
 <div class="row">
+  <div class="col-12 ctf-head">
+    <h1>{{ cat.name }}</h1>
+  </div>
   <div class="col-sm-12 col-md-9 news-card">
-      <h3>{{ cat.name }}</h3>
   {% if ctfs %}
   <table class="table table-striped table-dark">
       <thead>

src/ctfs/templatetags/get_chall.py

@@ -4,9 +4,7 @@ register = template.Library()
 
 @register.simple_tag
 def get_chall_by_lang(chall, lang):
-	print(chall.slug)
 	filepath = "ctfs/templates/challenges/"+ lang + "/" + chall.slug + ".html"
-	print(filepath)
 	try:
 		with open(filepath) as fp:
 			return fp.read()

src/ctfs/urls.py

@@ -1,7 +1,15 @@
+from django.contrib.sitemaps.views import sitemap
 from django.urls import path
+from .sitemaps import CategorySitemap, CTFSitemap
 from . import views
 
+sitemaps = {
+    'categories': CategorySitemap(),
+    'challenges': CTFSitemap(),
+}
+
 urlpatterns = [
         path('<str:cat_slug>/', views.category, name='category'),
-        path('<str:cat_slug>/<str:ctf_slug>', views.ctf, name='ctf')
+        path('<str:cat_slug>/<str:ctf_slug>', views.ctf, name='ctf'),
+        path('sitemap.xml', sitemap, {'sitemaps': sitemaps}, name='django.contrib.sitemaps.views.sitemap'),
 ]

src/events/sitemaps.py

@@ -0,0 +1,24 @@
+from django.contrib import sitemaps
+from django.urls import reverse
+from .models import Event
+
+class EventsSitemap(sitemaps.Sitemap):
+    changefreq = "daily"
+    priority = 0.7
+    i18n = True
+
+    def items(self):
+        return Event.objects.all()
+
+    def location(self, obj):
+        return reverse('events:event_info', kwargs={'event_slug': obj.slug})
+
+class StaticViewSitemap(sitemaps.Sitemap):
+    priority = 0.7
+    changefreq = 'daily'
+    i18n = True
+    def items(self):
+        return ['events:events']
+
+    def location(self, item):
+        return reverse(item)

src/events/templates/events/ctf_info.html

@@ -7,7 +7,7 @@
     <div class="ctf-block">
       <a href="{% url 'events:event_info' event_slug=event.slug %}">< Back to event</a>
       <div class="ctf-head">
-        <h2>{% trans "Event" %} - {{ event.name }}</h2>
+        <h1>{% trans "Event" %} - {{ event.name }}</h1>
         <h4>{{ ctf.name }}</h4>
         <small>{% trans "Published date" %} : {{ ctf.pub_date }}</small>
       </div>

src/events/templates/events/event_info.html

@@ -13,7 +13,7 @@
     {% endif %}
     <div class="event-block">
       <div class="event-head" style="background-image:linear-gradient(180deg, rgba(102,102,102,0.3) 100%, rgba(29,29,29,1) 100%),url('{{ event.img }}');">
-        <h3>{{ event.name }}</h3>
+        <h1>{{ event.name }}</h1>
         {% if ended == True %}
         <small>{% trans "This event is over." %}</small>
         {% else %}      

src/events/templates/events/events_list.html

@@ -2,8 +2,8 @@
 {% block content %}
 {% load i18n %}
 <div class="row">
-  <div class="col-12">
-    <h3>{% trans "Events" %}</h3>
+  <div class="col-12 ctf-head">
+    <h1>{% trans "Events" %}</h1>
   </div>
   {% if events %}
     {% for ev in events %}

src/events/urls.py

@@ -1,10 +1,18 @@
+from django.contrib.sitemaps.views import sitemap
 from django.urls import path
+from .sitemaps import StaticViewSitemap, EventsSitemap
 from . import views
 
 app_name = "events"
 
+sitemaps = {
+    'events': EventsSitemap(),
+    'static': StaticViewSitemap(),
+}
+
 urlpatterns = [
         path('', views.events, name='events'),
+        path('sitemap.xml', sitemap, {'sitemaps': sitemaps}, name='django.contrib.sitemaps.views.sitemap'),
         path('<str:event_slug>', views.event, name='event_info'),
         path('<str:event_slug>/challenge/<str:chall_slug>', views.chall_event_info, name='event_chall_info'),
         path('pwd/<str:event_slug>', views.submit_pwd, name='submit_pwd'),

src/home/sitemaps.py

@@ -0,0 +1,12 @@
+from django.contrib import sitemaps
+from django.urls import reverse
+
+class StaticViewSitemap(sitemaps.Sitemap):
+    priority = 0.5
+    changefreq = 'monthly'
+    i18n = True
+    def items(self):
+        return ['home', 'cgu']
+
+    def location(self, item):
+        return reverse(item)

src/home/templates/cgu.html

@@ -4,7 +4,7 @@
 {% get_current_language as lang %}
 <div class="row">
         <div class="col-12 news-card">
-                <h2>Conditions générales d'utilisation du site 42CTF</h2>
+                <h1>Conditions générales d'utilisation du site 42CTF</h1>
 
 <h5>Article 1 : Objet</h5>
 

src/home/urls.py

@@ -1,7 +1,14 @@
+from django.contrib.sitemaps.views import sitemap
 from django.urls import path
+from .sitemaps import StaticViewSitemap
 from . import views
 
+sitemaps = {
+    'static': StaticViewSitemap(),
+}
+
 urlpatterns = [
         path('', views.home, name='home'),
         path('CGU', views.cgu, name='cgu'),
+        path('sitemap.xml', sitemap, {'sitemaps': sitemaps}, name='django.contrib.sitemaps.views.sitemap'),
 ]

src/home/views.py

@@ -9,12 +9,15 @@ from django.utils.translation import (
     LANGUAGE_SESSION_KEY, check_for_language, get_language,
 )
 from django.core.files.storage import default_storage
-import datetime
+
+# import datetime
+from django.utils import timezone
+
 from collections import defaultdict
 import operator
 
 def get_weekly_top():
-    week_ago = datetime.datetime.now() - datetime.timedelta(days=7)
+    week_ago = timezone.now() - timezone.timedelta(days=7)
     weekly_flags = CTF_flags.objects.filter(flag_date__gt=week_ago, ctf__disabled=False, ctf__event=None)
     scores = defaultdict(int)
 

src/project/settings.py

@@ -39,6 +39,7 @@ INSTALLED_APPS = [
     'resources.apps.ResourcesConfig',
     'django.contrib.sites',
     'api.apps.ApiConfig',
+    'django.contrib.sitemaps',
 ]
 
 MIDDLEWARE = [

src/resources/sitemaps.py

@@ -0,0 +1,12 @@
+from django.contrib import sitemaps
+from django.urls import reverse
+
+class StaticViewSitemap(sitemaps.Sitemap):
+    priority = 0.5
+    changefreq = 'monthly'
+    i18n = True
+    def items(self):
+        return ['resources:about', 'resources:howToStart', 'resources:contribute', 'resources:becomeMember']
+
+    def location(self, item):
+        return reverse(item)

src/resources/templates/resources/about.html

@@ -3,12 +3,13 @@
 {% load i18n %}
 {% get_current_language as lang %}
 <div class="row">
-    {% load i18n %}
-    {% get_current_language as lang %}
+    <div class="col-12 ctf-head">
+            <h1>{% trans "About 42ctf" %}</h1>
+    </div>
     <div class="col-sm-12">
         <div class="ctf-block">
-                <div class="ctf-head">
-                    <center><h3>{% trans "What is 42CTF ?" %}</h3></center>
+            <div class="ctf-head text-center">
+                <h1>{% trans "What is 42CTF ?" %}</h1>
             </div>
             <div class="ctf-body">
                 <h4>{% trans "A short introduction to CTF" %}</h4>
@@ -31,6 +32,5 @@
             </div>
         </div>
     </div>
-    
-    {% endblock %}
 </div>
+{% endblock %}

src/resources/templates/resources/becomeMember.html

@@ -4,8 +4,8 @@
 {% load i18n %}
 {% get_current_language as lang %}
 <div class="row">
-    <div class="col-12">
-        <h3>{% trans "Become a 42CTF member" %}</h3>
+    <div class="col-12 ctf-head">
+        <h1>{% trans "Become a 42CTF member" %}</h1>
     </div>
     <div class="col-sm-6">
         <div class="ctf-block text-center">
@@ -43,6 +43,7 @@
             <div class="ctf-head text-center">
                 <h4>{% trans "What do I get ?" %}</h4>
             </div>
+            <br><br>
             {% blocktranslate %}
             - A <span class='is-member'>different color</span> for your pseudo in the scoreboard, to let everyone know you're a member.<br>
             - The possibility to play past CTF, with challenges no longer available, in the form of private events with the people of your choice.<br>

src/resources/templates/resources/contribute.html

@@ -3,6 +3,9 @@
 {% load i18n %}
 {% get_current_language as lang %}
 <div class="row">
+        <div class="col-12 ctf-head">
+                <h1>{% trans "Contribute to 42ctf" %}</h1>
+        </div>
         {% block donate %}
                 {% include "./donate.html" %}
         {% endblock %}

src/resources/templates/resources/create_challenge.html

@@ -3,8 +3,8 @@
 {% get_current_language as lang %}
     <div class="col-sm-12 col-md-6">
         <div class="ctf-block">
-            <div class="ctf-head">
-            <center><h3>{% trans "Create new challenges" %}</h3></center>
+            <div class="ctf-head text-center">
+                <h3>{% trans "Create new challenges" %}</h3>
             </div>
             <div class="ctf-body">
                 {% trans "If you want to create new challenges for 42CTF, send us a message on " %}<a class="footer_imgs" href="https://discord.gg/DwZqPpA" target="_blank"><img src="/static/img/discord.png" width="30"></a> !<br><br>

src/resources/templates/resources/edit.html

@@ -1,10 +1,10 @@
 {% block content %}
 {% load i18n %}
 {% get_current_language as lang %}
-    <div class="col-sm-12 col-md-6">
+    <div class="col-sm-12">
         <div class="ctf-block">
-            <div class="ctf-head">
-                <center><h3>{% trans "Edit this page" %}</h3></center>
+            <div class="ctf-head text-center">
+                <h3>{% trans "Edit this page" %}</h3>
             </div>
             <div class="ctf-body">
                 <br>

src/resources/templates/resources/howToStart.html

@@ -2,7 +2,11 @@
 {% block content %}
 {% load i18n %}
 {% get_current_language as lang %}
+
 <div class="row">
+        <div class="col-12 ctf-head">
+            <h1>{% trans "Beginner guide" %}</h1>
+        </div>
         {% block tools %}
                 {% include "./tools.html" %}
         {% endblock %}

src/resources/templates/resources/tools.html

@@ -1,10 +1,10 @@
 {% block content %}
 {% load i18n %}
 {% get_current_language as lang %}
-    <div class="col-sm-12">
+    <div class="col-12">
         <div class="ctf-block">
             <div class="ctf-head">
-            <center><h3>{% trans "Recommended Tools" %}</h3></center>
+                <h3>{% trans "Recommended Tools" %}</h3>
             </div>
             <div class="ctf-body">
                 {% trans "To get you started, we built a VM that you can simply import in" %} <a href="https://www.virtualbox.org/wiki/Downloads">Virtual Box</a> {% trans "with a bunch of useful tools." %}<br>

src/resources/urls.py

@@ -1,11 +1,16 @@
+from django.contrib.sitemaps.views import sitemap
 from django.urls import path
 from . import views
+from .sitemaps import StaticViewSitemap
 
 app_name = "resources"
-
+sitemaps = {
+    'static': StaticViewSitemap(),
+}
 urlpatterns = [
         path('about', views.about, name='about'),
         path('how-to-start', views.howToStart, name='howToStart'),
         path('contribute', views.contribute, name='contribute'),
         path('become-member', views.becomeMember, name='becomeMember'),
+        path('sitemap.xml', sitemap, {'sitemaps': sitemaps}, name='django.contrib.sitemaps.views.sitemap'),
 ]

src/scoreboard/templates/scoreboard/network.html

@@ -1,11 +1,42 @@
 {% extends 'base.html' %}
 {% load i18n %}
 {% block content %}
-{% load key_value %}
 <div class="row">
+  <div class="col-12 ctf-head">
+    <h1>{% trans "42Network Scoreboard" %}</h1>
+  </div>
+  <div class="col-12">
+    <div class="row justify-content-md-center justify-content-sm-center">
+      <div class="col-4 col-sm-3 col-md-2 podium podium-two text-center">
+        <img src="{{ top3.1.0.logo }}" alt="{{ top3.1.0 }}" width="100%"/>
+        <h3>#2 :</h3>
+        <p>
+          Score : {{ top3.1.1 }}
+          <br>
+          {{ top3.1.0 }}
+        </p>
+      </div>
+      <div class="col-4 col-sm-3 col-md-2 podium podium-one text-center">
+        <img src="{{ top3.0.0.logo }}" alt="{{ top3.0.0 }}" width="100%"/>
+        <h3>#1 : </h3>
+        <p>
+          Score : {{ top3.0.1 }}
+          <br>
+          {{ top3.0.0 }}
+        </p>
+      </div>
+      <div class="col-4 col-sm-3 col-md-2 podium podium-three text-center">
+        <img src="{{ top3.2.0.logo }}" alt="{{ top3.2.0 }}" width="100%"/>
+        <h3>#3 : </h3>
+        <p>
+          Score : {{ top3.2.1 }}
+          <br>
+          {{ top3.2.0 }}
+        </p>
+      </div>
+    </div>
+  </div>
   <div class="col-12">
-    <div>
-      <h4>Scoreboard</h4>
     <table class="table table-dark">
       <thead>
         <tr>
@@ -16,15 +47,16 @@
       </thead>
       <tbody>
         {% for name, score in scores.items %}
+          {% if forloop.counter0 > 2 %}
           <tr>
             <th scope="row"># {{ forloop.counter0|add:1 }}</th>
-            <th><a class="profile_link {{is_member}}" href="{% url 'scoreboard:campus' campus=name %}"> {{ name }}</a></th>
+            <th><a href="{% url 'scoreboard:campus' campus=name %}"> {{ name }}</a></th>
             <td>{{ score}}</td>
           </tr>
+          {% endif %}
         {% endfor %}
       </tbody>
     </table>
   </div>
 </div>
-</div>
 {% endblock %}

src/scoreboard/templates/scoreboard/scoreboard.html

@@ -3,9 +3,9 @@
 {% block content %}
 {% load is_member %}
 <div class="row">
-  <div class="col-12">
-    <div>
-      <h4>Scoreboard</h4>
+  <div class="col-12 ctf-head">
+    <h1>{% trans "Global Scoreboard" %}</h1>
+  </div>
   <table class="table table-dark">
     <thead>
       <tr>
@@ -39,6 +39,8 @@
       {% endfor %}
     </tbody>
   </table>
+  <div class="col-12">
+    <div>
 
       <div class="pagination">
         <span class="step-links">

src/scoreboard/views.py

@@ -1,6 +1,7 @@
 from django.shortcuts import render
 from django.core.paginator import Paginator
 from accounts.models import UserProfileInfo, Campus
+import itertools
 
 def scoreboard(request):
     scores      = UserProfileInfo.objects.filter(score__gt=0).select_related().order_by('-score', 'last_submission_date', 'user__username')
@@ -19,12 +20,12 @@ def campus(request, campus):
 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})
+    top3        = list(itertools.islice(sorted_scores.items(), 3))
+    return render(request, 'scoreboard/network.html', {'scores':sorted_scores, 'top3': top3})
 
 # Create your views here.

src/statics/css/style.css

@@ -88,9 +88,14 @@ pre {
   border: none;
 }
 
+.ctf-head h1 {
+  text-transform: uppercase;
+  font-size: 2em;
+}
+
 .ctf-block {
   background-color: #1d1d1d;
-  min-height: 30vh;
+  min-height: 35vh;
   padding: 30px;
   margin-bottom: 30px;
 }
@@ -308,3 +313,20 @@ footer {
   color: #a9a9a9;
   text-decoration: none;
 }
+
+.podium{
+  margin-top:80px;
+  margin-bottom:30px;
+  vertical-align: bottom;
+}
+.podium h3 {margin-top:-5%;}
+.podium img{position:relative;top: -55px}
+.podium-one{
+  background-color: #313131;
+  height: 25vh;}
+.podium-two{
+  background-color: #252525;
+  height: 20vh;margin-top:auto;}
+.podium-three{
+  background-color: #1a1a1a;
+  height: 15vh;margin-top:auto;}

src/templates/base.html

@@ -29,6 +29,8 @@
 	<meta property="twitter:description" content="42CTF is a cybersecurity challenges platform created by School 42 students.">
 	<meta property="twitter:image" content="{% static "img/42ctf_logo.png" %}">
 	
+	<link rel="canonical" href="https://www.42ctf.org/{{ request.path }}">
+
 	<meta name="Description" content="42CTF is a cybersecurity challenges platform created by School 42 students.">
 	<meta name="keywords" content="42, cybersécurité, cybersecurity, hack, hacking, challenge, solution, exercice, hacking challenge, hack challenge, exercice hack, exercice hacking, capture the flag, CTF, security, sécurité, Documentation,Applicatif,Cryptologie,Challenges,Outils,R&#233;seaux,CrackinWebW Client,Programmation,Cryptanaly,Application,Pr&#233;sentation,R&#233;seau,St&#233;ganographie,Web Serveur,Cracking,Classement,Challenges, Informatique,Capture The Flag,Forensic,Web," />
 </head>
@@ -63,7 +65,7 @@
 							{% 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:main' %}">{% trans "Global" %}</a>
 							<a class="dropdown-item" href="{% url 'scoreboard:network' %}">{% trans "42 Network" %}</a>
 						</div>
 					</li>
@@ -86,7 +88,7 @@
                         {% ismember request.user.userprofileinfo as is_member %}
 						{% if not is_member %}
 						<li class="nav-item">
-							<a class="nav-link nav-distinguish" href="{% url 'resources:becomeMember' %}">{% translate "Become a member" %}</a>
+							<a class="nav-link nav-distinguish text-center" href="{% url 'resources:becomeMember' %}">{% translate "Become a member" %}</a>
 						</li>
 						{% endif %}
 					<li class="nav-item dropdown">