From 86cc6070e138dc80edfb9c23c0e0e7b1480ef973 Mon Sep 17 00:00:00 2001 From: ix <0x00fi@protonmail.com> Date: Fri, 22 Oct 2021 11:45:50 +0200 Subject: [PATCH] Events done --- src/accounts/templates/accounts/login.html | 34 +++++------ src/events/templates/events/ctf_info.html | 44 +++++++++----- src/events/templates/events/event_info.html | 50 +++++++++------- src/events/templates/events/event_pwd.html | 20 ++++--- src/events/templates/events/events_list.html | 26 ++++---- src/events/views.py | 62 +++++++++++++++----- src/static/css/style.css | 37 +++++++++++- src/statics/css/style.css | 17 +++++- 8 files changed, 196 insertions(+), 94 deletions(-) diff --git a/src/accounts/templates/accounts/login.html b/src/accounts/templates/accounts/login.html index 8f82336..c3a5cba 100644 --- a/src/accounts/templates/accounts/login.html +++ b/src/accounts/templates/accounts/login.html @@ -8,28 +8,28 @@

Login

-
- {% if error %} - {% trans "Please, verify your infos." %} - {% endif %} -
- {% csrf_token %} -
-
-
- -
- {% trans "Reset password" %} -
-
+
+ {% if error %} + {% trans "Please, verify your infos." %} + {% endif %} +
+ {% csrf_token %} +
+
+
+ +
+ {% trans "Reset password" %} +
+
- +
diff --git a/src/events/templates/events/ctf_info.html b/src/events/templates/events/ctf_info.html index 08c1900..5095554 100644 --- a/src/events/templates/events/ctf_info.html +++ b/src/events/templates/events/ctf_info.html @@ -6,32 +6,46 @@
< Back to event
-

Event - {{ event.name }}

+

{% trans "Event" %} - {{ event.name }}

{{ ctf.name }}

{% trans "Published date" %} : {{ ctf.pub_date }}
{% if description %} - {{ description|safe }} + {{ description|safe }} {% else %} - {% trans "No translation available. Please try another language (English or French)." %} + {% trans "No translation available. Please try another language (English or French)." %} {% endif %}
{% if request.user.is_authenticated %} - {% if valitated == True %} -

{% trans "Congratulation !" %}

- {% elif alvalitated == True %} -

{% trans "Already flagged" %}

- {% if ctf.ctf_url %} - {% trans "Start the challenge" %}
- {% elif ctf.file %} - {% trans "Download" %}
- {% endif %} + + {% if subisover == True %} + {% trans "Subscriptions is over." %} + {% endif %} + {% if alreadyregistered == True %} + {% trans "You're already registered to this event." %} + {% endif %} + + {% if congrat == True %} +

{% trans "Congratulation !" %}

+ {% elif alreadyflag == True %} +

{% trans "Already flagged" %}

+ {% elif eventisover == True %} +

{% trans "This event is over." %}

+ {% elif errorform == True %} +

{% trans "Error while processing your request. (Invalid Form)" %}

+ {% elif notsub == True %} + {% trans "Error: you're not registered to this event, so you can't register scores, fucking logic." %} + {% if ctf.ctf_url %} + {% trans "Start the challenge" %}
+ {% elif ctf.file %} + {% trans "Download" %}
+ {% endif %} {% else %} - {% if failed %} -

{% trans "Wrong flag ! You can do it !" %}

- {% endif %} + {% if wrongflag == True %} +

{% trans "Wrong flag ! You can do it !" %}

+ {% endif %} {% if ctf.ctf_url %} {% trans "Start the challenge" %}
{% elif ctf.file %} diff --git a/src/events/templates/events/event_info.html b/src/events/templates/events/event_info.html index 5e6c20f..08ef96e 100644 --- a/src/events/templates/events/event_info.html +++ b/src/events/templates/events/event_info.html @@ -4,8 +4,14 @@ {% load is_flagged %}
-
-
+ {% if subisover == True %} + {% trans "Subscriptions is over." %} + {% endif %} + {% if alreadyregistered == True %} + {% trans "You're already registered to this event." %} + {% endif %} +
+

{{ event.name }}

{% if ended == True %} {% trans "This event is over." %} @@ -13,33 +19,33 @@ {% trans "This event start at" %} : {{ event.start_date }} {% endif %}
-
+
{% if event.description %} {{ event.description|safe }} {% endif %}
-
+
{% if begun == True %} -

