Skip to content

Commit

Permalink
added modified html files
Browse files Browse the repository at this point in the history
  • Loading branch information
@carmen-chau
carmen-chau committed Jun 23, 2024
1 parent 4523a17 commit ca13c11
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 156 deletions.
12 changes: 9 additions & 3 deletions hackathon_site/event/jinja2/event/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css" />

<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,400i,500,700,900|Nunito:400,500,700,900&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Sen:wght@400;700&display=swap" rel="stylesheet"/>
<link href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap" rel="stylesheet"/>

<!-- Favicon -->
<link rel="icon" type="image/png" sizes="32x32" href="{{ static('event/images/favicon/favicon-32x32.png') }}">
<link rel="icon" type="image/png" sizes="16x16" href="{{ static('event/images/favicon/favicon-16x16.png') }}">
<meta name="theme-color" content="#ffffff">

<title>{% block title %}{{ hackathon_name }} {{ localtime(event_start_date).strftime("%Y") }}{% endblock %}</title>
<link rel="stylesheet" type="text/css" href="{{ static('event/styles/css/styles.css') }}" />
Expand All @@ -21,9 +27,9 @@
{% endblock %}
</head>
<body>
<nav class="navbar primaryColor" role="navigation">
<nav class="navbar {% block nav_background_color %}navbarScrolled primaryColor{% endblock %}" role="navigation">
<div class="nav-wrapper container">
<a href="{{ url("event:index") }}"><img src="{{ static('event/images/logo.svg') }}" class="logoNav" alt="logo" /></a>
<a href="{{ url("event:index") }}"><img src="{{ static('event/images/logo.svg') }}" class="{% block nav_logo %}logoNav100{% endblock %}" alt="logo" /></a>

{% block nav %}
<ul class="right hide-on-med-and-down">
Expand Down
3 changes: 2 additions & 1 deletion hackathon_site/event/jinja2/event/change_password.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% extends "event/form_base.html" %}

{% block title %}Change Password - {{ hackathon_name }}{% endblock %}
{% block form_title %}Change Password{% endblock %}

{% block nav_links %}
Expand All @@ -10,7 +11,7 @@
{% block form_img %}<img src="{{ static('event/images/password.svg') }}" alt="Change password image"/>{% endblock %}

{% set form_action=url("event:change_password") %}

{% block form_inputs %}
{{ render_field(form.old_password) }}
{{ render_field(form.new_password1, show_help_text=True) }}
Expand Down
4 changes: 3 additions & 1 deletion hackathon_site/event/jinja2/event/change_password_done.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% extends "event/base.html" %}

{% block title %}Change Password - {{ hackathon_name }}{% endblock %}

{% block nav_links %}
<li><a href="{{ url("event:dashboard") }}">Dashboard</a></li>
<li><a href="{{ url("event:change_password") }}" class="active">Change Password</a></li>
Expand All @@ -8,7 +10,7 @@
{% block form_img %}<img src="{{ static('event/images/password.svg') }}" alt="Change password image"/>{% endblock %}

{% block body %}
<div class="backgroundColorFormBase">
<div class="ombreBackgroundDark3">
<div class="container">
<div class="section">
<div class="borderTopDiv z-depth-3">
Expand Down
157 changes: 11 additions & 146 deletions hackathon_site/event/jinja2/event/dashboard_base.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{% extends "event/base.html" %}

{% block title %}Dashboard - {{ hackathon_name }}{% endblock %}

{% block nav_links %}
<li><a href="{{ url("event:dashboard") }}" class="active">Dashboard</a></li>
<li><a href="{{ url("event:change_password") }}">Change Password</a></li>
{% endblock %}

