Skip to content

release: version 3.1.2 #689

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 2 commits into from
Jan 23, 2021
Merged

release: version 3.1.2 #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecb3acc
feat: Hacker location fields (#687)
Tony9984 Jan 22, 2021
94f63a3
feat: update emails and bump version
logan-r Jan 23, 2021
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
13 changes: 1 addition & 12 deletions assets/email/statusEmail/Accepted.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,20 +390,9 @@
We’re thrilled to offer you a spot at McHacks! We can't wait to see what
you create with us this year.
<br><br>
Here are your next steps:
<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 20th at 11:59PM EST</b>.
<br><br>
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>
for announcements, to chat with other hackers, ask questions, and form
teams!
dashboard</a> no later than <b>January 25th 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
24 changes: 5 additions & 19 deletions assets/email/statusEmail/Confirmed.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,31 +387,17 @@
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;">
Hi, {{firstName}},
<br><br>
Thanks for confirming your attendance and securing your spot at McHacks!
Thanks for confirming your attendance for McHacks! We hope you’re just
as excited as we are. Keep an eye out for our week-of email with more
details regarding McHacks. Happy hacking!
<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>
for announcements, to chat with other hackers, ask questions, and form
teams!
<br><br>
If plans change and you can no longer attend McHacks, please let us know
as soon as
possible by withdrawing your application 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> so we can pass your spot along to someone else.
<br><br>
In the meantime, follow us on <a href="https://facebook.com/mcgillhacks"
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! If you have any questions,
for important updates about McHacks! 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>.
<br><br>
Expand Down
9 changes: 1 addition & 8 deletions assets/email/statusEmail/Declined.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,24 +394,17 @@
unfortunately can't accept everyone. We hope you understand and
encourage you to apply again in the future.
<br><br>
If you’re still interested in attending McHacks, we’ve opened up our <a
href="https://forms.gle/9csdw9jbfw4ePWz96"
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">volunteer
applications</a> as well.
<br><br>
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.
for important updates about McHacks.
<br><br>
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>.
<br><br>
We hope to see you next year!
</p>
<p
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;">
Expand Down
4,151 changes: 4,150 additions & 1 deletion docs/api/api_data.js
View file
Open in desktop

Large diffs are not rendered by default.

4,151 changes: 4,150 additions & 1 deletion docs/api/api_data.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions middlewares/validators/hacker.validator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,10 @@ module.exports = {
100
),
VALIDATOR.mongoIdValidator("body", "application.team", true),
VALIDATOR.mongoIdValidator("body", "teamId", true)
VALIDATOR.stringValidator("body", "application.location.timeZone", true),
VALIDATOR.stringValidator("body", "application.location.country", true),
VALIDATOR.stringValidator("body", "application.location.city", true),
VALIDATOR.mongoIdValidator("body", "teamId", true),
],

updateConfirmationValidator: [
Expand Down Expand Up @@ -253,7 +256,10 @@ module.exports = {
0,
100
),
VALIDATOR.mongoIdValidator("body", "application.team", true)
VALIDATOR.mongoIdValidator("body", "application.team", true),
VALIDATOR.stringValidator("body", "application.location.timeZone", true),
VALIDATOR.stringValidator("body", "application.location.country", true),
VALIDATOR.stringValidator("body", "application.location.city", true),
],
updateStatusValidator: [
VALIDATOR.enumValidator(
Expand Down
16 changes: 15 additions & 1 deletion models/hacker.model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,26 @@ const HackerSchema = new mongoose.Schema({
team: {
type: mongoose.Schema.Types.ObjectId,
ref: "Team"
},
location: {
timeZone: {
type: String,
default: ""
},
country: {
type: String,
default: ""
},
city: {
type: String,
default: ""
}
}
},
teamId: {
type: mongoose.Schema.Types.ObjectId,
ref: "Team"
}
},
});

HackerSchema.methods.toJSON = function() {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hackerAPI",
"version": "3.1.1",
"version": "3.1.2",
"private": true,
"scripts": {
"start": "DEBUG=hackboard:* NODE_ENV=test nodemon --ignore gcp_creds.json ./bin/www.js",
Expand Down
30 changes: 30 additions & 0 deletions routes/api/hacker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,11 @@ module.exports = {
"accomodation": {
"travel": 0
},
"location": {
"timeZone": "GMT-5",
"country": "Canada",
"city": "Montreal"
}
}

* }
Expand Down Expand Up @@ -171,6 +176,11 @@ module.exports = {
"accomodation": {
"travel": 0
},
"location": {
"timeZone": "GMT-5",
"country": "Canada",
"city": "Montreal"
}
}
* }

Expand Down Expand Up @@ -461,6 +471,11 @@ module.exports = {
"accomodation": {
"travel": 0
},
"location": {
"timeZone": "GMT-5",
"country": "Canada",
"city": "Montreal"
}
}
}
*
Expand Down Expand Up @@ -504,6 +519,11 @@ module.exports = {
"accomodation": {
"travel": 0
},
"location": {
"timeZone": "GMT-5",
"country": "Canada",
"city": "Montreal"
}
}
}
* }
Expand Down Expand Up @@ -576,6 +596,11 @@ module.exports = {
"accomodation": {
"travel": 0
},
"location": {
"timeZone": "GMT-5",
"country": "Canada",
"city": "Montreal"
}
}
}
}
Expand Down Expand Up @@ -644,6 +669,11 @@ module.exports = {
"accomodation": {
"travel": 0
},
"location": {
"timeZone": "GMT-5",
"country": "Canada",
"city": "Montreal"
}
}
}
}
Expand Down