{% trans "Challenges" %}

- -
+

{% trans "Challenges" %}

+ {% if ctfs %} - {% for ctf in ctfs %} -
- {% isflagged request.user ctf as flagged%} - -
-

{{ ctf.category }}

-

{{ ctf.name }} - {{ ctf.points }}

-
- +
+ {% for ctf in ctfs %} +
+ {% isflagged request.user ctf as flagged%} + +
+

{{ ctf.category }}

+

{{ ctf.name }} - {{ ctf.points }}

+
+ +
+ {% endfor %}
- {% endfor %} + {% else %} + {% trans "No challenges available." %} {% endif %} -
- {% if request.user.is_authenticated %} - - {% endif %} + {% else %}

{% trans "The event has not started yet." %}

@@ -72,7 +78,7 @@ {% else %} -

{% trans "Nobody have solved this CTF." %}

+

{% trans "No one have earn point yet, you gonna be the first ?" %}

{% endif %}
diff --git a/src/events/templates/events/event_pwd.html b/src/events/templates/events/event_pwd.html index 7eb6853..ce3d406 100644 --- a/src/events/templates/events/event_pwd.html +++ b/src/events/templates/events/event_pwd.html @@ -11,13 +11,19 @@
{% if logged == True %} -

{% trans "This event is password protected" %}

- {% trans "You need to submit the event password to gain access to this event." %} -
- {% csrf_token %} - - -
+ {% if wrongpwd == True %} + {% trans "Wrong password submited." %} + {% endif %} + {% if alreadyregistered == True %} + {% trans "You're already registered to this event." %} + {% endif %} +

{% trans "This event is password protected" %}

+ {% trans "You need to submit the event password to gain access to this event." %} +
+ {% csrf_token %} + + +
{% else %}

{% trans "You need to be logged to access this event." %}

{% endif %} diff --git a/src/events/templates/events/events_list.html b/src/events/templates/events/events_list.html index 5d355b8..8f69c2d 100755 --- a/src/events/templates/events/events_list.html +++ b/src/events/templates/events/events_list.html @@ -3,14 +3,10 @@ {% load i18n %}
-

Events

+

{% trans "Events" %}

{% if events %} {% for ev in events %} - {% if request.user.is_authenticated %} - - {% else %} - {% endif %} {% if curdate > ev.end_date %}
{% else %} @@ -23,17 +19,23 @@ alt="..." />
-
{{ ev.name }}
-

- Some quick example text to build on the card title and make up the bulk of the - card's content. -

+
+ {{ ev.name }} +
    -
  • {{ ev.start_date }}
    -
    {{ ev.end_date }}
    • +
  • + {{ ev.start_date }}
    -
    {{ ev.end_date }} +
    + {% if curdate > ev.end_date %} + Finished + {% else %} + Open + {% endif %} +
