Skip to content

chore: merge dev to main #902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 17, 2023
Merged

chore: merge dev to main #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb3df1c
feat(hacker.js,hacker.middleware.js): add ability for discord verific…
brarsanmol Jan 21, 2022
efc77e3
change invite to disc (#799)
pengyk Jan 21, 2022
d7f9ca4
fix/update emails (#882)
brarsanmol Nov 5, 2022
804243e
Jacky/email (#900)
brarsanmol Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,4 @@ assets/.DS_Store

#secrets
secret.yaml
package-lock.json
2 changes: 1 addition & 1 deletion assets/email/AccountInvitation.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@
have resume access you will be able to download hacker resumes through
the dashboard.
<br><br>
Sponsor check-in starts at 6:00 pm on Friday, January 21st on the
Sponsor check-in starts at 6:00 pm on Saturday, January 28th on the
McHacks Discord server and opening ceremonies will begin at 7:00 pm. Be
sure to get set up on the McHacks Discord server at <a
href="https://discord.gg/XVSdW9pc"
Expand Down
22 changes: 11 additions & 11 deletions assets/email/Ticket.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@

<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>McHacks 6: Important Information</title>
<title>McHacks 10: Important Information</title>
</head>

<body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;height:100% !important;margin-top:0;margin-bottom:0;margin-right:0;margin-left:0;padding-top:0;padding-bottom:0;padding-right:0;padding-left:0;width:100% !important;background-color:#F9F9F9;">
Expand Down Expand Up @@ -367,11 +367,11 @@
<tr>
<td valign="top" class="bodyContent" mc:edit="body_content00" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;mso-table-lspace:0pt;mso-table-rspace:0pt;color:#202020;font-family:'Hind', Helvetica;font-size:14px;line-height:150%;padding-top:36px;padding-right:30px;padding-bottom:20px;padding-left:30px;text-align:left;">
<h1 style="display:block;font-family:'Brown', Helvetica;font-size:26px;font-style:normal;font-weight:700;line-height:100%;letter-spacing:normal;color:#F2463A !important;margin-top:0;margin-right:0;margin-bottom:28px;margin-left:0px;text-align:center;">4
Days until McHacks 6!</h1>
Days until McHacks 10!</h1>
<p style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;">
Hi {{firstName}}!
<br><br>
McHacks 6 is this coming weekend and we're excited to spend an epic
McHacks 10 is this coming weekend and we're excited to spend an epic
weekend with you hacking away! 🎉
<br><br>
Before we get to that, let's go through some important information to
Expand All @@ -383,9 +383,9 @@
with other hackers, and form teams!
<br><br>
During the hackathon, we'll be using both the FB group and the official
<a href="https://join.slack.com/t/mchacks6/shared_invite/enQtNTIyODg4MTM0OTQ5LTM2MzNmOGE5M2QyNTZkY2U2MmQwYjc4ZTM3YzA5YzhjZGU3ODVkZDVkYWE2YTY5ZmE1MTQyNmY1NjE2NGQ1MDM"
<a href="https://discord.com/invite/fqbjr43cKf"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">McHacks
6 Slack</a>. Be sure to join the Slack so you're updated on
10 Discord</a>. Be sure to join the Discord so you're updated on
everything going on as they happen!
<br><br>
We'll also have a live site with the schedule, announcements, and
Expand Down Expand Up @@ -420,7 +420,7 @@
together. 🍃
<br><br>
<h2 style="display:block;font-family:'Brown', Helvetica;font-size:18px;font-style:normal;font-weight:700;line-height:100%;letter-spacing:normal;color:#F2463A !important;margin-top:0;margin-right:0;margin-left:0px;text-align:left;">Transportation</h2>
McHacks 6 will be hosted at <a href="https://goo.gl/maps/2nHsXtvLDNK2"
McHacks 10 will be hosted at <a href="https://goo.gl/maps/2nHsXtvLDNK2"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Theatre
St James</a> in the Old Port of Montreal.
<br><br>
Expand All @@ -433,8 +433,8 @@
Policy</h2>
All projects built at our hackathon can be made by teams of 1-4 people.
If you're looking to find like-minded participants to work with, you
can post in our <a href="https://facebook.com/groups/mchacks6" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook
group</a> or in #team-formation on Slack.
can post in our <a href="https://facebook.com/groups/mchacks" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook
group</a> or in #team-formation on Discord.
<br><br>
In the interest of fairness, participants aren't allowed to work on
pre-existing projects or begin their projects before hacking at McHacks
Expand All @@ -443,7 +443,7 @@
<br><br>
That being said, you're more than welcome to familiarize yourself with
all the tech and tools you intend to build with beforehand! You can
check our <a href="https://mchacks6.devpost.com" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Devpost</a>
check our <a href="https://mchacks10.devpost.com" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Devpost</a>
which will be updated soon with our available prizes to inspire ideas
for your project! 🎁
<br><br>
Expand All @@ -452,7 +452,7 @@
Follow us on <a href="https://facebook.com/mcgillhacks" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook</a>,
<a href="https://twitter.com/mcgillhacks" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Twitter</a>,
and <a href="https://instagram.com/mcgillhacks" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Instagram</a>
for important updates and news about McHacks 6! If you have any
for important updates and news about McHacks 10! If you have any
questions, feel free to reach out at <a href="mailto:contact@mchacks.ca"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">contact@mchacks.ca</a>.
</p>
Expand Down Expand Up @@ -497,4 +497,4 @@
</center>
</body>

</html>
</html>
18 changes: 9 additions & 9 deletions assets/email/Welcome.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@

<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>McHacks 6: Important Information</title>
<title>McHacks 10: Important Information</title>
</head>

<body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;height:100% !important;margin-top:0;margin-bottom:0;margin-right:0;margin-left:0;padding-top:0;padding-bottom:0;padding-right:0;padding-left:0;width:100% !important;background-color:#F9F9F9;">
Expand Down Expand Up @@ -367,12 +367,12 @@
<tr>
<td valign="top" class="bodyContent" mc:edit="body_content00" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;mso-table-lspace:0pt;mso-table-rspace:0pt;color:#202020;font-family:'Hind', Helvetica;font-size:14px;line-height:150%;padding-top:36px;padding-right:30px;padding-bottom:20px;padding-left:30px;text-align:left;">
<h1 style="display:block;font-family:'Brown', Helvetica;font-size:26px;font-style:normal;font-weight:700;line-height:100%;letter-spacing:normal;color:#F2463A !important;margin-top:0;margin-right:0;margin-bottom:28px;margin-left:0px;text-align:center;">
Welcome to McHacks 6!
Welcome to McHacks 10!
</h1>
<p style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;">
Hi {{firstName}}!
<br><br>
McHacks 6 is finally here, and we're excited to spend an epic
McHacks 10 is finally here, and we're excited to spend an epic
weekend with you hacking away! 🎉
<br><br>
Before we get to that, let's go through some important information to
Expand All @@ -384,9 +384,9 @@
with other hackers, and form teams!
<br><br>
During the hackathon, we'll be using both the FB group and the official
<a href="https://join.slack.com/t/mchacks6/shared_invite/enQtNTIyODg4MTM0OTQ5LTM2MzNmOGE5M2QyNTZkY2U2MmQwYjc4ZTM3YzA5YzhjZGU3ODVkZDVkYWE2YTY5ZmE1MTQyNmY1NjE2NGQ1MDM"
<a href="https://discord.com/invite/fqbjr43cKf"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">McHacks
6 Slack</a>. Be sure to join the Slack so you're updated on
10 Discord</a>. Be sure to join the Discord so you're updated on
everything going on as they happen!
<br><br>
We'll also have a live site with the schedule, announcements, and
Expand All @@ -397,8 +397,8 @@
Policy</h2>
All projects built at our hackathon can be made by teams of 1-4 people.
If you're looking to find like-minded participants to work with, you
can post in our <a href="https://facebook.com/groups/mchacks6" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook
group</a> or in #team-formation on Slack.
can post in our <a href="https://facebook.com/groups/mchacks" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook
group</a> or in #team-formation on Discord.
<br><br>
In the interest of fairness, participants aren't allowed to work on
pre-existing projects or begin their projects before hacking at McHacks
Expand All @@ -416,7 +416,7 @@
Follow us on <a href="https://facebook.com/mcgillhacks" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook</a>,
<a href="https://twitter.com/mcgillhacks" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Twitter</a>,
and <a href="https://instagram.com/mcgillhacks" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Instagram</a>
for important updates and news about McHacks 6! If you have any
for important updates and news about McHacks 10! If you have any
questions, feel free to reach out at <a href="mailto:contact@mchacks.ca"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">contact@mchacks.ca</a>.
</p>
Expand Down Expand Up @@ -461,4 +461,4 @@
</center>
</body>

</html>
</html>
2 changes: 1 addition & 1 deletion assets/email/marketingEmail/3Days.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;">
<br><br>
There’s just 3 days left to apply to Canada’s favorite hackathon! Have
you started your McHacks 7 application yet? What are you waiting for?
you started your McHacks 10 application yet? What are you waiting for?
<br><br>
McHacks is back this winter for round 7! Join us February 1-2, 2020 in
the beautiful city of Montreal for a weekend full of engaging workshops,
Expand Down
2 changes: 1 addition & 1 deletion assets/email/marketingEmail/EmailBlast.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
<br><br>
💻 Getting the latest McHacks update...
<br><br>
🚀 Update complete. You're now ready for McHacks 7! 😀🎉
🚀 Update complete. You're now ready for McHacks 10! 😀🎉
<br><br>
Canada's favorite hackathon is back again this winter and better than
ever! Join us on February 1-2, 2020 for a weekend full of engaging
Expand Down
2 changes: 1 addition & 1 deletion assets/email/statusEmail/Accepted.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@
<br><br>
Confirm your attendance on our <a href="https://app.mchacks.ca/"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">hacker
dashboard</a> no later than <b>January 17th at 11:59PM EST</b>.
dashboard</a> no later than <b>January 21th at 11:59PM EST</b>.
<br><br>
If you can no longer attend McHacks, please let us know as soon as
possible by withdrawing your application on our <a
Expand Down
6 changes: 3 additions & 3 deletions assets/email/statusEmail/Applied.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,9 +393,9 @@
href="https://app.mchacks.ca/"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">hacker
dashboard</a> until the deadline on <b
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-weight: 700;">December
26th at
12:00pm ET</b>.
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-weight: 700;">January
13th at
11:59 PM ET</b>.
<br><br>
In the meantime, follow us on <a href="https://facebook.com/mcgillhacks"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook</a>,
Expand Down
7 changes: 2 additions & 5 deletions assets/email/statusEmail/Checked-in.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,11 +390,8 @@
This email is to confirm your check-in at McHacks!
<br><br>
Don't forget to join the McHacks participants <a
href="https://facebook.com/groups/mchacks7"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook
group</a> and <a
href="https://join.slack.com/t/mchacks7/shared_invite/enQtOTA3MDc2NDU4OTAyLTI0ZWU1N2VkOGExZTA3NDg3Y2JiMGE3MGE2ZmU4MGRlYjI3YmZlYjAxYmI0OTk2ZjZjYTE0ZjNhYmY0ZDNmZmU"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Slack</a>
href="https://discord.com/invite/fqbjr43cKf"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Discord</a>
for announcements, to chat with other hackers, ask questions, and form
teams!

Expand Down
Loading