{% block body %}
<div class="backgroundColorDashboard">
<div class="ombreBackgroundDark3">
<div class="container">
<div class="section">
<div class="borderTopDiv z-depth-3">
Expand All @@ -33,85 +35,17 @@ <h2 class="formH2">Complete your application</h2>
{% elif application is not none and review is not none %}
<br />
{% if review.status == "Accepted" %}
{% if application.rsvp and using_rsvp %}
<h4 class="formH2"><b>Thanks for RSVP'ing!</b> See you at {{ hackathon_name }}!</h4>
{% elif application.rsvp is sameas false and using_rsvp%}
<h4 class="formH2"><b>Thanks for letting us know.</b> Hope to see you next year at {{ hackathon_name }}</h4>
{% else %}
<h4 class="formH2"><b>Congratulations!</b> You've been accepted into {{ hackathon_name }}!</h4>
{% endif %}

{% if using_rsvp %}
<p style="display: flex;">
<strong>Status:&nbsp;</strong>
{% if application.rsvp is sameas false %}
<span class="material-icons errorText" style="margin-right: 3px;">
highlight_off
</span>
{% elif application.rsvp %}
<span class="material-icons successText" style="margin-right: 3px;">
check_circle_outline
</span>
{% endif %}
{{ status }}
</p>
<br>
{% if not rsvp_passed %}
{% if application.rsvp is none %}
<p>To confirm your attendance at {{ hackathon_name }}, please RSVP using the accept or decline buttons below.</p> <br />
<p>RSVP by <b>{{ rsvp_deadline }}</b>, otherwise your spot will be given to other applicants.
Alternatively you can decline the offer. You can change your response at any time before <b>{{ rsvp_deadline }}</b>.
</p> <br />
{% else %}
<p>You can change your response at any time before <b>{{ rsvp_deadline }}</b>.</p> <br />
{% endif %}
{% endif %}
{% endif %}

{% if (application.rsvp and using_rsvp) or not using_rsvp %}
<p>Make sure you read the <a class="primaryText hoverLink" href="{{ participant_package_link }}" rel="noopener" target="_blank">participant package</a> for all the info regarding
<h4 class="formH2"><b>Congratulations!</b> You've been accepted into {{ hackathon_name }}!</h4>
<p>Make sure you read the <a class="primaryText hoverLink" href="{{ participant_package_link }}" rel="noopener" target="_blank">participant package</a> for all the info regarding
the event, and join our <a class="primaryText hoverLink" href="{{ chat_room_link }}" rel="noopener" target="_blank">{{ chat_room_name }}</a>. Stay tuned for more updates regarding detailed event logistics, and we hope to see you soon!</p> <br />
{% endif %}
<p>If you have questions, read the <a class="primaryText hoverLink" href="#faq">FAQ</a>, or feel free to contact us.</p> <br />

{% if using_rsvp %}
{% if not rsvp_passed %}
<div style="display: flex; width: auto">
{% if application.rsvp is sameas false or application.rsvp is none %}
<a
href="{{ url("registration:rsvp", kwargs={"rsvp": "yes"}) }}"
class="btn-small waves-effect waves-light colorBtn"
style="margin-right: 30px;"
>
Will Attend (Accept)
</a>
{% endif %}
{% if application.rsvp or application.rsvp is none %}
<a
href="{{ url("registration:rsvp", kwargs={"rsvp": "no"})}}"
class="btn-small waves-effect waves-light redBtn"
>
Cannot Attend (Decline)
</a>
{% endif %}
</div>

{% elif rsvp_passed and application.rsvp %}
<p><b>The RSVP deadline has passed. Thanks for confirming your position at {{ hackathon_name }}! We look forward to seeing you there. Note that you cannot change your RSVP at this time.</b></p>
{% elif rsvp_passed and application.rsvp is sameas false %}
<p><b>The RSVP deadline has passed. We regret to see that you will not be joining us this year at {{ hackathon_name }}. Unfortunately you cannot change your RSVP at this time.</b></p>
{% else %}
<p><b>It appears you haven't RSVPed. Unfortunately the RSVP deadline has passed and you cannot change your RSVP at this time.</b></p>
{% endif %}
{% endif %}

