diff --git a/.gitignore b/.gitignore index 6089593c..d2029724 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ cache/ *.sh .env +.env_old .google-service.account.json diff --git a/app/hackathon_variables.py b/app/hackathon_variables.py index 4dac091c..2fe5cb60 100644 --- a/app/hackathon_variables.py +++ b/app/hackathon_variables.py @@ -40,11 +40,11 @@ HACKATHON_GITHUB_REPO = 'https://github.com/hackupc/myhackupc/' # (OPTIONAL) Applications deadline -HACKATHON_APP_DEADLINE = timezone.datetime(2024, 5, 3, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE)) -VOLUNTEER_APP_DEADLINE = timezone.datetime(2024, 5, 9, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE)) -MENTOR_APP_DEADLINE = timezone.datetime(2024, 5, 1, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE)) +HACKATHON_APP_DEADLINE = timezone.datetime(2024, 4, 24, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE)) +VOLUNTEER_APP_DEADLINE = timezone.datetime(2024, 4, 1, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE)) +MENTOR_APP_DEADLINE = timezone.datetime(2024, 4, 1, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE)) # (OPTIONAL) Online checkin activated -ONLINE_CHECKIN = timezone.datetime(2024, 4, 29, 17, 00, tzinfo=timezone.pytz.timezone(TIME_ZONE)) +ONLINE_CHECKIN = timezone.datetime(2020, 5, 3, 17, 00, tzinfo=timezone.pytz.timezone(TIME_ZONE)) # (OPTIONAL) When to arrive at the hackathon HACKATHON_ARRIVE = '' diff --git a/app/static/logo.png b/app/static/logo.png index c9670c70..f5f463d1 100644 Binary files a/app/static/logo.png and b/app/static/logo.png differ diff --git a/app/static/logo_old3.png b/app/static/logo_old3.png new file mode 100644 index 00000000..c9670c70 Binary files /dev/null and b/app/static/logo_old3.png differ diff --git a/app/templates/base_email.html b/app/templates/base_email.html index 92983d18..1d98b53f 100644 --- a/app/templates/base_email.html +++ b/app/templates/base_email.html @@ -8,7 +8,7 @@ {{ subject }} diff --git a/app/templates/mails/include/closing.html b/app/templates/mails/include/closing.html index ad828448..b765b0bb 100644 --- a/app/templates/mails/include/closing.html +++ b/app/templates/mails/include/closing.html @@ -1,19 +1,22 @@

Have any other questions? Email us at {{ h_contact_email|urlize }} - {% if h_fb or h_tw %} + {% if h_ig or h_tw %} or message us on - {% if h_fb %} + {% if h_ig %} {% if h_tw %} - Facebook - and + Instagram + or Twitter. {% else %} - Facebook. + Instagram. {% endif %} {% elif h_tw %} Twitter. {% endif %} {% endif %}

+{% if travel == "true" %} +

If you have any questions regarding Travel Reimbursments, please reach us out at reimbursements@hackupc.com.

+{% endif %}

We hope to see you at {{ h_name }}!

Best, {{ h_name }} Team.

diff --git a/app/templates/mails/include/email_button.html b/app/templates/mails/include/email_button.html index db32f707..6ae66816 100644 --- a/app/templates/mails/include/email_button.html +++ b/app/templates/mails/include/email_button.html @@ -9,9 +9,9 @@ style="border-collapse:separate;mso-table-lspace:0pt;mso-table-rspace:0pt;width:100%;width:auto;"> - + + 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;"> {{ text }} diff --git a/applications/templates/application.html b/applications/templates/application.html index 433d3d90..36b0b89c 100644 --- a/applications/templates/application.html +++ b/applications/templates/application.html @@ -23,12 +23,19 @@ {% endif %}
+
{% if application.can_be_edit %} -

It is still possible to modify your application.

- {% else %} -

