From 4b292536ff2e63c7fed5e809044a1c98518e164e Mon Sep 17 00:00:00 2001 From: Kenan Wright Date: Thu, 20 Feb 2025 11:00:43 +0000 Subject: [PATCH 1/5] Add modal that askes user to confirm commitment on registration --- .../templates/hackathon/hackathon_view.html | 542 +++++++++--------- 1 file changed, 279 insertions(+), 263 deletions(-) diff --git a/hackathon/templates/hackathon/hackathon_view.html b/hackathon/templates/hackathon/hackathon_view.html index 7fa1418..c66da11 100644 --- a/hackathon/templates/hackathon/hackathon_view.html +++ b/hackathon/templates/hackathon/hackathon_view.html @@ -9,292 +9,308 @@ {% block content %} - -
-
- -
-
-
- {% with authorised_types='FACILITATOR_ADMIN,PARTNER_ADMIN' %} - {% if hackathon.hackathon_image %} - - {% else %} - - {% endif %} - {% if request.user.user_type|is_type:"SUPERUSER" %} - - {% elif hackathon.created_by == request.user and request.user.user_type|is_types:authorised_types %} - - {% endif %} - {% endwith %} -
+
+
+
+
+
+ {% with authorised_types='FACILITATOR_ADMIN,PARTNER_ADMIN' %} + {% if hackathon.hackathon_image %} + + {% else %} + + {% endif %} + {% if request.user.user_type|is_type:"SUPERUSER" %} + + {% elif hackathon.created_by == request.user and request.user.user_type|is_types:authorised_types %} + + {% endif %} + {% endwith %}
+
- {% with authorised_types='SUPERUSER,STAFF,FACILITATOR_ADMIN,FACILITATOR_JUDGE,PARTNER_ADMIN,PARTNER_JUDGE' %} - -
-
- {% if request.user.user_type|is_types:authorised_types %} -
- - + {% with authorised_types='SUPERUSER,STAFF,FACILITATOR_ADMIN,FACILITATOR_JUDGE,PARTNER_ADMIN,PARTNER_JUDGE' %} +
+
+ {% if request.user.user_type|is_types:authorised_types %} +
+ + - - {% include 'hackathon/includes/judge_team_display.html' %} +
+ {% include 'hackathon/includes/judge_team_display.html' %} + {% else %} + {% with is_blocked=request.user|user_is_blocked:hackathon %} + {% if not is_blocked %} + {% if user in hackathon.participants.all %} + {% include 'hackathon/includes/enrollpart.html' %} {% else %} - {% with is_blocked=request.user|user_is_blocked:hackathon %} - {% if not is_blocked %} - {% include 'hackathon/includes/enrollpart.html' %} - {% else %} -

Because you dropped off from the last hackathon you will not be allowed to register for this hackathon. If you believe this is a mistake, - please contact the community team on Slack.
- Make sure to read the Hackathon Code of Conduct.

- {% endif %} - {% endwith %} + + + {% endif %} -
+ {% else %} +

Because you dropped off from the last hackathon you will not be allowed to register for this hackathon. If you believe this is a mistake, please contact the community team on Slack.
+ Make sure to read the Hackathon Code of Conduct. +

+ {% endif %} + {% endwith %} + {% endif %}
+
-
-
- -
-
-

Theme: {{ hackathon.theme }}

- {% if request.user.user_type|is_types:authorised_types %} -

Status: {{ hackathon.status }}

-

Organiser: {{ hackathon.organiser }}

-

- Participants: {{ hackathon.participants.all|length }} / Teams: {{ hackathon.teams.all|length }}

-

-

- Max Participants: {% if hackathon.max_participants %}{{ hackathon.max_participants }}{% else %}Unlimited{% endif %} - {% if hackathon.max_participants_reached %}(Max Reached){% endif %} -

- {% else %} -

Status: - {{hackathon.status|prettify_status:hackathon.max_participants_reached}}

- {% endif %} -

Start: {{ hackathon.start_date }}

-

End: {{ hackathon.end_date }}

- -

Organisation: {{ hackathon.organisation }}

- {% if hackathon.badge_url %} -

hackathon badge

- {% else %} -

hackathon badge

- {% endif %} -
+
+
+
+
+

Theme: {{ hackathon.theme }}

+ {% if request.user.user_type|is_types:authorised_types %} +

Status: {{ hackathon.status }}

+

Organiser: {{ hackathon.organiser }}

+

+ Participants: {{ hackathon.participants.all|length }} / Teams: {{ hackathon.teams.all|length }} +

+

+ Max Participants: {% if hackathon.max_participants %}{{ hackathon.max_participants }}{% else %}Unlimited{% endif %} + {% if hackathon.max_participants_reached %}(Max Reached){% endif %} +

+ {% else %} +

Status: {{hackathon.status|prettify_status:hackathon.max_participants_reached}}

+ {% endif %} +

Start: {{ hackathon.start_date }}

+