- See more + {% trans "See more" %}
diff --git a/src/events/views.py b/src/events/views.py index 3ffc009..7a0848a 100644 --- a/src/events/views.py +++ b/src/events/views.py @@ -27,17 +27,44 @@ def events(request): def chall_event_info(request, event_slug, chall_slug): event_info = get_object_or_404(Event, slug=event_slug) ctf_info = get_object_or_404(CTF, event__slug=event_info.slug, slug=chall_slug) + eventisover = False + alreadyflag = False + congrat = False + wrongflag = False + errorform = False + notsub = False if request.user.is_authenticated and not request.user.is_staff: userScore = Scores.objects.filter(event=event_info, user=request.user) if not userScore: return redirect('/') + if request.GET.get('EventIsOver'): + eventisover = True + if request.GET.get('AlreadyFlagged'): + alreadyflag = True + if request.GET.get('Congrat'): + congrat = True + if request.GET.get('WrongFlag'): + wrongflag = True + if request.GET.get('ErrorInForm'): + errorform = True + if request.GET.get('NotRegistered'): + notsub = True solved_list = CTF_flags.objects.filter(ctf=ctf_info).order_by('flag_date') description = get_description_by_lang(ctf_info) - return render(request, 'events/ctf_info.html', { 'ctf' : ctf_info, 'event':event_info, 'solved_list': solved_list, 'description': description}) + return render(request, 'events/ctf_info.html', { 'ctf' : ctf_info, 'event':event_info, 'solved_list': solved_list, 'description': description, 'eventisover': eventisover, 'alreadyflag': alreadyflag, 'congrat': congrat, 'wrongflag': wrongflag, 'errorform': errorform, 'notsub': notsub}) def event(request, event_slug): event_info = get_object_or_404(Event, slug=event_slug) IsRegistered = False + wrongpwd = False + alreadyregistered = False + subisover = False + if request.GET.get('WrongPassword'): + wrongpwd = True + if request.GET.get('AlreadyRegistered'): + alreadyregistered = True + if request.GET.get('SubscriptionIsOver'): + subisover = True if request.user.is_authenticated: userScore = Scores.objects.filter(event=event_info, user=request.user) if userScore: @@ -46,9 +73,9 @@ def event(request, event_slug): if request.user.is_authenticated: if request.user.is_staff is False: if not userScore: - return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True}) + return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered}) else: - return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': False}) + return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': False, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered}) ended = False if timezone.now() >= event_info.end_date: ended = True @@ -57,25 +84,25 @@ def event(request, event_slug): begun = True challenges = CTF.objects.filter(event=event_info).order_by('category', 'points') solved_list = Scores.objects.filter(event=event_info).order_by('-score', 'last_submission_date', 'user__username') - return render(request, 'events/event_info.html', {'event' : event_info, 'IsRegistered': IsRegistered, 'ctfs': challenges, 'solved_list':solved_list, 'ended': ended, 'begun': begun}) + return render(request, 'events/event_info.html', {'event' : event_info, 'IsRegistered': IsRegistered, 'ctfs': challenges, 'solved_list':solved_list, 'ended': ended, 'begun': begun, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'subisover': subisover}) @login_required def submit_event_flag(request, event_slug, chall_slug): ev = get_object_or_404(Event, slug=event_slug) response = redirect('events:event_chall_info', event_slug=event_slug, chall_slug=chall_slug) if timezone.now() >= ev.end_date: - response['Location'] += '?EventIsOver' + response['Location'] += '?EventIsOver=1' return response if request.method == 'POST': ctf_info = CTF.objects.get(event=ev, slug=chall_slug) if not ctf_info: - response['Location'] += '?ChallengeNotFound' + response['Location'] += '?ChallengeNotFound=1' return response flagged = False if CTF_flags.objects.filter(user=request.user, ctf=ctf_info): flagged = True - response['Location'] += '?AlreadyFlagged' + response['Location'] += '?AlreadyFlagged=1' return response try: score = Scores.objects.get(user=request.user, event=ev) @@ -90,14 +117,17 @@ def submit_event_flag(request, event_slug, chall_slug): score.last_submission_date = timezone.now() score.score += ctf_info.points score.save() - response['Location'] += '?Congrat' + response['Location'] += '?Congrat=1' return response else: - response['Location'] += '?WrongFlag' + response['Location'] += '?WrongFlag=1' return response else: - response['Location'] += '?ErrorInForm' + response['Location'] += '?ErrorInForm=1' return response + else: + response['Location'] += '?NotRegistered=1' + return response return response @login_required @@ -107,15 +137,15 @@ def submit_pwd(request, event_slug): if request.user.is_authenticated: ev = get_object_or_404(Event, slug=event_slug) if ev == False: - response['Location'] += '?NoEventFound' + response['Location'] += '?NoEventFound=1' return response if request.POST.get('password') != ev.password: - response['Location'] += '?WrongPassword' + response['Location'] += '?WrongPassword=1' return response if Scores.objects.filter(user=request.user, event=ev).exists(): - response['Location'] += '?AlreadyRegistered' + response['Location'] += '?AlreadyRegistered=1' return response else: new = Scores(user=request.user, event=ev, score=0) @@ -129,13 +159,13 @@ def subscribe_to_event(request, event_slug): if request.user.is_authenticated: ev = get_object_or_404(Event, slug=event_slug) if ev == False: - response['Location'] += '?NoEventFound' + response['Location'] += '?NoEventFound=1' return response if timezone.now() >= ev.end_date: - response['Location'] += '?SubscriptionIsOver' + response['Location'] += '?SubscriptionIsOver=1' return response if Scores.objects.filter(user=request.user, event=ev).exists(): - response['Location'] += '?AlreadyRegistered' + response['Location'] += '?AlreadyRegistered=1' return response else: new = Scores(user=request.user, event=ev, score=0) diff --git a/src/static/css/style.css b/src/static/css/style.css index 682df7c..b1a6087 100644 --- a/src/static/css/style.css +++ b/src/static/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;} @@ -27,6 +29,9 @@ pre {background-color: #000; color: #cecece; padding-left: 15px; font-weight: bo .ctf-body {margin-top: 50px;} .bloc-body {margin-top: 25px;} .ctf-footer {margin-top: 15px;text-align: center;} +.event-block{background-color: #1D1D1D; min-height: 235px; margin-bottom: 20px;} +.event-body {padding:15px;margin-top: 50px;} +.event-footer{margin-top: 15px;text-align: center; padding: 15px;} input[type=text], input[type=password], input[type=url], input[type=email] {transition: 0.2s;border: 2px solid #2d2d2d;background-color: #2d2d2d;padding: 3px; border-radius: 4px;} input[type=submit] {padding: 0px; margin-left: 5px; border-bottom: 3px solid #000;} .begin-ctf-link {display:inline-block;margin-bottom: 15px;text-align:center;text-transform: uppercase;text-decoration:none;font-weight: bold;color:#fff;background-color:#121212; width: 125px; border-bottom: 3px solid #000;padding:5px;} @@ -41,9 +46,35 @@ 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;color:#000} +.progress {background-color: #2d2d2d;} .bg-success { - background-color: #d9d9d9 !important; + background-color: #d9d9d9 !important;color: #000; } + +.event-card { + background-color: #1d1d1d; + min-height: 30vh; + 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%;} +.event-head{ + background-image: + linear-gradient(180deg, rgba(102,102,102,0.48501407398897056) 0%, rgba(29,29,29,1) 100%), + url('https://media.lesechos.com/api/v1/images/view/616957f83e45460bec299207/1280x720-webp/0611458970965-web-tete.webp'); + height: 20vh; + background-size: cover; + color: white; + padding: 20px; + padding-top: 40px; +} \ No newline at end of file diff --git a/src/statics/css/style.css b/src/statics/css/style.css index 307db14..b1a6087 100644 --- a/src/statics/css/style.css +++ b/src/statics/css/style.css @@ -29,6 +29,9 @@ pre {background-color: #000; color: #cecece; padding-left: 15px; font-weight: bo .ctf-body {margin-top: 50px;} .bloc-body {margin-top: 25px;} .ctf-footer {margin-top: 15px;text-align: center;} +.event-block{background-color: #1D1D1D; min-height: 235px; margin-bottom: 20px;} +.event-body {padding:15px;margin-top: 50px;} +.event-footer{margin-top: 15px;text-align: center; padding: 15px;} input[type=text], input[type=password], input[type=url], input[type=email] {transition: 0.2s;border: 2px solid #2d2d2d;background-color: #2d2d2d;padding: 3px; border-radius: 4px;} input[type=submit] {padding: 0px; margin-left: 5px; border-bottom: 3px solid #000;} .begin-ctf-link {display:inline-block;margin-bottom: 15px;text-align:center;text-transform: uppercase;text-decoration:none;font-weight: bold;color:#fff;background-color:#121212; width: 125px; border-bottom: 3px solid #000;padding:5px;} @@ -52,7 +55,7 @@ input[type=submit]:hover {background-color:#000} .event-card { background-color: #1d1d1d; - min-height: 50vh; + min-height: 30vh; margin-bottom: 13.37px; } .card-img-top{ @@ -64,4 +67,14 @@ input[type=submit]:hover {background-color:#000} border-radius: 2px; margin-bottom: 13.37px; } -.is-over {opacity: 50%;} \ No newline at end of file +.is-over {opacity: 50%;} +.event-head{ + background-image: + linear-gradient(180deg, rgba(102,102,102,0.48501407398897056) 0%, rgba(29,29,29,1) 100%), + url('https://media.lesechos.com/api/v1/images/view/616957f83e45460bec299207/1280x720-webp/0611458970965-web-tete.webp'); + height: 20vh; + background-size: cover; + color: white; + padding: 20px; + padding-top: 40px; +} \ No newline at end of file