Skip to content

Commit 89b310b

Browse files
jmiaronsjmiarons
authored
Merge branch 'develop' into fix-docker
2 parents cbf7e33 + 08f2eab commit 89b310b

21 files changed

+46
-34
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ cache/
2727
*.sh
2828

2929
.env
30+
.env_old
3031
.google-service.account.json

‎app/hackathon_variables.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
HACKATHON_GITHUB_REPO = 'https://github.com/hackupc/myhackupc/'
4141

4242
# (OPTIONAL) Applications deadline
43-
HACKATHON_APP_DEADLINE = timezone.datetime(2024, 5, 3, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE))
44-
VOLUNTEER_APP_DEADLINE = timezone.datetime(2024, 5, 9, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE))
45-
MENTOR_APP_DEADLINE = timezone.datetime(2024, 5, 1, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE))
43+
HACKATHON_APP_DEADLINE = timezone.datetime(2024, 4, 24, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE))
44+
VOLUNTEER_APP_DEADLINE = timezone.datetime(2024, 4, 1, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE))
45+
MENTOR_APP_DEADLINE = timezone.datetime(2024, 4, 1, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE))
4646
# (OPTIONAL) Online checkin activated
47-
ONLINE_CHECKIN = timezone.datetime(2024, 4, 29, 17, 00, tzinfo=timezone.pytz.timezone(TIME_ZONE))
47+
ONLINE_CHECKIN = timezone.datetime(2020, 5, 3, 17, 00, tzinfo=timezone.pytz.timezone(TIME_ZONE))
4848
# (OPTIONAL) When to arrive at the hackathon
4949
HACKATHON_ARRIVE = ''
5050

‎app/static/logo.png

89.1 KB
Loading

‎app/static/logo_old3.png

2.78 MB
Loading

‎app/templates/base_email.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<title>{{ subject }}</title>
99
<style type="text/css">
1010
a {
11-
color: #BEB771;
11+
color: #7F27A2;
1212
text-decoration: none;
1313
-webkit-transition: all .1s linear;
1414
-moz-transition: all .1s linear;
@@ -17,7 +17,7 @@
1717
}
1818

1919
a:hover, a:active, a:focus {
20-
color: #67622f;
20+
color: #7F27A2;
2121
text-decoration: none;
2222
}
2323

@@ -102,12 +102,12 @@
102102
}
103103

104104
.btn-primary table td:hover {
105-
background-color: #67622f !important;
105+
background-color: #410658 !important;
106106
}
107107

108108
.btn-primary a:hover {
109-
background-color: #67622f !important;
110-
border-color: #67622f !important;
109+
background-color: #410658 !important;
110+
border-color: #410658 !important;
111111
}
112112
}
113113
</style>

‎app/templates/mails/include/closing.html

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
<p>
22
Have any other questions? Email us at {{ h_contact_email|urlize }}
3-
{% if h_fb or h_tw %}
3+
{% if h_ig or h_tw %}
44
or message us on
5-
{% if h_fb %}
5+
{% if h_ig %}
66
{% if h_tw %}
7-
<a href="https://facebook.com/{{ h_fb }}" target="_blank">Facebook</a>
8-
and
7+
<a href="https://instagram.com/{{ h_ig }}" target="_blank">Instagram</a>
8+
or
99
<a href="https://twitter.com/{{ h_tw }}" target="_blank">Twitter</a>.
1010
{% else %}
11-
<a href="https://facebook.com/{{ h_fb }}" target="_blank">Facebook</a>.
11+
<a href="https://instagram.com/{{ h_ig }}" target="_blank">Instagram</a>.
1212
{% endif %}
1313
{% elif h_tw %}
1414
<a href="https://twitter.com/{{ h_tw }}" target="_blank">Twitter</a>.
1515
{% endif %}
1616
{% endif %}
1717
</p>
18+
{% if travel == "true" %}
19+
<p>If you have any questions regarding Travel Reimbursments, please reach us out at <a href="mailto:[email protected]">[email protected]</a>.</p>
20+
{% endif %}
1821
<p>We hope to see you at {{ h_name }}!</p>
1922
<p>Best, {{ h_name }} Team.</p>