End: {{ hackathon.end_date }}

+

Organisation: {{ hackathon.organisation }}

+ {% if hackathon.badge_url %} +

hackathon badge

+ {% else %} +

hackathon badge

+ {% endif %}
-
- + {% endwith %}
-
-

{{ hackathon.display_name }} #{{ hackathon.id }}

-
-
- {{ hackathon.description|safe|linebreaks }} -
+
+
+

{{ hackathon.display_name }} #{{ hackathon.id }}

+
+
+ {{ hackathon.description|safe|linebreaks }}
- - {% if hackathon.events.first %} -
-
-
- - -
+
+ + {% if hackathon.events.first %} +
+
+
+ +
- {% endif %} -

Teams:

- - {% if request.user.user_type|is_types:authorised_types or hackathon.status in 'hack_in_progress, judging, finished' %} -
- {% if teams %} - {% for team in teams %} -
-
-
-
- -

- {{ team }} -

- -
-
-

Team members:

- {% for participant in team.participants.get_queryset %} -

- - {{ participant.slack_display_name }} -

- {% endfor %} -
- - {% if user in hackathon.participants.all %} - {% if user in team.participants.get_queryset %} -
- {% if hackathon.status == 'hack_in_progress' %} - Edit Project - {% endif %} -
- {% endif %} - {% elif user in hackathon.judges.all %} - {% if hackathon.status == 'hack_in_progress' or hackathon.status == 'judging' %} -
- Edit Scores -

{% if not team.project %}No project submitted yet.{% endif %}

-
- {% endif %} +
+ {% endif %} +

Teams:

+ {% if request.user.user_type|is_types:authorised_types or hackathon.status in 'hack_in_progress, judging, finished' %} +
+ {% if teams %} + {% for team in teams %} +
+
+
+
+ +

+ {{ team }} +

+ +
+
+

Team members:

+ {% for participant in team.participants.get_queryset %} +

+ + {{ participant.slack_display_name }} +

+ {% endfor %} +
+ + {% if user in hackathon.participants.all %} + {% if user in team.participants.get_queryset %} +
+ {% if hackathon.status == 'hack_in_progress' %} + Edit Project {% endif %}
+ {% endif %} + {% elif user in hackathon.judges.all %} + {% if hackathon.status == 'hack_in_progress' or hackathon.status == 'judging' %} +
+ Edit Scores +

{% if not team.project %}No project submitted yet.{% endif %}

+
+ {% endif %} + {% endif %}
- {% endfor %} - {% else %} -
-

Teams have not been distributed yet.

-
- {% endif %} -
- -
-
- {% include 'hackathon/includes/paginator.html' with page_obj=teams %} -
+ {% endfor %} {% else %} -
-
-

Teams have not been distributed yet.

-
+
+

Teams have not been distributed yet.

{% endif %} -
-
- - - + - - {% endwith %} - {% include 'upload_image.html' %} - {% include 'hackathon/includes/change_status.html' %} -{% endblock %} + }); + + +{% include 'upload_image.html' %} +{% include 'hackathon/includes/change_status.html' %} +{% endblock %} \ No newline at end of file From 204cb43a069823d18833fa02b14c2388f80b62f8 Mon Sep 17 00:00:00 2001 From: Kenan Wright Date: Thu, 20 Feb 2025 11:14:02 +0000 Subject: [PATCH 2/5] Add confirmation modal on enroll --- hackathon/templates/hackathon/hackathon_view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hackathon/templates/hackathon/hackathon_view.html b/hackathon/templates/hackathon/hackathon_view.html index c66da11..ad39068 100644 --- a/hackathon/templates/hackathon/hackathon_view.html +++ b/hackathon/templates/hackathon/hackathon_view.html @@ -103,7 +103,7 @@
-

By clicking enroll, I confirm that I can commit the minimum 3-5 hours per day for this hackathon and have read the Hackathon Code of Conduct. .

+

By clicking enroll, I confirm that I can commit the minimum 3-5 hours per day for this hackathon and have read the Hackathon Code of Conduct.

{% include 'hackathon/includes/enrollpart.html' %} From d080f73002b18a3c44b114007abb12922308a8f5 Mon Sep 17 00:00:00 2001 From: Kenan Wright Date: Fri, 21 Feb 2025 12:32:04 +0000 Subject: [PATCH 3/5] Update wording and styles --- hackathon/templates/hackathon/hackathon_view.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hackathon/templates/hackathon/hackathon_view.html b/hackathon/templates/hackathon/hackathon_view.html index ad39068..cc616ec 100644 --- a/hackathon/templates/hackathon/hackathon_view.html +++ b/hackathon/templates/hackathon/hackathon_view.html @@ -95,7 +95,7 @@
- + @@ -103,7 +103,9 @@
-

By clicking enroll, I confirm that I can commit the minimum 3-5 hours per day for this hackathon and have read the Hackathon Code of Conduct.

+