{% elif review.status == "Waitlisted" %}
<h4 class="formH2">You've been waitlisted for {{ hackathon_name }}</h4>
<p>The {{ hackathon_name }} team has reviewed your application, and have decided not to grant you a guaranteed spot
at {{ hackathon_name }} and to place you in our waitlist. On {{ waitlisted_acceptance_start_time.strftime("%B %-d, %Y, at %-I:%M %p") }}, we will begin allowing
people from the waitlist into the event on a first-come, first-serve basis if there is still room. We offer no
guarantee that you will be allowed into the event, regardless of how early you arrive. Please read our
<a class="primaryText hoverLink" href="{{ participant_package_link }}" rel="noopener" target="_blank">participant package</a> for all the info regarding the event if you plan on
guarantee that you will be allowed into the event, regardless of how early you arrive. Please read our
<a class="primaryText hoverLink" href="{{ participant_package_link }}" rel="noopener" target="_blank">participant package</a> for all the info regarding the event if you plan on
waiting to see if any spots become available.
</p> <br />
<p>If you have questions, read the <a class="primaryText hoverLink" href="#faq">FAQ</a>, or feel free to contact us.</p> <br />
Expand All @@ -136,94 +70,25 @@ <h2 class="formH2">Your application has been submitted!</h2>
{% endif %}
</div>

{% if using_teams and (is_registration_open() or application is not none) %}
<div class="borderTopDiv z-depth-3">
<h2 class="formH2">Apply as a team</h2>
<p>Have friends you want to work with? Create a team with up to 4 people and we’ll review your applications together.</p>
<br />
{% if application is none %}
<p><strong>You must complete your application before you can form a team. Return here once you've submitted your application.</strong></p>
{% else %}
<p>Your team code is: <strong>{{ application.team.team_code }}</strong></p>
{% set num_members = application.team.applications.count() %}
{% if is_registration_open() %}
<p>
{% if join_team_form and num_members < application.team.MAX_MEMBERS%}
Share your team code with your teammates, or join their team instead.
{% endif %}
</p>
{% endif %}

<br />
<h3 class="formH3">Team members ({{ num_members }}/{{ application.team.MAX_MEMBERS }})</h3>
<ul class="browser-default">
{% for application in application.team.applications.all() %}
<li>{{ application.user.first_name }} {{ application.user.last_name }}</li>
{% endfor %}
</ul>
{% if join_team_form %}
<a
href="{{ url("registration:leave-team") }}"
class="btn-small waves-effect waves-light colorBtn"
style="margin-right: auto; margin-top: 15px;"
>
Leave team
</a>
<br />
<br />
<h3 class="formH3">Join a different team</h3>
<form class="valign-wrapper" style="margin-left: 0;" method="post">
{{ csrf_input }}
<div class="input-field">
{{ join_team_form.team_code }}
{{ join_team_form.team_code.label_tag() }}

{% if join_team_form.team_code.errors %}
<span class="formFieldError">
{% for error in join_team_form.team_code.errors %}
{{ error }}
<br />
{% endfor %}
</span>
{% endif %}
</div>
<div style="margin-left: 20px;">
<button class="btn-small waves-effect waves-light secondaryColor colorBtn center" type="submit">Submit</button>
</div>
</form>
{% endif %}

{% endif %}
</div>
{% endif %}

<div class="borderTopDiv z-depth-3">
<h2 class="formH2" id="faq">Application FAQs</h2>

<p class="faqQuestion">When can I expect to hear back?</p>
<p class="faqAnswer">Decisions will be sent out in 2 rounds, tentatively scheduled for MONTH XX and XX.</p>

<p class="faqQuestion">Can I compete with a different team than the one I applied with?</p>
<p class="faqAnswer">Your team number is just for your application so we can review your team together. It is not deciding and not needed during the event. You have until the event to choose a team and must submit to Devpost with the final team.</p>
<p class="faqAnswer">Decisions will be sent out in 2 rounds, tentatively scheduled for mid to late October.</p>

