.gitmodules

@@ -1,3 +0,0 @@
-[submodule "src/ctfs/templates/challenges"]
-	path = src/ctfs/templates/challenges
-	url = https://gitea.42ctf.org/42CTF/challenges-descriptions.git

README.md

@@ -1,34 +1,47 @@
-# 42CTF
-
-[42CTF](https://www.42ctf.org) is a CTF platform created by School 42 students and open to anyone.
-
+# 42ctf
+CTF by 42 students
 
 ### Todo
 
-TODO has been migrated to [issues](https://gitea.42ctf.org/42CTF/website/issues) !  
-And hopefully, it is not redirected anymore to `/dev/null`.
+- [x] Password reset
+- [x] Access solved challenges
+- [x] "Intro" section
+- [x] Profile edition
+- [x] Resources page
+- [x] Flags counter
+- [x] Graphs on profile page
+- [ ] Refacto the discord bot with OAuth
+- [x] Platform translation
+    - [x] French
+    - [ ] Russian
+    - [x] Spanish
+    - [ ] Italian
+    - [x] German
+- [ ] OAuth 42
+    - [ ] 42 Network leaderboard
+- [ ] Possibility for users to propose solution to challenges
+- [ ] Badges/achievments on profile pages
+- [x] Dynamic scoring
 
-### How to contribute ?
+#### Event feature
 
-First, you need to contact a 42CTF admin to get an account on the 42CTF gitea.  
-You can contact us on [discord](https://discord.gg/3KDvt6hbWW) or by [email](mailto:42ctf@protonmail.com).  
-You can also fill this [form](https://forms.42l.fr/apps/forms/bpmyGR37AR4yHGnC) and we'll contact you.  
-Then, once you have a gitea account, you can fork this repository, do some stuff, and open a pull request.
-
-If you want to translate the platform, then have a look at the [wiki](https://gitea.42ctf.org/42CTF/website/wiki).
-
-If you want to help with bot development, it has now its own [repository](https://gitea.42ctf.org/42CTF/bot)
-
-### How to set up my dev environment ?
-
-There is only one file missing on this repository for you to run the server: `local_settings.py`.  
-You should create one in the `src` directory, with the following content:
-```
-DEBUG = True
-SECRET_KEY = 'what you want'
-```
-
-When you'll run `python manage.py migrate` then `python manage.py runserver`, an empty database will be automatically created.  
-The `local_settings.py` is in the `.gitignore` and should stay that way, so we don't accidentally overwrite the production file when we deploy.
-
-To obtain administrator rights you can run `python manage.py createsuperuser`.
+- [X] make scoreboard for events
+- [X] make access mod for events :
+    - [X] Sub button for public events
+    - [X] Access by password
+    - [X] Begin date for display challenges
+    - [X] Ending date for stop flag submission
+    - [ ] Access by invite link
+- [X] Admin rights
+    - [X] Admin can access to events pages without password
+    - [X] Admin can subscribe to event without password
+- [X] process flag submission
+    - [X] increment user score in Scores model
+- [X] add filters for admin dashboard
+- [X] add search in fields in admin dashboard
+- [X] Smooth display of events listing
+- [X] Event info page with background and noice display
+- [x] Create teams for events
+    - [x] Create/join team
+    - [x] Manage team: change password / leave team
+- [ ] Dynamic scoring for events 

requirements.txt

@@ -1,3 +1,3 @@
-Django==3.2.11
-requests==2.27.1
-authlib==0.15.5
+Django
+requests
+authlib

src/ctfs/migrations/0008_auto_20220215_1713.py

@@ -1,26 +0,0 @@
-# Generated by Django 3.2.11 on 2022-02-15 16:13
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('ctfs', '0007_ctf_disabled'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='ctf',
-            name='description_de',
-        ),
-        migrations.RemoveField(
-            model_name='ctf',
-            name='description_ru',
-        ),
-        migrations.AddField(
-            model_name='ctf',
-            name='port',
-            field=models.PositiveSmallIntegerField(blank=True, null=True),
-        ),
-    ]

src/ctfs/models.py

@@ -15,9 +15,10 @@ class CTF(models.Model):
     disabled    =   models.BooleanField(default=False)
     description =   models.TextField(blank=True)
     description_en =   models.TextField(blank=True)
+    description_ru =   models.TextField(blank=True)
+    description_de =   models.TextField(blank=True)
     file        =   models.FileField(blank=True, upload_to='challenges')
     ctf_url     =   models.URLField(blank=True)
-    port        =   models.PositiveSmallIntegerField(null=True, blank=True)
     event       =   models.ForeignKey(Event, null=True, blank=True, on_delete=models.CASCADE)
     points      =   models.PositiveSmallIntegerField()
     slug        =   models.SlugField(max_length=55)

src/ctfs/templates/challenges

@@ -1 +0,0 @@
-Subproject commit 18fac3978d21dc824bcffa2bc960aa2bf6b4abd9

src/ctfs/templates/ctfs/ctf_info.html

@@ -2,8 +2,6 @@
 {% block content %}
 {% load i18n %}
 {% load is_member %}
-{% load get_chall %}
-{% get_current_language as lang %}
 <div class="row">
   <div class="col-sm-12 col-md-9">
     <div class="ctf-block">
@@ -17,11 +15,11 @@
       </div>
       {% else %}
       <div class="ctf-body">
-        {% get_chall_by_lang ctf lang as content %}
-        {{ content | safe }}
-        <!-- {% if ctf.port %}
-          <b>nc challenges.42ctf.org {{ ctf.port }}</b>
-        {% endif %} -->
+        {% if description %}
+        {{ description|safe }}
+        {% else %}
+        {% trans "No translation available. Please try another language (English or French)." %}
+        {% endif %}
       </div>
       <div class="ctf-footer">
         {% if request.user.is_authenticated %}

src/ctfs/templatetags/get_chall.py

@@ -1,14 +0,0 @@
-from django import template
-
-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()
-	except:
-		return chall.description_en

src/events/migrations/0009_auto_20220215_1706.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.2.11 on 2022-02-15 16:06
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('events', '0008_event_dynamic'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='eventplayer',
-            name='id',
-            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
-        ),
-        migrations.AlterField(
-            model_name='team',
-            name='id',
-            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
-        ),
-    ]