From 5cf5b3d2c8f34db968b99f80f2df2dfbf084461d Mon Sep 17 00:00:00 2001 From: Rushil Umaretiya Date: Mon, 20 Sep 2021 10:00:29 -0400 Subject: [PATCH] fix: fixed cosmetic bugs, removed footer, and added support page --- hunt/apps/main/urls.py | 1 + hunt/apps/main/views.py | 5 +- hunt/templates/base_with_nav.html | 106 ++++++++++++++++++------------ hunt/templates/main/support.html | 44 +++++++++++++ 4 files changed, 113 insertions(+), 43 deletions(-) create mode 100644 hunt/templates/main/support.html diff --git a/hunt/apps/main/urls.py b/hunt/apps/main/urls.py index 2298a1c..2d816ea 100644 --- a/hunt/apps/main/urls.py +++ b/hunt/apps/main/urls.py @@ -8,5 +8,6 @@ urlpatterns = [ path("", views.index, name="index"), path("overview/", views.overview, name="overview"), path("validate/", views.validate_flag, name="validate_flag"), + path("support/", views.support, name="support"), path("challenge/", views.challenge_detail, name="challenge_detail") ] \ No newline at end of file diff --git a/hunt/apps/main/views.py b/hunt/apps/main/views.py index f4180d7..e1dda6a 100644 --- a/hunt/apps/main/views.py +++ b/hunt/apps/main/views.py @@ -74,4 +74,7 @@ def validate_flag(request): return JsonResponse(response) else: return PermissionDenied - \ No newline at end of file + +@login_required +def support(request): + return render(request, 'main/support.html') \ No newline at end of file diff --git a/hunt/templates/base_with_nav.html b/hunt/templates/base_with_nav.html index 2c930a1..4076131 100644 --- a/hunt/templates/base_with_nav.html +++ b/hunt/templates/base_with_nav.html @@ -1,43 +1,65 @@ -{% extends 'base.html' %} - -{% load static %} - -{% block root %} -
-
-
- - -

Hoco Hunt 2021

- -
-
-
-
- -
    - {% if user.is_authenticated %} -

  • {{ user.username }}

    • -

  • Overview

    • - {% if user.is_participant %} -

  • Challenges

    • - {% endif %} -

  • Logout

    • - {% else %} -

  • Login

    • - {% endif %} -
-
-
cd -
- - - {% block main %}{% endblock %} -
- This application was developed by Lauren Delwiche (2022) and Rushil Umaretiya (2023). -
+{% extends 'base.html' %} {% load static %} {% block root %} +
+
+
+ + +

Hoco Hunt 2021

+
-{% endblock %} \ No newline at end of file +
+
+
+ +
    + {% if user.is_authenticated %} +

  • {{ user.username }}

    • +
  • +

    Overview

     +
    • + {% if user.is_participant %} +
  • +

    Challenges

     +
    • + {% endif %} +
  • +

    Support

     +
    • +
  • +

    Logout

     +
    • + {% else %} +
  • +

    Login

     +
    • + {% endif %} +
+
+
+
+ + + {% block main %}{% endblock %} +
+{% endblock %} diff --git a/hunt/templates/main/support.html b/hunt/templates/main/support.html new file mode 100644 index 0000000..d2db881 --- /dev/null +++ b/hunt/templates/main/support.html @@ -0,0 +1,44 @@ +{% extends 'base_with_nav.html' %} {% load static %} {% block main %} + + +
+

Looks like you need some help!

+
+

How does this work?

+

+ This year's scavenger hunt features a CTF-style challenge setup, where + there are a multitude of different problems that students will take online + and in person to find and solve. Once you solve a problem correctly, it + will solve it for your entire class, so make sure somebody in your class + hasn't already solved a problem that you want to work on. Besides that, + read problems, collect codes, and grab points! +

+
+
+

How do I submit a challenge?

+

+ Each challenge will result in a flag, or a code, you can submit these on + the "Challenges" tab under the top right dropdown. +

+
+
+

How do I know if I've got it right? Is the website just wrong?

+

+ There is a single flag for every problem, and the formatting will be + consistent for every problem. If you have a strong inclination that you + have the correct answer and our website is incorrect, feel free to reach + out to our organizers. +

+
+
+

Who's organizing this thing?

+

+ This year's Scavenger Hunt is hosted by the TJ SGA and organized by Rushil + Umaretiya (2023), Lauren Delwiche (2022), Angela Sidhu (2023), and Aidan + Ludwig (2023). Feel free to reach out to our organizers, SGA, or your + class officers if you have any further questions! Good luck! +

+
+
+{% endblock %}