Your application has been reviewed already. Editing has been disabled to make sure all reviewers get the - same data. If you would like to change something important, please email us at {{ h_contact_email|urlize }}.

- {% endif %} + + +

+ Be careful, you can only edit the application during 2 hours after applying +

+ + {% else %} +

Your application has been reviewed already. Editing has been disabled to make sure all reviewers get the + same data. If you would like to change something important, please email us at {{ h_contact_email|urlize }}.

+ {% endif %} +
{% include 'include/application_form.html' %} diff --git a/applications/templates/include/application_form.html b/applications/templates/include/application_form.html index 6cb07df4..cce5e643 100644 --- a/applications/templates/include/application_form.html +++ b/applications/templates/include/application_form.html @@ -24,7 +24,7 @@ {% if not application or application.can_be_edit %} - {% endif %} diff --git a/applications/templates/mails/confirmation_message.html b/applications/templates/mails/confirmation_message.html index c5122823..c7ed6608 100644 --- a/applications/templates/mails/confirmation_message.html +++ b/applications/templates/mails/confirmation_message.html @@ -14,5 +14,5 @@ {% include 'mails/include/cancel.html' %} {% include 'mails/include/arrival_departure_info.html' %} - {% include 'mails/include/closing.html' %} + {% include 'mails/include/closing.html' with travel="false"%} {% endblock %} diff --git a/applications/templates/mails/invitation_hacker_message.html b/applications/templates/mails/invitation_hacker_message.html index d2adca03..ff92b360 100644 --- a/applications/templates/mails/invitation_hacker_message.html +++ b/applications/templates/mails/invitation_hacker_message.html @@ -24,5 +24,5 @@

{% endif %} {% include 'mails/include/arrival_departure_info.html' %} - {% include 'mails/include/closing.html' %} + {% include 'mails/include/closing.html' with travel="true"%} {% endblock %} diff --git a/applications/templates/mails/invitation_mentor_message.html b/applications/templates/mails/invitation_mentor_message.html index bcb9c8a2..3d06a8b1 100644 --- a/applications/templates/mails/invitation_mentor_message.html +++ b/applications/templates/mails/invitation_mentor_message.html @@ -19,5 +19,5 @@ {% include 'mails/include/email_button.html' with text='Confirm' url=confirm_url %} {% include 'mails/include/cancel.html' %} {% include 'mails/include/arrival_departure_info.html' %} - {% include 'mails/include/closing.html' %} + {% include 'mails/include/closing.html' with travel="false"%} {% endblock %} diff --git a/applications/templates/mails/invitation_volunteer_message.html b/applications/templates/mails/invitation_volunteer_message.html index 9f27f228..be323841 100644 --- a/applications/templates/mails/invitation_volunteer_message.html +++ b/applications/templates/mails/invitation_volunteer_message.html @@ -26,5 +26,5 @@

{% endif %} {% include 'mails/include/arrival_departure_info.html' %} - {% include 'mails/include/closing.html' %} + {% include 'mails/include/closing.html' with travel="false"%} {% endblock %} diff --git a/applications/templates/mails/last_reminder_message.html b/applications/templates/mails/last_reminder_message.html index 9c848d93..4aa26876 100644 --- a/applications/templates/mails/last_reminder_message.html +++ b/applications/templates/mails/last_reminder_message.html @@ -15,5 +15,5 @@ {% include 'mails/include/email_button.html' with text='Confirm' url=confirm_url %} {% include 'mails/include/cancel.html' %} - {% include 'mails/include/closing.html' %} + {% include 'mails/include/closing.html' with travel="true"%} {% endblock %} diff --git a/organizers/templates/other_application_detail.html b/organizers/templates/other_application_detail.html index b8a041af..dfefdad8 100644 --- a/organizers/templates/other_application_detail.html +++ b/organizers/templates/other_application_detail.html @@ -44,7 +44,7 @@

Volunteering

