From bcd1613493953f84cdd76572a523fda4c1d8253f Mon Sep 17 00:00:00 2001
From: Lisa Li <42653157+lisa-sa-li@users.noreply.github.com>
Date: Sat, 23 Jan 2021 14:06:26 -0500
Subject: [PATCH 1/5] added CAD after $$ (#54)
---
hackathon_site/event/jinja2/event/landing.html | 6 +++---
.../jinja2/review/emails/accepted_email_body.html | 2 +-
hackathon_site/review/tests.py | 12 +++++++++---
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/hackathon_site/event/jinja2/event/landing.html b/hackathon_site/event/jinja2/event/landing.html
index 61f03f8..9858b09 100644
--- a/hackathon_site/event/jinja2/event/landing.html
+++ b/hackathon_site/event/jinja2/event/landing.html
@@ -184,7 +184,7 @@ FAQ
- Unfortunately, our team will not be able to ship out any hardware for MakeUofT 2021. However, the first 200 people to apply and be accepted will be able to get a $25 reimbursement after submitting a demo of their project! If you submit as a team, each eligible team member will receive a separate reimbursement.
+ Unfortunately, our team will not be able to ship out any hardware for MakeUofT 2021. However, the first 200 people to apply and be accepted will be able to get a $25 CAD reimbursement after submitting a demo of their project! If you submit as a team, each eligible team member will receive a separate reimbursement.
@@ -204,7 +204,7 @@ FAQ
- This year, 1st, 2nd, and 3rd place teams overall will receive cash prizes of $2500, $1500, and $750 respectively, while the winning teams for our design challenges will receive $750.
+ This year, 1st, 2nd, and 3rd place teams overall will receive cash prizes of $2500, $1500, and $750 CAD respectively, while the winning teams for our design challenges will receive $750 CAD.
@@ -239,7 +239,7 @@ FAQ
- The first 200 people to apply will be able to get a $25 reimbursement after submitting a demo of their project, as an e-transfer to the email used during their application. We'll let you know in your acceptance email if you were one of the first 200 people to apply.
+ The first 200 people to apply will be able to get a $25 CAD reimbursement after submitting a demo of their project, as an e-transfer to the email used during their application. We'll let you know in your acceptance email if you were one of the first 200 people to apply.
diff --git a/hackathon_site/review/jinja2/review/emails/accepted_email_body.html b/hackathon_site/review/jinja2/review/emails/accepted_email_body.html
index fb007fb..01394fc 100644
--- a/hackathon_site/review/jinja2/review/emails/accepted_email_body.html
+++ b/hackathon_site/review/jinja2/review/emails/accepted_email_body.html
@@ -5,7 +5,7 @@
The {{ hackathon_name }} team has reviewed your application, and we’re excited to welcome you to {{ hackathon_name }}!
{% if reimbursement_eligible %}
-Because you were one of the first 200 people to apply, as long as you submit your project you will be eligible for a $25 reimbursement at the end of the event. Once your project has been submitted, you will receive an e-transfer from us to this email address, {{ user.email }}. If you submit with teammates, and any of them also received this message, you will each be separately eligible for the reimbursement.
+Because you were one of the first 200 people to apply, as long as you submit your project you will be eligible for a $25 CAD reimbursement at the end of the event. Once your project has been submitted, you will receive an e-transfer from us to this email address, {{ user.email }}. If you submit with teammates, and any of them also received this message, you will each be separately eligible for the reimbursement.
{% endif %}
Read our participant package for all the info regarding the event, and join our {{ chat_room_name }} . Stay tuned for more updates regarding detailed event logistics, and we hope to see you soon! If you have questions, read the FAQ on your dashboard or feel free to contact us.
diff --git a/hackathon_site/review/tests.py b/hackathon_site/review/tests.py
index 649a2d0..3ad58be 100644
--- a/hackathon_site/review/tests.py
+++ b/hackathon_site/review/tests.py
@@ -381,17 +381,23 @@ def test_first_200_applied_accepted_get_reimbursement_message(self):
# First 50 should have the reimbursement message
for i in range(50):
self.assertIn(
- "you will be eligible for a $25 reimbursement", mail.outbox[i].body, i
+ "you will be eligible for a $25 CAD reimbursement",
+ mail.outbox[i].body,
+ i,
)
# Next 100 (applications 101-200) should have the reimbursement message
for i in range(50, 150):
self.assertIn(
- "you will be eligible for a $25 reimbursement", mail.outbox[i].body, i
+ "you will be eligible for a $25 CAD reimbursement",
+ mail.outbox[i].body,
+ i,
)
# Next 4 (applications 201-204) should not have the message
for i in range(150, 154):
self.assertNotIn(
- "you will be eligible for a $25 reimbursement", mail.outbox[i].body, i
+ "you will be eligible for a $25 CAD reimbursement",
+ mail.outbox[i].body,
+ i,
)
From 60779676189dcea96735d90db0df13e436db24e7 Mon Sep 17 00:00:00 2001
From: Lisa Li <42653157+lisa-sa-li@users.noreply.github.com>
Date: Sun, 24 Jan 2021 17:53:21 -0500
Subject: [PATCH 2/5] Updated sponsorship pic with more sponsors (#57)
---
.../event/static/event/images/sponsors.svg | 3040 ++++++++++-------
1 file changed, 1880 insertions(+), 1160 deletions(-)
diff --git a/hackathon_site/event/static/event/images/sponsors.svg b/hackathon_site/event/static/event/images/sponsors.svg
index 8e96208..576e3f6 100644
--- a/hackathon_site/event/static/event/images/sponsors.svg
+++ b/hackathon_site/event/static/event/images/sponsors.svg
@@ -1,5 +1,5 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 6b1a43d7ab4de2365418396244dd783779448c95 Mon Sep 17 00:00:00 2001
From: Lisa Li <42653157+lisa-sa-li@users.noreply.github.com>
Date: Sun, 24 Jan 2021 22:58:43 -0500
Subject: [PATCH 3/5] Added mention if non-Canadian bank account (#58)
* added mention if non canadian bank account
* added test for new sentence
---
.../review/jinja2/review/emails/accepted_email_body.html | 1 +
hackathon_site/review/tests.py | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/hackathon_site/review/jinja2/review/emails/accepted_email_body.html b/hackathon_site/review/jinja2/review/emails/accepted_email_body.html
index 01394fc..0c320cb 100644
--- a/hackathon_site/review/jinja2/review/emails/accepted_email_body.html
+++ b/hackathon_site/review/jinja2/review/emails/accepted_email_body.html
@@ -7,6 +7,7 @@
{% if reimbursement_eligible %}
Because you were one of the first 200 people to apply, as long as you submit your project you will be eligible for a $25 CAD reimbursement at the end of the event. Once your project has been submitted, you will receive an e-transfer from us to this email address, {{ user.email }}. If you submit with teammates, and any of them also received this message, you will each be separately eligible for the reimbursement.
+If you don't have a Canadian bank account , please email us at {{ contact_email }} so we can arrange an alternative transfer method.
{% endif %}
Read our participant package for all the info regarding the event, and join our {{ chat_room_name }} . Stay tuned for more updates regarding detailed event logistics, and we hope to see you soon! If you have questions, read the FAQ on your dashboard or feel free to contact us.
diff --git a/hackathon_site/review/tests.py b/hackathon_site/review/tests.py
index 3ad58be..88e8a54 100644
--- a/hackathon_site/review/tests.py
+++ b/hackathon_site/review/tests.py
@@ -377,6 +377,10 @@ def test_first_200_applied_accepted_get_reimbursement_message(self):
f"{application.user.email}"
)
self.assertIn(expected_message, mail.outbox[0].body)
+ self.assertIn(
+ f'{settings.CONTACT_EMAIL} ',
+ mail.outbox[0].body,
+ )
# First 50 should have the reimbursement message
for i in range(50):
From b590510987a3ff6b18d385dc77cc05f492c3a77f Mon Sep 17 00:00:00 2001
From: Lisa Li <42653157+lisa-sa-li@users.noreply.github.com>
Date: Sat, 30 Jan 2021 14:39:40 -0500
Subject: [PATCH 4/5] updated logo of Blinq (#59)
---
.../event/static/event/images/sponsors.svg | 1981 +++++++++--------
1 file changed, 1001 insertions(+), 980 deletions(-)
diff --git a/hackathon_site/event/static/event/images/sponsors.svg b/hackathon_site/event/static/event/images/sponsors.svg
index 576e3f6..3bd2917 100644
--- a/hackathon_site/event/static/event/images/sponsors.svg
+++ b/hackathon_site/event/static/event/images/sponsors.svg
@@ -49,51 +49,51 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1473,251 +1473,251 @@
-
@@ -1835,7 +1835,7 @@
-
-
+
-
-
Date: Sun, 21 Feb 2021 12:24:27 -0500
Subject: [PATCH 5/5] Add resumes to application export (#60)
---
hackathon_site/registration/admin.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/hackathon_site/registration/admin.py b/hackathon_site/registration/admin.py
index 0bfb101..9dedaad 100644
--- a/hackathon_site/registration/admin.py
+++ b/hackathon_site/registration/admin.py
@@ -100,6 +100,7 @@ class ApplicationAdmin(admin.ModelAdmin, ExportCsvMixin):
("RSVP", "rsvp"),
("Created At", "created_at"),
("Updated At", "updated_at"),
+ ("Resume", "resume"),
]
def get_full_name(self, obj):