‎app/templates/mails/include/email_button.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
style="border-collapse:separate;mso-table-lspace:0pt;mso-table-rspace:0pt;width:100%;width:auto;">
1010
<tbody>
1111
<tr>
12-
<td style="font-family:sans-serif;font-size:14px;vertical-align:top;background-color:#BEB771;border-radius:5px;text-align:center; margin: 0 auto;">
12+
<td style="font-family:sans-serif;font-size:14px;vertical-align:top;background-color:#7F27A2;border-radius:5px;text-align:center; margin: 0 auto;">
1313
<a href="{{ url }}" target="_blank"
14-
style="text-decoration:underline;border:solid 1px #BEB771;border-radius:5px;box-sizing:border-box;cursor:pointer;display:inline-block;font-size:14px;font-weight:bold;margin:0;padding:12px 25px;text-decoration:none;text-transform:capitalize;background-color:#BEB771;color:#ffffff;">
14+
style="text-decoration:underline;border:solid 1px #7F27A2;border-radius:5px;box-sizing:border-box;cursor:pointer;display:inline-block;font-size:14px;font-weight:bold;margin:0;padding:12px 25px;text-decoration:none;text-transform:capitalize;background-color:#7F27A2;color:#ffffff;">
1515
{{ text }}
1616
</a>
1717
</td>

‎applications/templates/application.html

+12-5
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,19 @@
2323
</div>
2424
{% endif %}
2525
<div style="padding-left: 15px; padding-right: 15px">
26+
<div class="alert alert-warning">
2627
{% if application.can_be_edit %}
27-
<p>It is still possible to modify your application.</p>
28-
{% else %}
29-
<p>Your application has been reviewed already. Editing has been disabled to make sure all reviewers get the
30-
same data. If you would like to change something important, please email us at {{ h_contact_email|urlize }}.</p>
31-
{% endif %}
28+
29+
30+
<p>
31+
Be careful, you can only edit the application during <b style="text-decoration: underline;">2 hours</b> after applying
32+
</p>
33+
34+
{% else %}
35+
<p>Your application has been reviewed already. Editing has been disabled to make sure all reviewers get the
36+
same data. If you would like to change something important, please email us at {{ h_contact_email|urlize }}.</p>
37+
{% endif %}
38+
</div>
3239
</div>
3340
{% include 'include/application_form.html' %}
3441

‎applications/templates/include/application_form.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</div>
2525

2626
{% if not application or application.can_be_edit %}
27-
<button class="btn btn-success btn-block" type="submit">{% if application %}Update application{% else %}
27+
<button class="btn btn-success btn-block" type="submit" {% if application and not application.can_be_edit %} disabled {% endif %}>{% if application %}Update application{% else %}
2828
Submit application{% endif %}</button>
2929

3030
{% endif %}

‎applications/templates/mails/confirmation_message.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414

1515
{% include 'mails/include/cancel.html' %}
1616
{% include 'mails/include/arrival_departure_info.html' %}
17-
{% include 'mails/include/closing.html' %}
17+
{% include 'mails/include/closing.html' with travel="false"%}
1818
{% endblock %}

‎applications/templates/mails/invitation_hacker_message.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
</p>
2525
{% endif %}
2626
{% include 'mails/include/arrival_departure_info.html' %}
27-
{% include 'mails/include/closing.html' %}
27+
{% include 'mails/include/closing.html' with travel="true"%}
2828
{% endblock %}

‎applications/templates/mails/invitation_mentor_message.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
{% include 'mails/include/email_button.html' with text='Confirm' url=confirm_url %}
2020
{% include 'mails/include/cancel.html' %}
2121
{% include 'mails/include/arrival_departure_info.html' %}
22-
{% include 'mails/include/closing.html' %}
22+
{% include 'mails/include/closing.html' with travel="false"%}
2323
{% endblock %}

