Fix member conversion page UI and SEO upgrades #75

Merged
Danhia merged 4 commits from ix/website:main into main 2022-08-18 14:21:13 +02:00
26 changed files with 175 additions and 52 deletions
Showing only changes of commit dd7a69aa50 - Show all commits

26
src/ctfs/sitemaps.py Normal file
View File

@ -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})

View File

@ -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 %}

View File

@ -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>

View File

@ -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'),
]

24
src/events/sitemaps.py Normal file
View File

@ -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)

View File

@ -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>

View File

@ -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 %}

View File

@ -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 %}

View File

@ -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'),

12
src/home/sitemaps.py Normal file
View File

@ -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)

View File

@ -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>

View File

@ -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'),
]

View File

@ -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)

View File

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

12
src/resources/sitemaps.py Normal file
View File

@ -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)

View File

@ -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 %}

View File

@ -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>

View File

@ -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 %}

View File

@ -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>

View File

@ -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>

View File

@ -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 %}

View File

@ -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>

View File

@ -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'),
]

View File

@ -3,9 +3,11 @@
{% block content %}
{% load is_member %}
<div class="row">
<div class="col-12 ctf-head">
<h1>{% trans "Scoreboard" %}</h1>
</div>
<div class="col-12">
<div>
<h4>Scoreboard</h4>
<table class="table table-dark">
<thead>
<tr>

View File

@ -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;
}

View File

@ -80,7 +80,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">