{% trans "Solved by" %}
- {% if solved_list %} -| {% trans "Username" %} | -{% trans "Website" %} | -{% trans "Score" %} | -{% trans "Date" %} | +{% trans "Username" %} | +{% trans "Website" %} | +{% trans "Score" %} | +{% trans "Date" %} |
|---|---|---|---|---|---|---|---|
| {{ s.user.username }} | -{{ s.user.userprofileinfo.portfolio_site }} | -{{ s.user.userprofileinfo.score }} | -{{ s.flag_date }} | + {% for s in solved_list %} +||||
| {{ s.user.username }} | +{{ s.user.userprofileinfo.portfolio_site }} | +{{ s.user.userprofileinfo.score }} | +{{ s.flag_date }} |
{% trans "Nobody have solved this CTF." %}
- {% endif %} + {% else %} +{% trans "Nobody have solved this CTF." %}
+ {% endif %} {% endblock %} diff --git a/src/ctfs/views.py b/src/ctfs/views.py index 0b0c1b3..7f15c08 100644 --- a/src/ctfs/views.py +++ b/src/ctfs/views.py @@ -21,10 +21,10 @@ def get_description_by_lang(ctf): def category(request, cat_slug): cat = get_object_or_404(Category, slug=cat_slug) - ctfs = CTF.objects.filter(category=cat).order_by('points') + ctfs = CTF.objects.filter(category=cat, event=None).order_by('points') for ex in ctfs: - ex.solved_num = CTF_flags.objects.filter(ctf=ex).count() - ex.solved = ex.solved_by(request.user) + ex.solved_num = CTF_flags.objects.filter(ctf=ex).count() + ex.solved = ex.solved_by(request.user) return render(request, 'ctfs/ctfs_list.html', {'ctfs' : ctfs, 'cat' : cat}) def ctf(request, cat_slug, ctf_slug): @@ -46,18 +46,12 @@ def ctf(request, cat_slug, ctf_slug): profil.last_submission_date = timezone.now() profil.score += ctf_info.points profil.save() - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'valitated': True, 'description': description}) + return render(request, 'ctfs/ctf_info.html', { 'ctf' : ctf_info, 'solved_list': solved_list, 'valitated': True, 'description': description}) else: - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'failed': True, 'description': description}) + return render(request, 'ctfs/ctf_info.html', { 'ctf' : ctf_info, 'solved_list': solved_list, 'failed': True, 'description': description}) else: - form = submit_flag() - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'alvalitated': True, 'description': description}) + return render(request, 'ctfs/ctf_info.html', { 'ctf' : ctf_info, 'solved_list': solved_list, 'alvalitated': True, 'description': description}) else: - form = submit_flag() - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'description': description}) + return render(request, 'ctfs/ctf_info.html', { 'ctf' : ctf_info, 'solved_list': solved_list, 'description': description}) else: - form = submit_flag() - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'alvalitated': flagged, 'description': description}) - - -# Create your views here. + return render(request, 'ctfs/ctf_info.html', { 'ctf' : ctf_info, 'solved_list': solved_list, 'alvalitated': flagged, 'description': description}) diff --git a/src/events/__init__.py b/src/events/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/events/admin.py b/src/events/admin.py new file mode 100644 index 0000000..77ae37b --- /dev/null +++ b/src/events/admin.py @@ -0,0 +1,23 @@ +from django.contrib import admin +from .models import Event, Scores + +#admin.site.register(Event) +#admin.site.register(Scores) + +@admin.register(Event) +class event(admin.ModelAdmin): + #list display + list_display = ['name', 'start_date', 'end_date'] + # search list + search_fields = ['name', 'slug', 'description', 'password'] + +@admin.register(Scores) +class score(admin.ModelAdmin): + #list display + list_display = ['user', 'event', 'score'] + #list Filter + list_filter = ('event',) + # search list + search_fields = ['user__username', 'score', 'event__name'] + +# Register your models here. diff --git a/src/events/apps.py b/src/events/apps.py new file mode 100644 index 0000000..20f48f2 --- /dev/null +++ b/src/events/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class EventsConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'events' diff --git a/src/events/forms.py b/src/events/forms.py new file mode 100644 index 0000000..acdc47e --- /dev/null +++ b/src/events/forms.py @@ -0,0 +1,4 @@ +from django import forms + +class submit_flag(forms.Form): + flag = forms.CharField(label="Flag", max_length=100) diff --git a/src/events/migrations/0001_initial.py b/src/events/migrations/0001_initial.py new file mode 100644 index 0000000..84126c6 --- /dev/null +++ b/src/events/migrations/0001_initial.py @@ -0,0 +1,46 @@ +# Generated by Django 3.2.7 on 2021-10-18 14:19 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone +import uuid + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Event', + fields=[ + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ('name', models.CharField(max_length=200)), + ('logo', models.CharField(max_length=200)), + ('img', models.CharField(max_length=200)), + ('description', models.TextField()), + ('start_date', models.DateTimeField()), + ('end_date', models.DateTimeField()), + ('password', models.CharField(max_length=200)), + ('slug', models.SlugField(max_length=55)), + ], + ), + migrations.CreateModel( + name='Scores', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('score', models.PositiveIntegerField(db_index=True, default=0)), + ('last_submission_date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Last Submission Date')), + ('event', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='events.event')), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'ordering': ['-score', 'last_submission_date', 'user__username'], + }, + ), + ] diff --git a/src/events/migrations/0002_alter_event_password.py b/src/events/migrations/0002_alter_event_password.py new file mode 100644 index 0000000..3216874 --- /dev/null +++ b/src/events/migrations/0002_alter_event_password.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.7 on 2021-10-18 14:43 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='event', + name='password', + field=models.CharField(blank=True, max_length=200), + ), + ] diff --git a/src/events/migrations/0003_auto_20211019_1519.py b/src/events/migrations/0003_auto_20211019_1519.py new file mode 100644 index 0000000..3ee71f7 --- /dev/null +++ b/src/events/migrations/0003_auto_20211019_1519.py @@ -0,0 +1,26 @@ +# Generated by Django 3.2.7 on 2021-10-19 15:19 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('events', '0002_alter_event_password'), + ] + + operations = [ + migrations.AlterField( + model_name='scores', + name='event', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='events.event'), + ), + migrations.AlterField( + model_name='scores', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/src/events/migrations/__init__.py b/src/events/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/events/models.py b/src/events/models.py new file mode 100644 index 0000000..ea8edea --- /dev/null +++ b/src/events/models.py @@ -0,0 +1,26 @@ +from django.db import models +from django.contrib.auth.models import User +from django.contrib.auth.models import timezone +import uuid + +# Create your models here. +class Event(models.Model): + id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) + name = models.CharField(max_length=200) + logo = models.CharField(max_length=200) + img = models.CharField(max_length=200) + description = models.TextField() + start_date = models.DateTimeField() + end_date = models.DateTimeField() + password = models.CharField(max_length=200, blank=True) + slug = models.SlugField(max_length=55) + def __str__(self): + return self.name + +class Scores(models.Model): + user = models.ForeignKey(User, on_delete=models.CASCADE) + event = models.ForeignKey(Event, on_delete=models.CASCADE) + score = models.PositiveIntegerField(default=0, db_index=True) + last_submission_date = models.DateTimeField('Last Submission Date', default=timezone.now) + class Meta: + ordering = ['-score', 'last_submission_date', 'user__username'] \ No newline at end of file diff --git a/src/events/templates/events/ctf_info.html b/src/events/templates/events/ctf_info.html new file mode 100644 index 0000000..08c1900 --- /dev/null +++ b/src/events/templates/events/ctf_info.html @@ -0,0 +1,87 @@ +{% extends 'base.html' %} +{% block content %} +{% load i18n %} +
+
+{% endblock %}
+
diff --git a/src/events/templates/events/event_info.html b/src/events/templates/events/event_info.html
new file mode 100644
index 0000000..5e6c20f
--- /dev/null
+++ b/src/events/templates/events/event_info.html
@@ -0,0 +1,96 @@
+{% extends 'base.html' %}
+{% block content %}
+{% load i18n %}
+{% load is_flagged %}
+
+
+
+
+ < Back to event
+
+
+
+ Event - {{ event.name }}
+{{ ctf.name }}
+ {% trans "Published date" %} : {{ ctf.pub_date }} +
+ {% if description %}
+ {{ description|safe }}
+ {% else %}
+ {% trans "No translation available. Please try another language (English or French)." %}
+ {% endif %}
+
+
+
+
+
+
+ {% else %}
+
+ {% trans "Solved by" %}
+ {% if solved_list %} +| {% trans "Username" %} | +{% trans "Website" %} | +{% trans "Score" %} | +{% trans "Date" %} | +
|---|---|---|---|
| {{ s.user.username }} | +{{ s.user.userprofileinfo.portfolio_site }} | +{{ s.user.userprofileinfo.score }} | +{{ s.flag_date }} | +
{% trans "Nobody have solved this CTF." %}
+ {% endif %} +
+
+{% endblock %}
+
diff --git a/src/events/templates/events/event_pwd.html b/src/events/templates/events/event_pwd.html
new file mode 100644
index 0000000..7eb6853
--- /dev/null
+++ b/src/events/templates/events/event_pwd.html
@@ -0,0 +1,37 @@
+{% extends 'base.html' %}
+{% block content %}
+{% load i18n %}
+
+
+
+
+
+
+
+ {{ event.name }}
+ {% if ended == True %} + {% trans "This event is over." %} + {% else %} + {% trans "This event start at" %} : {{ event.start_date }} + {% endif %} +
+ {% if event.description %}
+ {{ event.description|safe }}
+ {% endif %}
+
+
+
+
+
+
+ {% else %}
+
+ {% trans "ScoreBoard" %}
+ {% if solved_list %} +| {% trans "Rank" %} | +{% trans "Username" %} | +{% trans "Website" %} | +{% trans "Score" %} | +
|---|---|---|---|
| # {{ forloop.counter0|add:1 }} | ++ {{ s.user.username }} + | +{{ s.user.userprofileinfo.site }} | +{{ s.score }} | +
{% trans "Nobody have solved this CTF." %}
+ {% endif %} +
+
+{% endblock %}
+
diff --git a/src/events/templates/events/events_list.html b/src/events/templates/events/events_list.html
new file mode 100755
index 0000000..5d355b8
--- /dev/null
+++ b/src/events/templates/events/events_list.html
@@ -0,0 +1,47 @@
+{% extends 'base.html' %}
+{% block content %}
+{% load i18n %}
+
+
+
+
+
+
+
+
+
+ {{ event.name }}
+ {% trans "This event start at" %} : {{ event.start_date }} +
+
+{% endblock %}
diff --git a/src/events/templatetags/__init__.py b/src/events/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/events/templatetags/is_flagged.py b/src/events/templatetags/is_flagged.py
new file mode 100644
index 0000000..259ac90
--- /dev/null
+++ b/src/events/templatetags/is_flagged.py
@@ -0,0 +1,10 @@
+from django import template
+from ctfs.models import CTF_flags
+
+register = template.Library()
+
+@register.simple_tag
+def isflagged(user, ctf):
+ if CTF_flags.objects.filter(user=user, ctf=ctf):
+ return "success-msg"
+ return ""
diff --git a/src/events/tests.py b/src/events/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/src/events/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/src/events/urls.py b/src/events/urls.py
new file mode 100644
index 0000000..1f8d495
--- /dev/null
+++ b/src/events/urls.py
@@ -0,0 +1,13 @@
+from django.urls import path
+from . import views
+
+app_name = "events"
+
+urlpatterns = [
+ path('', views.events, name='events'),
+ path('
+
+ {% if events %}
+ {% for ev in events %}
+ {% if request.user.is_authenticated %}
+
+ {% else %}
+ {% endif %}
+ {% if curdate > ev.end_date %}
+ Events
+
+ {% else %}
+
+
+
+ {% endif %}
+
+ {% endfor %}
+ {% else %}
+
+ 
+
+
+
+ {{ ev.name }}
++ Some quick example text to build on the card title and make up the bulk of the + card's content. +
+-
+
- {{ ev.start_date }}
-
{{ ev.end_date }}
+
+ See more
+
+ {% trans "No events available." %}
+ {% endif %} +Scoreboard
-| {% trans "Rank" %} | +{% trans "Rank" %} | {% trans "Username" %} | {% trans "Website" %} | {% trans "Score" %} |
|---|---|---|---|---|
| # {{ forloop.counter0|add:scores.start_index }} | -{{ s.user.username }} | -- {% if s.user.userprofileinfo.portfolio_site %} - {{ s.user.userprofileinfo.portfolio_site }} - {% endif %} - | -{{ s.user.userprofileinfo.score }} | + {% for s in scores %} +|
| # {{ forloop.counter0|add:scores.start_index }} | +{{ s.user.username }} | ++ {% if s.user.userprofileinfo.portfolio_site %} + {{ s.user.userprofileinfo.portfolio_site }} + {% endif %} + | +{{ s.user.userprofileinfo.score }} |
-
- {% if scores.has_previous %}
- « {% trans "First" %}
- {% trans "Previous" %}
- {% endif %}
-
-
+
+
+
+
+
{% endblock %}
diff --git a/src/static/css/style.css b/src/static/css/style.css
index f9577d4..682df7c 100644
--- a/src/static/css/style.css
+++ b/src/static/css/style.css
@@ -46,4 +46,4 @@ input[type=submit]:hover {background-color:#000}
.progress {background-color: #2d2d2d;color:#000}
.bg-success {
background-color: #d9d9d9 !important;
-}
\ No newline at end of file
+}
diff --git a/src/statics/css/style.css b/src/statics/css/style.css
index bc5bc77..307db14 100644
--- a/src/statics/css/style.css
+++ b/src/statics/css/style.css
@@ -1,5 +1,7 @@
body {background-color: #121212;color: #D9D9D9}
.card-body {background-color: #1D1D1D;}
+a{color:#cecece;}
+a:hover{color:#a9a9a9;text-decoration: none;}
.main-div{margin-top: 40px;}
footer {text-align: center;}
.news-card {margin-bottom: 20px; border: none;}
@@ -41,9 +43,25 @@ input[type=submit]:hover {background-color:#000}
.submitflag-form input[type=submit]:hover {background-color:#000}
.edit-infos-grp input{width: 100%;}
.message {display: block; padding:5px; text-align:center;margin-bottom: 10px;}
-.success-msg {background-color: #42b35e4f;}
+.success-msg {background-color: #42b35e4f!important;}
.error-msg {background-color: #9542428c;}
.progress {background-color: #2d2d2d;}
.bg-success {
background-color: #d9d9d9 !important;color: #000;
-}
\ No newline at end of file
+}
+
+.event-card {
+ background-color: #1d1d1d;
+ min-height: 50vh;
+ margin-bottom: 13.37px;
+}
+.card-img-top{
+ height:150px;
+}
+.chall-card{
+ background-color: #131313;
+ min-height: 100px;
+ border-radius: 2px;
+ margin-bottom: 13.37px;
+}
+.is-over {opacity: 50%;}
\ No newline at end of file
diff --git a/src/templates/base.html b/src/templates/base.html
index b9b5012..1d80305 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -2,89 +2,93 @@
{% load i18n %}
-
-
-
-
-
-
-
-
+
+ {% if scores.has_previous %}
+ « {% trans "First" %}
+ {% trans "Previous" %}
+ {% endif %}
+
+
{% trans "Page "%} {{ scores.number }} / {{ scores.paginator.num_pages }}.
+
+
+ {% if scores.has_next %}
+ {% trans "Next" %}
+ {% trans "Last" %}»
+ {% endif %}
-
- {% if scores.has_next %}
- {% trans "Next" %}
- {% trans "Last" %}»
- {% endif %}
-
-
-
-