{% if using_teams %}
<p class="faqQuestion">I don’t have a team. What can I do?</p>
<p class="faqAnswer">All teams competing must have 3 or 4 members, but you do not need a full team in order to apply. We have a channel on {{ chat_room_name }} dedicated to team formation as well as an event scheduled before hacking starts at the event.</p>

<p class="faqQuestion">Are decisions unanimous for a team?</p>
<p class="faqAnswer">Due to the large number of applicants and limited number of spots for {{ hackathon_name }}, decisions may not be unanimous. Each member should expect an email regarding their individual decisions.</p>
{% endif %}

<p class="faqQuestion">Who can I contact if I’ll be late?</p>
<p class="faqAnswer">Please send an email to <a href="mailto:{{ contact_email }}" class="primaryText hoverLink">{{ contact_email }}</a> with your name, email you used to apply, expected arrival time, and reason as to why you’re arriving late and we’ll save your spot for you.</p>

<p class="faqQuestion">How does the waitlist work the day of?</p>
<p class="faqAnswer">The rank on the waitlist is first-come first serve, meaning the sooner you arrive at the event on {{ waitlisted_acceptance_start_time.strftime("%A") }}, the higher your placement on our waitlist. At {{ waitlisted_acceptance_start_time.strftime("%-I:%M %p") }}, if we have any spots remaining, we will be letting waitlisted people in.</p>
<!-- <p class="faqQuestion">How does the waitlist work the day of?</p>
<p class="faqAnswer">The rank on the waitlist is first-come first serve, meaning the sooner you arrive at the event on {{ waitlisted_acceptance_start_time.strftime("%A") }}, the higher your placement on our waitlist. At {{ waitlisted_acceptance_start_time.strftime("%-I:%M %p") }}, if we have any spots remaining, we will be letting waitlisted people in.</p> -->

<p class="faqQuestion">Other questions?</p>
<p class="faqAnswer">If you have any questions or concerns, feel free to contact us at <a href="mailto:{{ contact_email }}" class="primaryText hoverLink">{{ contact_email }}</a>.</p>
</div>
</div>
</div>
</div>
{% endblock %}
{% endblock %}
8 changes: 4 additions & 4 deletions hackathon_site/event/jinja2/event/form_base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ field }}
{% if show_label %}
{% if show_help_text_as_label %}
<label for="{{ field.id_for_label }}">{{ field.help_text }}</label>
<label for="{{ field.id_for_label }}">{{ field.help_text|safe or field.label }}</label>
{% else %}
{{ field.label_tag() }}
{% endif %}
Expand Down Expand Up @@ -46,7 +46,7 @@
{% endmacro %}

{% block body %}
<div class="backgroundColorFormBase">
<div class="ombreBackgroundDark3">
<div class="container">
<div class="section">
<div class="loginDiv z-depth-3 row">
Expand All @@ -55,7 +55,7 @@ <h1 class="formH1 col s12">{% block form_title %}{% endblock %}</h1>
<div class="row col s12 formPadding" style="width: auto; margin-bottom: 0;">
{% block form_description %}{% endblock %}
</div>

<form class="col s12 flexColCenter formPadding"
{% if form_action %} action="{{ form_action }}" {% endif %}
method="{{ form_method if form_method else "post" }}"
Expand All @@ -65,7 +65,7 @@ <h1 class="formH1 col s12">{% block form_title %}{% endblock %}</h1>
<div class="row" style="width: 100%;">
{% block form_inputs %}{% endblock %}
</div>

{% block form_button %}{% endblock %}
</form>
<br />
Expand Down
3 changes: 2 additions & 1 deletion hackathon_site/event/jinja2/event/login.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% extends "event/form_base.html" %}

{% block title %}Login - {{ hackathon_name }}{% endblock %}
{% block form_title %}Login{% endblock %}

{% block nav_logout_login_links %}{% endblock %}
Expand Down Expand Up @@ -53,7 +54,7 @@
<div class="formFieldError col s12">
{{ error }}
</div>

{% endfor %}
{% endif %}
{% endblock %}
Expand Down

0 comments on commit ca13c11

Please sign in to comment.