By clicking enroll, I confirm that I can commit the minimum 3-5 hours per day for this hackathon and have read the Hackathon Code of Conduct. +

Should you drop off without informing your team, facilitator or Community team member, you may not be able to participate in the next hackathon.

+

{% include 'hackathon/includes/enrollpart.html' %} From 10f791949ea598519c2ca8ac9e40ebaa47c09568 Mon Sep 17 00:00:00 2001 From: Kenan Wright Date: Fri, 21 Feb 2025 12:52:28 +0000 Subject: [PATCH 4/5] Update badge styles on profile page --- profiles/templates/profiles/profile.html | 5 +-- static/css/profile.css | 40 ++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/profiles/templates/profiles/profile.html b/profiles/templates/profiles/profile.html index 2aa99de..5b91449 100644 --- a/profiles/templates/profiles/profile.html +++ b/profiles/templates/profiles/profile.html @@ -42,13 +42,13 @@ {% endif %}
-
+
{% for team in user.get_participated_teams %} {% if team.hackathon.badge_url %} - Hackathon badge + Hackathon badge {% endif %} {% endfor %}
@@ -168,6 +168,7 @@
+ diff --git a/static/css/profile.css b/static/css/profile.css index d6c7e5a..87c7450 100644 --- a/static/css/profile.css +++ b/static/css/profile.css @@ -70,3 +70,43 @@ html form label, .dark-text { font-weight: 700; } + +.trophy-case { + background: linear-gradient(to bottom, #f8f9fa, #e9ecef); + border: 2px solid #d1d1d1; + border-radius: 10px; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); + padding: 20px; + margin-top: 20px; + position: relative; +} + +.trophy-case::before { + content: ''; + position: absolute; + top: -10px; + left: 50%; + transform: translateX(-50%); + width: 60px; + height: 10px; + background: #d1d1d1; + border-radius: 5px 5px 0 0; +} + +.trophy-case::after { + content: ''; + position: absolute; + bottom: -10px; + left: 50%; + transform: translateX(-50%); + width: 60px; + height: 10px; + background: #d1d1d1; + border-radius: 0 0 5px 5px; +} + +.trophy-case .card-img-top { + border: 2px solid #d1d1d1; + border-radius: 5px; + margin: 5px; +} \ No newline at end of file From 37c2e32311221b33ef38ad4a184b04149ee2f69d Mon Sep 17 00:00:00 2001 From: Kenan Wright Date: Fri, 21 Feb 2025 14:37:12 +0000 Subject: [PATCH 5/5] Add trophy case styles --- profiles/templates/profiles/profile.html | 11 +++--- static/css/profile.css | 43 ++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/profiles/templates/profiles/profile.html b/profiles/templates/profiles/profile.html index 5b91449..c196a91 100644 --- a/profiles/templates/profiles/profile.html +++ b/profiles/templates/profiles/profile.html @@ -42,13 +42,14 @@ {% endif %}
-
-
- +
+
+ +
{% for team in user.get_participated_teams %} {% if team.hackathon.badge_url %} - - Hackathon badge + Hackathon badge + {% endif %} {% endfor %}
diff --git a/static/css/profile.css b/static/css/profile.css index 87c7450..c250776 100644 --- a/static/css/profile.css +++ b/static/css/profile.css @@ -73,12 +73,14 @@ html form label, .trophy-case { background: linear-gradient(to bottom, #f8f9fa, #e9ecef); - border: 2px solid #d1d1d1; + border: 2px solid var(--p-orange); border-radius: 10px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); padding: 20px; margin-top: 20px; + box-shadow: 0 4px 8px darkgray; position: relative; + overflow: hidden; /* Ensure the shine effect doesn't overflow the card */ } .trophy-case::before { @@ -89,7 +91,7 @@ html form label, transform: translateX(-50%); width: 60px; height: 10px; - background: #d1d1d1; + background: var(--p-orange); border-radius: 5px 5px 0 0; } @@ -101,7 +103,7 @@ html form label, transform: translateX(-50%); width: 60px; height: 10px; - background: #d1d1d1; + background: var(--p-orange); border-radius: 0 0 5px 5px; } @@ -109,4 +111,39 @@ html form label, border: 2px solid #d1d1d1; border-radius: 5px; margin: 5px; +} + +.trophy-case::before, +.trophy-case::after { + transition: all 0.3s ease; +} + +.trophy-case:hover::before, +.trophy-case:hover::after { + background: #b0e0e6; +} + +.trophy-case::before { + content: ''; + position: absolute; + top: 0; + left: -75%; + width: 50%; + height: 100%; + background: linear-gradient(45deg, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.1)); + transform: skewX(-25deg); + transition: all 0.5s ease; +} + +.trophy-case:hover::before { + left: 125%; + transition: all 0.5s ease; +} + +.hack-badge { + cursor: pointer; +} + +.hack-badge:hover { + box-shadow: 0px 2px 4px 0px darkgray } \ No newline at end of file