Skip to content

Commit 66b09e2

Browse files
logan-rTony9984
logan-r
and
Tony9984
authored
release: version 3.1.2 (#689)
* feat: Hacker location fields (#687) * feat: add additional optional fields for hacker location * feat: update documentation to include hacker location * feat: update emails and bump version Co-authored-by: Tony <36376980+Tony9984@users.noreply.github.com>
1 parent c279192 commit 66b09e2

9 files changed

Lines changed: 8361 additions & 45 deletions

File tree

‎assets/email/statusEmail/Accepted.hbs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -390,20 +390,9 @@
390390
We’re thrilled to offer you a spot at McHacks! We can't wait to see what
391391
you create with us this year.
392392
<br><br>
393-
Here are your next steps:
394-
<br><br>
395393
Confirm your attendance on our <a href="https://app.mchacks.ca/"
396394
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">hacker
397-
dashboard</a> no later than <b>January 20th at 11:59PM EST</b>.
398-
<br><br>
399-
Join the McHacks participants <a
400-
href="https://facebook.com/groups/mchacks7"
401-
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook
402-
group</a> and <a
403-
href="https://join.slack.com/t/mchacks7/shared_invite/enQtOTA3MDc2NDU4OTAyLTI0ZWU1N2VkOGExZTA3NDg3Y2JiMGE3MGE2ZmU4MGRlYjI3YmZlYjAxYmI0OTk2ZjZjYTE0ZjNhYmY0ZDNmZmU"
404-
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Slack</a>
405-
for announcements, to chat with other hackers, ask questions, and form
406-
teams!
395+
dashboard</a> no later than <b>January 25th at 11:59PM EST</b>.
407396
<br><br>
408397
If you can no longer attend McHacks, please let us know as soon as
409398
possible by withdrawing your application on our <a

‎assets/email/statusEmail/Confirmed.hbs‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -387,31 +387,17 @@
387387
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;">
388388
Hi, {{firstName}},
389389
<br><br>
390-
Thanks for confirming your attendance and securing your spot at McHacks!
390+
Thanks for confirming your attendance for McHacks! We hope you’re just
391+
as excited as we are. Keep an eye out for our week-of email with more
392+
details regarding McHacks. Happy hacking!
391393
<br><br>
392-
Don't forget to join the McHacks participants <a
393-
href="https://facebook.com/groups/mchacks7"
394-
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook
395-
group</a> and <a
396-
href="https://join.slack.com/t/mchacks7/shared_invite/enQtOTA3MDc2NDU4OTAyLTI0ZWU1N2VkOGExZTA3NDg3Y2JiMGE3MGE2ZmU4MGRlYjI3YmZlYjAxYmI0OTk2ZjZjYTE0ZjNhYmY0ZDNmZmU"
397-
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Slack</a>
398-
for announcements, to chat with other hackers, ask questions, and form
399-
teams!
400-
<br><br>
401-
If plans change and you can no longer attend McHacks, please let us know
402-
as soon as
403-
possible by withdrawing your application on our <a
404-
href="https://app.mchacks.ca/"
405-
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">hacker
406-
dashboard</a> so we can pass your spot along to someone else.
407-
<br><br>
408-
In the meantime, follow us on <a href="https://facebook.com/mcgillhacks"
394+
Follow us on <a href="https://facebook.com/mcgillhacks"
409395
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook</a>,
410396
<a href="https://twitter.com/mcgillhacks"
411397
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Twitter</a>,
412398
and <a href="https://instagram.com/mcgillhacks"
413399
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Instagram</a>
414-
for important updates and news about McHacks! If you have any questions,
400+
for important updates about McHacks! If you have any questions,
415401
feel free to reach out at <a href="mailto:contact@mchacks.ca"
416402
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">contact@mchacks.ca</a>.
417403
<br><br>

‎assets/email/statusEmail/Declined.hbs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -394,24 +394,17 @@
394394
unfortunately can't accept everyone. We hope you understand and
395395
encourage you to apply again in the future.
396396
<br><br>
397-
If you’re still interested in attending McHacks, we’ve opened up our <a
398-
href="https://forms.gle/9csdw9jbfw4ePWz96"
399-
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">volunteer
400-
applications</a> as well.
401-
<br><br>
402397
Follow us on <a href="https://facebook.com/mcgillhacks"
403398
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Facebook</a>,
404399
<a href="https://twitter.com/mcgillhacks"
405400
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Twitter</a>,
406401
and <a href="https://instagram.com/mcgillhacks"
407402
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">Instagram</a>
408-
for important updates and news about McHacks.
403+
for important updates about McHacks.
409404
<br><br>
410405
If you have any questions,
411406
feel free to reach out at <a href="mailto:contact@mchacks.ca"
412407
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">contact@mchacks.ca</a>.
413-
<br><br>
414-
We hope to see you next year!
415408
</p>
416409
<p
417410
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;">

‎docs/api/api_data.js‎

Lines changed: 4150 additions & 1 deletion
Large diffs are not rendered by default.

‎docs/api/api_data.json‎

Lines changed: 4150 additions & 1 deletion
Large diffs are not rendered by default.

‎middlewares/validators/hacker.validator.js‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,10 @@ module.exports = {
126126
100
127127
),
128128
VALIDATOR.mongoIdValidator("body", "application.team", true),
129-
VALIDATOR.mongoIdValidator("body", "teamId", true)
129+
VALIDATOR.stringValidator("body", "application.location.timeZone", true),
130+
VALIDATOR.stringValidator("body", "application.location.country", true),
131+
VALIDATOR.stringValidator("body", "application.location.city", true),
132+
VALIDATOR.mongoIdValidator("body", "teamId", true),
130133
],
131134

132135
updateConfirmationValidator: [
@@ -253,7 +256,10 @@ module.exports = {
253256
0,
254257
100
255258
),
256-
VALIDATOR.mongoIdValidator("body", "application.team", true)
259+
VALIDATOR.mongoIdValidator("body", "application.team", true),
260+
VALIDATOR.stringValidator("body", "application.location.timeZone", true),
261+
VALIDATOR.stringValidator("body", "application.location.country", true),
262+
VALIDATOR.stringValidator("body", "application.location.city", true),
257263
],
258264
updateStatusValidator: [
259265
VALIDATOR.enumValidator(

‎models/hacker.model.js‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,26 @@ const HackerSchema = new mongoose.Schema({
131131
team: {
132132
type: mongoose.Schema.Types.ObjectId,
133133
ref: "Team"
134+
},
135+
location: {
136+
timeZone: {
137+
type: String,
138+
default: ""
139+
},
140+
country: {
141+
type: String,
142+
default: ""
143+
},
144+
city: {
145+
type: String,
146+
default: ""
147+
}
134148
}
135149
},
136150
teamId: {
137151
type: mongoose.Schema.Types.ObjectId,
138152
ref: "Team"
139-
}
153+
},
140154
});
141155

142156
HackerSchema.methods.toJSON = function() {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hackerAPI",
3-
"version": "3.1.1",
3+
"version": "3.1.2",
44
"private": true,
55
"scripts": {
66
"start": "DEBUG=hackboard:* NODE_ENV=test nodemon --ignore gcp_creds.json ./bin/www.js",

‎routes/api/hacker.js‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,11 @@ module.exports = {
128128
"accomodation": {
129129
"travel": 0
130130
},
131+
"location": {
132+
"timeZone": "GMT-5",
133+
"country": "Canada",
134+
"city": "Montreal"
135+
}
131136
}
132137
133138
* }
@@ -171,6 +176,11 @@ module.exports = {
171176
"accomodation": {
172177
"travel": 0
173178
},
179+
"location": {
180+
"timeZone": "GMT-5",
181+
"country": "Canada",
182+
"city": "Montreal"
183+
}
174184
}
175185
* }
176186
@@ -461,6 +471,11 @@ module.exports = {
461471
"accomodation": {
462472
"travel": 0
463473
},
474+
"location": {
475+
"timeZone": "GMT-5",
476+
"country": "Canada",
477+
"city": "Montreal"
478+
}
464479
}
465480
}
466481
*
@@ -504,6 +519,11 @@ module.exports = {
504519
"accomodation": {
505520
"travel": 0
506521
},
522+
"location": {
523+
"timeZone": "GMT-5",
524+
"country": "Canada",
525+
"city": "Montreal"
526+
}
507527
}
508528
}
509529
* }
@@ -576,6 +596,11 @@ module.exports = {
576596
"accomodation": {
577597
"travel": 0
578598
},
599+
"location": {
600+
"timeZone": "GMT-5",
601+
"country": "Canada",
602+
"city": "Montreal"
603+
}
579604
}
580605
}
581606
}
@@ -644,6 +669,11 @@ module.exports = {
644669
"accomodation": {
645670
"travel": 0
646671
},
672+
"location": {
673+
"timeZone": "GMT-5",
674+
"country": "Canada",
675+
"city": "Montreal"
676+
}
647677
}
648678
}
649679
}

0 commit comments

Comments
 (0)