Merge branch 'develop' into fix-docker

.gitignore

@@ -27,4 +27,5 @@ cache/
 *.sh
 
 .env
+.env_old
 .google-service.account.json

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 = ''
 

app/templates/base_email.html

@@ -8,7 +8,7 @@
     <title>{{ subject }}</title>
     <style type="text/css">
 	a {
-	    color: #BEB771;
+	    color: #7F27A2;
 	    text-decoration: none;
 	    -webkit-transition: all .1s linear;
 	    -moz-transition: all .1s linear;
@@ -17,7 +17,7 @@
 	}
 
 	a:hover, a:active, a:focus {
-	    color: #67622f;
+	    color: #7F27A2;
 	    text-decoration: none;
 	}
 
@@ -102,12 +102,12 @@
             }
 
             .btn-primary table td:hover {
-                background-color: #67622f !important;
+                background-color: #410658 !important;
             }
 
             .btn-primary a:hover {
-                background-color: #67622f !important;
-                border-color: #67622f !important;
+                background-color: #410658 !important;
+                border-color: #410658 !important;
             }
         }
     </style>

app/templates/mails/include/closing.html

@@ -1,19 +1,22 @@
 <p>
     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 %}
-                <a href="https://facebook.com/{{ h_fb }}" target="_blank">Facebook</a>
-                and
+                <a href="https://instagram.com/{{ h_ig }}" target="_blank">Instagram</a>
+                or
                 <a href="https://twitter.com/{{ h_tw }}" target="_blank">Twitter</a>.
             {% else %}
-                <a href="https://facebook.com/{{ h_fb }}" target="_blank">Facebook</a>.
+                <a href="https://instagram.com/{{ h_ig }}" target="_blank">Instagram</a>.
             {% endif %}
         {% elif h_tw %}
             <a href="https://twitter.com/{{ h_tw }}" target="_blank">Twitter</a>.
         {% endif %}
     {% endif %}
 </p>
+{% if travel == "true" %}
+    <p>If you have any questions regarding Travel Reimbursments, please reach us out at <a href="mailto:reimbursements@hackupc.com">reimbursements@hackupc.com</a>.</p>
+{% endif %}
 <p>We hope to see you at {{ h_name }}!</p>
 <p>Best, {{ h_name }} Team.</p>

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;">
                 <tbody>
                 <tr>
-                    <td style="font-family:sans-serif;font-size:14px;vertical-align:top;background-color:#BEB771;border-radius:5px;text-align:center; margin: 0 auto;">
+                    <td style="font-family:sans-serif;font-size:14px;vertical-align:top;background-color:#7F27A2;border-radius:5px;text-align:center; margin: 0 auto;">
                         <a href="{{ url }}" target="_blank"
-                           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;">
+                           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 }}
                         </a>
                     </td>

applications/templates/application.html

@@ -23,12 +23,19 @@
     </div>
     {% endif %}
     <div style="padding-left: 15px; padding-right: 15px">
+        <div class="alert alert-warning">
       {% if application.can_be_edit %}
-          <p>It is still possible to modify your application.</p>
-      {% else %}
-          <p>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 }}.</p>
-      {% endif %}
+
+
+          <p>
+              Be careful, you can only edit the application during <b style="text-decoration: underline;">2 hours</b> after applying
+            </p>
+
+            {% else %}
+            <p>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 }}.</p>
+                {% endif %}
+        </div>
     </div>
     {% include 'include/application_form.html' %}
 

applications/templates/include/application_form.html

@@ -24,7 +24,7 @@
     </div>
 
     {% if not application or application.can_be_edit %}
-        <button class="btn btn-success btn-block" type="submit">{% if application %}Update application{% else %}
+        <button class="btn btn-success btn-block" type="submit" {% if application and not application.can_be_edit %} disabled {% endif %}>{% if application %}Update application{% else %}
             Submit application{% endif %}</button>
 
     {% endif %}

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 %}

applications/templates/mails/invitation_hacker_message.html

@@ -24,5 +24,5 @@
         </p>
     {% endif %}
     {% include 'mails/include/arrival_departure_info.html' %}
-    {% include 'mails/include/closing.html' %}
+    {% include 'mails/include/closing.html' with travel="true"%}
 {% endblock %}

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 %}

applications/templates/mails/invitation_volunteer_message.html

@@ -26,5 +26,5 @@
         </p>
     {% endif %}
     {% include 'mails/include/arrival_departure_info.html' %}
-    {% include 'mails/include/closing.html' %}
+    {% include 'mails/include/closing.html' with travel="false"%}
 {% endblock %}

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 %}

organizers/templates/other_application_detail.html

@@ -44,7 +44,7 @@ <h3>Volunteering</h3>
                     {% 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 %}
                     <hr>
@@ -57,6 +57,7 @@ <h3>Other questions</h3>
                     {% 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 %}
                     <hr>
                     <dt>
                     <h3>Extra</h3>

reimbursement/templates/mails/no_reimbursement_message.html

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

reimbursement/templates/mails/reimbursement_message.html

@@ -11,5 +11,5 @@
     <p>
     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.
     </p>
-    {% include 'mails/include/closing.html' %}
+    {% include 'mails/include/closing.html' with travel="false"%}
 {% endblock %}

user/templates/mails/password_reset_message.html

@@ -13,6 +13,6 @@
     </p>
     <p style="text-align: center;">{{ reset_url|urlize }}</p>
 
-    {% include 'mails/include/closing.html' %}
+    {% include 'mails/include/closing.html' with travel="false"%}
 
 {% endblock %}

user/templates/mails/sponsor_link_message.html

@@ -22,6 +22,6 @@
     </p>
     <p style="text-align: center;">{{ app_sponsor_url|urlize }}</p>
 
-    {% include 'mails/include/closing.html' %}
+    {% include 'mails/include/closing.html' with travel="false"%}
 
 {% endblock %}

user/templates/mails/verify_email_message.html

@@ -6,5 +6,5 @@
     <p>You have 5 days to verify your email address for your account at {{ h_name }}.</p>
     {% 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 %}

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