{% if not app.first_time_volunteer %} {% include 'include/field.html' with desc='Other editions' value=app.which_hack %} {% endif %} - {% include 'include/field.html' with desc='English Level' value=app.english_level %} + {% include 'include/field.html' with desc='Languages' value=app.languages %} {% include 'include/field.html' with desc='Attendance' value=app.attendance %} {% include 'include/field.html' with desc='Motivation' value=app.volunteer_motivation %}
@@ -57,6 +57,7 @@

Other questions

{% include 'include/field.html' with desc='T-shirt size' value=app.tshirt_size %} {% include 'include/field.html' with desc='Dietary restrictions' value=app.diet %} {% include 'include/field.html' with desc='Other diet' value=app.other_diet %} + {% include 'include/field.html' with desc='How you meet us' value=app.hear_about_us %}

Extra

diff --git a/reimbursement/templates/mails/no_reimbursement_message.html b/reimbursement/templates/mails/no_reimbursement_message.html index 8ff74947..9135966c 100644 --- a/reimbursement/templates/mails/no_reimbursement_message.html +++ b/reimbursement/templates/mails/no_reimbursement_message.html @@ -8,5 +8,5 @@

Please remember to confirm your spot if you haven't already. If your plans have changed, please let us know by cancelling your invite here.

- {% include 'mails/include/closing.html' %} + {% include 'mails/include/closing.html' with travel="false"%} {% endblock %} diff --git a/reimbursement/templates/mails/reimbursement_message.html b/reimbursement/templates/mails/reimbursement_message.html index ffa7b401..83341757 100644 --- a/reimbursement/templates/mails/reimbursement_message.html +++ b/reimbursement/templates/mails/reimbursement_message.html @@ -11,5 +11,5 @@

If you need an invite letter for your visa, send us a email to reimbursements@hackupc.com 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.

- {% include 'mails/include/closing.html' %} + {% include 'mails/include/closing.html' with travel="false"%} {% endblock %} diff --git a/user/templates/mails/password_reset_message.html b/user/templates/mails/password_reset_message.html index d95f7da2..aaf4aa70 100644 --- a/user/templates/mails/password_reset_message.html +++ b/user/templates/mails/password_reset_message.html @@ -13,6 +13,6 @@

{{ reset_url|urlize }}

- {% include 'mails/include/closing.html' %} + {% include 'mails/include/closing.html' with travel="false"%} {% endblock %} diff --git a/user/templates/mails/sponsor_link_message.html b/user/templates/mails/sponsor_link_message.html index 09d96aa4..c8d28399 100644 --- a/user/templates/mails/sponsor_link_message.html +++ b/user/templates/mails/sponsor_link_message.html @@ -22,6 +22,6 @@

{{ app_sponsor_url|urlize }}

- {% include 'mails/include/closing.html' %} + {% include 'mails/include/closing.html' with travel="false"%} {% endblock %} diff --git a/user/templates/mails/verify_email_message.html b/user/templates/mails/verify_email_message.html index f8aeb0a2..7f254764 100644 --- a/user/templates/mails/verify_email_message.html +++ b/user/templates/mails/verify_email_message.html @@ -6,5 +6,5 @@

You have 5 days to verify your email address for your account at {{ h_name }}.

{% include 'mails/include/email_button.html' with text='Verify' url=activate_url %} - {% include 'mails/include/closing.html' %} + {% include 'mails/include/closing.html' with travel="true"%} {% endblock %} diff --git a/user/verification.py b/user/verification.py index a587fedd..2feaa89a 100644 --- a/user/verification.py +++ b/user/verification.py @@ -76,7 +76,7 @@ def _wrapped_view(request, *args, **kwargs): except LoginRequest.DoesNotExist: login_request = LoginRequest.objects.create(ip=client_ip, latestRequest=request_time) login_request.save() - if login_request.login_tries < 4: + if login_request.login_tries < 14: request.client_req_is_valid = True else: request.client_req_is_valid = False