‎applications/templates/mails/invitation_volunteer_message.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@
2626
</p>
2727
{% endif %}
2828
{% include 'mails/include/arrival_departure_info.html' %}
29-
{% include 'mails/include/closing.html' %}
29+
{% include 'mails/include/closing.html' with travel="false"%}
3030
{% endblock %}

‎applications/templates/mails/last_reminder_message.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
{% include 'mails/include/email_button.html' with text='Confirm' url=confirm_url %}
1616

1717
{% include 'mails/include/cancel.html' %}
18-
{% include 'mails/include/closing.html' %}
18+
{% include 'mails/include/closing.html' with travel="true"%}
1919
{% endblock %}

‎organizers/templates/other_application_detail.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h3>Volunteering</h3>
4444
{% if not app.first_time_volunteer %}
4545
{% include 'include/field.html' with desc='Other editions' value=app.which_hack %}
4646
{% endif %}
47-
{% include 'include/field.html' with desc='English Level' value=app.english_level %}
47+
{% include 'include/field.html' with desc='Languages' value=app.languages %}
4848
{% include 'include/field.html' with desc='Attendance' value=app.attendance %}
4949
{% include 'include/field.html' with desc='Motivation' value=app.volunteer_motivation %}
5050
<hr>
@@ -57,6 +57,7 @@ <h3>Other questions</h3>
5757
{% include 'include/field.html' with desc='T-shirt size' value=app.tshirt_size %}
5858
{% include 'include/field.html' with desc='Dietary restrictions' value=app.diet %}
5959
{% include 'include/field.html' with desc='Other diet' value=app.other_diet %}
60+
{% include 'include/field.html' with desc='How you meet us' value=app.hear_about_us %}
6061
<hr>
6162
<dt>
6263
<h3>Extra</h3>

‎reimbursement/templates/mails/no_reimbursement_message.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
<p>Please remember to <a href="{{ confirm_url }}">confirm</a> your spot if you haven't already. If your plans
99
have changed, please let us know by cancelling your invite <a href="{{ cancel_url }}">here</a>.
1010
</p>
11-
{% include 'mails/include/closing.html' %}
11+
{% include 'mails/include/closing.html' with travel="false"%}
1212
{% endblock %}

‎reimbursement/templates/mails/reimbursement_message.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
<p>
1212
If you need an invite letter for your visa, send us a email to [email protected] with your full name, university name and passport number, as shown in your passport or if you have any questions, don't hesitate to contact us.
1313
</p>
14-
{% include 'mails/include/closing.html' %}
14+
{% include 'mails/include/closing.html' with travel="false"%}
1515
{% endblock %}

‎user/templates/mails/password_reset_message.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
</p>
1414
<p style="text-align: center;">{{ reset_url|urlize }}</p>
1515

16-
{% include 'mails/include/closing.html' %}
16+
{% include 'mails/include/closing.html' with travel="false"%}
1717

1818
{% endblock %}

‎user/templates/mails/sponsor_link_message.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
</p>
2323
<p style="text-align: center;">{{ app_sponsor_url|urlize }}</p>
2424

25-
{% include 'mails/include/closing.html' %}
25+
{% include 'mails/include/closing.html' with travel="false"%}
2626

2727
{% endblock %}

‎user/templates/mails/verify_email_message.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
<p>You have 5 days to verify your email address for your account at {{ h_name }}.</p>
77
{% include 'mails/include/email_button.html' with text='Verify' url=activate_url %}
88

9-
{% include 'mails/include/closing.html' %}
9+
{% include 'mails/include/closing.html' with travel="true"%}
1010
{% endblock %}

‎user/verification.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def _wrapped_view(request, *args, **kwargs):
7676
except LoginRequest.DoesNotExist:
7777
login_request = LoginRequest.objects.create(ip=client_ip, latestRequest=request_time)
7878
login_request.save()
79-
if login_request.login_tries < 4:
79+
if login_request.login_tries < 14:
8080
request.client_req_is_valid = True
8181
else:
8282
request.client_req_is_valid = False

0 commit comments

Comments
 (0)