From 412be3726fcb0d278e9a112d7b5075d7b317504a Mon Sep 17 00:00:00 2001 From: Alex Todd Date: Thu, 10 Aug 2017 02:54:58 -0500 Subject: [PATCH 01/23] Change email addresses to placeholders --- .env.config | 4 ++-- app.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.config b/.env.config index d2aea9b1d..04cc2df66 100644 --- a/.env.config +++ b/.env.config @@ -14,11 +14,11 @@ JWT_SECRET='shhhh super secret code here bro' ROOT_URL='http://localhost:3000' # Credentials for the admin user created at app initialization -ADMIN_EMAIL='admin@hackmit.org' +ADMIN_EMAIL='admin@example.org' ADMIN_PASS='party' # Used to send verification, registration, and confirmation emails -EMAIL_CONTACT='HackMIT Team ' +EMAIL_CONTACT='HackMIT Team ' EMAIL_HOST='smtp.gmail.com' EMAIL_USER='foo@bar.com' EMAIL_PASS='password' diff --git a/app.json b/app.json index 4b8cf78a5..d9f3994ea 100644 --- a/app.json +++ b/app.json @@ -16,12 +16,12 @@ }, "ADMIN_EMAIL": { "description": "Credentials for the admin user created at app initialization", - "value": "admin@hackmit.org" + "value": "admin@example.org" }, "ADMIN_PASS": "party", "EMAIL_CONTACT": { "description": "Used to send verification, registration, and confirmation emails", - "value": "HackMIT Team " + "value": "HackMIT Team " }, "EMAIL_HOST": "smtp.gmail.com", "EMAIL_USER": "foo@bar.com", From a948d038d1db1565bcda85692fceb9aeaacaf9a0 Mon Sep 17 00:00:00 2001 From: Alex Todd Date: Fri, 11 Aug 2017 20:04:10 -0500 Subject: [PATCH 02/23] Remove HackMIT --- app.json | 2 +- app/server/templates/email-basic/html.hbs | 2 +- app/server/templates/email-link-action/html.hbs | 2 +- app/server/templates/email-verify/html.hbs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app.json b/app.json index d9f3994ea..a7fa58552 100644 --- a/app.json +++ b/app.json @@ -21,7 +21,7 @@ "ADMIN_PASS": "party", "EMAIL_CONTACT": { "description": "Used to send verification, registration, and confirmation emails", - "value": "HackMIT Team " + "value": "Hackathon Team " }, "EMAIL_HOST": "smtp.gmail.com", "EMAIL_USER": "foo@bar.com", diff --git a/app/server/templates/email-basic/html.hbs b/app/server/templates/email-basic/html.hbs index 911b1ee37..61e890ebb 100644 --- a/app/server/templates/email-basic/html.hbs +++ b/app/server/templates/email-basic/html.hbs @@ -55,7 +55,7 @@ Follow on Twitter   Like on Facebook    - Email Us + Email Us diff --git a/app/server/templates/email-link-action/html.hbs b/app/server/templates/email-link-action/html.hbs index f88d57079..168ebf154 100644 --- a/app/server/templates/email-link-action/html.hbs +++ b/app/server/templates/email-link-action/html.hbs @@ -61,7 +61,7 @@ Follow on Twitter   Like on Facebook    - Email Us + Email Us diff --git a/app/server/templates/email-verify/html.hbs b/app/server/templates/email-verify/html.hbs index 68871f8ab..015734d68 100644 --- a/app/server/templates/email-verify/html.hbs +++ b/app/server/templates/email-verify/html.hbs @@ -61,7 +61,7 @@ Follow on Twitter   Like on Facebook    - Email Us + Email Us From 2d7956f17165d7ed33508628c3ae1e9a32559fee Mon Sep 17 00:00:00 2001 From: Alex Todd Date: Fri, 11 Aug 2017 20:04:30 -0500 Subject: [PATCH 03/23] Add .env.config to changes --- .env.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.config b/.env.config index 04cc2df66..6df72aaae 100644 --- a/.env.config +++ b/.env.config @@ -18,7 +18,7 @@ ADMIN_EMAIL='admin@example.org' ADMIN_PASS='party' # Used to send verification, registration, and confirmation emails -EMAIL_CONTACT='HackMIT Team ' +EMAIL_CONTACT='Hackathon Team ' EMAIL_HOST='smtp.gmail.com' EMAIL_USER='foo@bar.com' EMAIL_PASS='password' From 3dbaa95c155db2c740745a826ab815835c1589d4 Mon Sep 17 00:00:00 2001 From: Alex Todd Date: Fri, 11 Aug 2017 20:46:04 -0500 Subject: [PATCH 04/23] Populate emails from .env --- .env.config | 6 +++++- app.json | 15 ++++++++++++++- app/server/services/email.js | 17 +++++++++++++---- app/server/templates/email-basic/html.hbs | 8 ++++---- app/server/templates/email-link-action/html.hbs | 8 ++++---- app/server/templates/email-verify/html.hbs | 10 +++++----- 6 files changed, 45 insertions(+), 19 deletions(-) diff --git a/.env.config b/.env.config index 6df72aaae..67bff70af 100644 --- a/.env.config +++ b/.env.config @@ -14,10 +14,14 @@ JWT_SECRET='shhhh super secret code here bro' ROOT_URL='http://localhost:3000' # Credentials for the admin user created at app initialization -ADMIN_EMAIL='admin@example.org' +ADMIN_EMAIL='admin@example.com' ADMIN_PASS='party' # Used to send verification, registration, and confirmation emails +EMAIL_ADDRESS='team@example.com' +HACKATHON_NAME='Hackathon' +TWITTER_HANDLE='hackathon' +FACEBOOK_HANDLE='hackathon' EMAIL_CONTACT='Hackathon Team ' EMAIL_HOST='smtp.gmail.com' EMAIL_USER='foo@bar.com' diff --git a/app.json b/app.json index a7fa58552..e5bd55026 100644 --- a/app.json +++ b/app.json @@ -16,9 +16,22 @@ }, "ADMIN_EMAIL": { "description": "Credentials for the admin user created at app initialization", - "value": "admin@example.org" + "value": "admin@example.com" }, "ADMIN_PASS": "party", + "EMAIL_ADDRESS": { + "description": "The email address that is included in the 'email us' link at the bottom of emails.", + "value": "team@example.com" + }, + "HACKATHON_NAME": "Hackathon", + "TWITTER_HANDLE": { + "description": "Everything after https://twitter.com/", + "value": "hackathon" + }, + "FACEBOOK_HANDLE": { + "description": "Everything after https://facebook.com/", + "value": "hackathon" + }, "EMAIL_CONTACT": { "description": "Used to send verification, registration, and confirmation emails", "value": "Hackathon Team " diff --git a/app/server/services/email.js b/app/server/services/email.js index 3cb40ce23..117af6b5e 100644 --- a/app/server/services/email.js +++ b/app/server/services/email.js @@ -7,6 +7,11 @@ var emailTemplates = require('email-templates'); var ROOT_URL = process.env.ROOT_URL; +var HACKATHON_NAME = process.env.HACKATHON_NAME; +var EMAIL_ADDRESS = process.env.EMAIL_ADDRESS; +var TWITTER_HANDLE = proccess.env.TWITTER_HANDLE; +var FACEBOOK_HANDLE = proccess.env.FACEBOOK_HANDLE; + var EMAIL_HOST = process.env.EMAIL_HOST; var EMAIL_USER = process.env.EMAIL_USER; var EMAIL_PASS = process.env.EMAIL_PASS; @@ -48,6 +53,10 @@ function sendOne(templateName, options, data, callback){ } data.emailHeaderImage = EMAIL_HEADER_IMAGE; + data.emailAddress = EMAIL_ADDRESS; + data.hackathonName = HACKATHON_NAME; + data.twitterHandle = TWITTER_HANDLE; + data.facebookHandle = FACEBOOK_HANDLE; template(templateName, data, function(err, html, text){ if (err) { return callback(err); @@ -79,7 +88,7 @@ controller.sendVerificationEmail = function(email, token, callback) { var options = { to: email, - subject: "[HACKMIT] - Verify your email" + subject: "[HACKATHON] - Verify your email" }; var locals = { @@ -116,7 +125,7 @@ controller.sendPasswordResetEmail = function(email, token, callback) { var options = { to: email, - subject: "[HACKMIT] - Password reset requested!" + subject: "[HACKATHON] - Password reset requested!" }; var locals = { @@ -157,7 +166,7 @@ controller.sendPasswordChangedEmail = function(email, callback){ var options = { to: email, - subject: "[HACKMIT] - Your password has been changed!" + subject: "[HACKATHON] - Your password has been changed!" }; var locals = { @@ -185,4 +194,4 @@ controller.sendPasswordChangedEmail = function(email, callback){ }; -module.exports = controller; \ No newline at end of file +module.exports = controller; diff --git a/app/server/templates/email-basic/html.hbs b/app/server/templates/email-basic/html.hbs index 61e890ebb..01652b70c 100644 --- a/app/server/templates/email-basic/html.hbs +++ b/app/server/templates/email-basic/html.hbs @@ -39,7 +39,7 @@ Thanks,
- The HackMIT Team + The {{ hackathonName }} Team @@ -54,13 +54,13 @@ diff --git a/app/server/templates/email-link-action/html.hbs b/app/server/templates/email-link-action/html.hbs index 168ebf154..d993da154 100644 --- a/app/server/templates/email-link-action/html.hbs +++ b/app/server/templates/email-link-action/html.hbs @@ -45,7 +45,7 @@ @@ -60,13 +60,13 @@
- Follow on Twitter   Like on Facebook    - Email Us + Follow on Twitter   Like on Facebook    + Email Us
- Copyright © HackMIT 2015, All rights reserved. + Copyright © {{ hackathonName }} 2017, All rights reserved.
Thanks,
- The HackMIT Team + The {{ hackathonName }} Team
diff --git a/app/server/templates/email-verify/html.hbs b/app/server/templates/email-verify/html.hbs index 015734d68..d8d901369 100644 --- a/app/server/templates/email-verify/html.hbs +++ b/app/server/templates/email-verify/html.hbs @@ -31,7 +31,7 @@ @@ -60,13 +60,13 @@
- Follow on Twitter   Like on Facebook    - Email Us + Follow on Twitter   Like on Facebook    + Email Us
- Copyright © HackMIT 2015, All rights reserved. + Copyright © {{ hackathonName }} 2017, All rights reserved.

Verify Your Email

-

Thanks for signing up for HackMIT 2015!

+

Thanks for signing up for {{ hackathonName }}!

To verify your email, click the button below.

@@ -45,7 +45,7 @@ 		Thanks,
- The HackMIT Team + The {{ hackathonName }} Team
From 98848d0bff816939d8475bdebdd129121061ef12 Mon Sep 17 00:00:00 2001 From: Alex Todd Date: Wed, 16 Aug 2017 00:41:45 -0500 Subject: [PATCH 05/23] Separate email config/display values --- .env.config | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.env.config b/.env.config index 67bff70af..b1a4ec1ce 100644 --- a/.env.config +++ b/.env.config @@ -18,10 +18,6 @@ ADMIN_EMAIL='admin@example.com' ADMIN_PASS='party' # Used to send verification, registration, and confirmation emails -EMAIL_ADDRESS='team@example.com' -HACKATHON_NAME='Hackathon' -TWITTER_HANDLE='hackathon' -FACEBOOK_HANDLE='hackathon' EMAIL_CONTACT='Hackathon Team ' EMAIL_HOST='smtp.gmail.com' EMAIL_USER='foo@bar.com' @@ -29,6 +25,12 @@ EMAIL_PASS='password' EMAIL_PORT='465' EMAIL_HEADER_IMAGE='https://s3.amazonaws.com/hackmit-assets/Banner_600.jpg' +# Information linked at the bottom of emails +EMAIL_ADDRESS='team@example.com' +HACKATHON_NAME='Hackathon' +TWITTER_HANDLE='hackathon' +FACEBOOK_HANDLE='hackathon' + # Limits the number of users that can join a team TEAM_MAX_SIZE=4 From 944365edc25635f60b4645e67e25f4eb666585e6 Mon Sep 17 00:00:00 2001 From: Alex Todd Date: Wed, 16 Aug 2017 10:59:01 -0500 Subject: [PATCH 06/23] Fix typo --- app/server/services/email.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/server/services/email.js b/app/server/services/email.js index 117af6b5e..a6471908a 100644 --- a/app/server/services/email.js +++ b/app/server/services/email.js @@ -9,8 +9,8 @@ var ROOT_URL = process.env.ROOT_URL; var HACKATHON_NAME = process.env.HACKATHON_NAME; var EMAIL_ADDRESS = process.env.EMAIL_ADDRESS; -var TWITTER_HANDLE = proccess.env.TWITTER_HANDLE; -var FACEBOOK_HANDLE = proccess.env.FACEBOOK_HANDLE; +var TWITTER_HANDLE = process.env.TWITTER_HANDLE; +var FACEBOOK_HANDLE = process.env.FACEBOOK_HANDLE; var EMAIL_HOST = process.env.EMAIL_HOST; var EMAIL_USER = process.env.EMAIL_USER; From fa9427adf2945b3186aed0aece88c37ac0587b70 Mon Sep 17 00:00:00 2001 From: Alex Todd Date: Thu, 17 Aug 2017 03:27:24 -0500 Subject: [PATCH 07/23] Show registration/confirmation deadline on dashboard --- app/client/views/dashboard/dashboard.html | 18 ++++++++++++++++++ app/client/views/dashboard/dashboardCtrl.js | 5 +++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/client/views/dashboard/dashboard.html b/app/client/views/dashboard/dashboard.html index b107314ab..2372532ec 100644 --- a/app/client/views/dashboard/dashboard.html +++ b/app/client/views/dashboard/dashboard.html @@ -59,6 +59,24 @@ +
+ + Registration Deadline: + + {{ timeClose }} +
+ +
+ + Confirmation Deadline: + + {{ timeConfirm }} +
+
diff --git a/app/client/views/dashboard/dashboardCtrl.js b/app/client/views/dashboard/dashboardCtrl.js index b7b910876..9a6f8595f 100644 --- a/app/client/views/dashboard/dashboardCtrl.js +++ b/app/client/views/dashboard/dashboardCtrl.js @@ -14,9 +14,11 @@ angular.module('reg') var Settings = settings.data; var user = currentUser.data; $scope.user = user; + $scope.timeClose = Utils.formatTime(Settings.timeClose); + $scope.timeConfirm = Utils.formatTime(Settings.timeConfirm); $scope.DASHBOARD = DASHBOARD; - + for (var msg in $scope.DASHBOARD) { if ($scope.DASHBOARD[msg].includes('[APP_DEADLINE]')) { $scope.DASHBOARD[msg] = $scope.DASHBOARD[msg].replace('[APP_DEADLINE]', Utils.formatTime(Settings.timeClose)); @@ -82,7 +84,6 @@ angular.module('reg') $scope.confirmationText = $sce.trustAsHtml(converter.makeHtml(Settings.confirmationText)); $scope.waitlistText = $sce.trustAsHtml(converter.makeHtml(Settings.waitlistText)); - $scope.declineAdmission = function(){ swal({ From f0533a48d8e8f66eabbd4c277117522d3147a3ff Mon Sep 17 00:00:00 2001 From: Alex Todd Date: Sat, 19 Aug 2017 03:55:47 -0500 Subject: [PATCH 08/23] Populate email subject --- app/server/services/email.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/server/services/email.js b/app/server/services/email.js index a6471908a..44b319d82 100644 --- a/app/server/services/email.js +++ b/app/server/services/email.js @@ -88,7 +88,7 @@ controller.sendVerificationEmail = function(email, token, callback) { var options = { to: email, - subject: "[HACKATHON] - Verify your email" + subject: "["+HACKATHON_NAME+"] - Verify your email" }; var locals = { @@ -125,7 +125,7 @@ controller.sendPasswordResetEmail = function(email, token, callback) { var options = { to: email, - subject: "[HACKATHON] - Password reset requested!" + subject: "["+HACKATHON_NAME+"] - Password reset requested!" }; var locals = { @@ -166,7 +166,7 @@ controller.sendPasswordChangedEmail = function(email, callback){ var options = { to: email, - subject: "[HACKATHON] - Your password has been changed!" + subject: "["+HACKATHON_NAME+"] - Your password has been changed!" }; var locals = { From 4fec682b2940db3a503103eceb20e58650aee51a Mon Sep 17 00:00:00 2001 From: Justin Wei Date: Sat, 19 Aug 2017 17:21:31 -0500 Subject: [PATCH 09/23] Fixed parameter error that prevented dashboard status display. --- app/client/views/dashboard/dashboardCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/client/views/dashboard/dashboardCtrl.js b/app/client/views/dashboard/dashboardCtrl.js index b7b910876..219475272 100644 --- a/app/client/views/dashboard/dashboardCtrl.js +++ b/app/client/views/dashboard/dashboardCtrl.js @@ -10,13 +10,13 @@ angular.module('reg') 'UserService', 'EVENT_INFO', 'DASHBOARD', - function($rootScope, $scope, $sce, currentUser, settings, Utils, AuthService, UserService, DASHBOARD){ + function($rootScope, $scope, $sce, currentUser, settings, Utils, AuthService, UserService, EVENT_INFO, DASHBOARD){ var Settings = settings.data; var user = currentUser.data; $scope.user = user; $scope.DASHBOARD = DASHBOARD; - + for (var msg in $scope.DASHBOARD) { if ($scope.DASHBOARD[msg].includes('[APP_DEADLINE]')) { $scope.DASHBOARD[msg] = $scope.DASHBOARD[msg].replace('[APP_DEADLINE]', Utils.formatTime(Settings.timeClose)); From 56e0bd84527125345ddcc3318219e467a2e65db4 Mon Sep 17 00:00:00 2001 From: Michael Bailey Date: Wed, 4 Oct 2017 15:03:57 -0500 Subject: [PATCH 10/23] Fixed typo in admin/users view To correspond with the User model, I changed "needsHardware" to "wantsHardware" --- app/client/views/admin/users/adminUsersCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/views/admin/users/adminUsersCtrl.js b/app/client/views/admin/users/adminUsersCtrl.js index 7be1c3de8..16aa94724 100644 --- a/app/client/views/admin/users/adminUsersCtrl.js +++ b/app/client/views/admin/users/adminUsersCtrl.js @@ -226,7 +226,7 @@ angular.module('reg') value: user.confirmation.website },{ name: 'Needs Hardware', - value: user.confirmation.needsHardware, + value: user.confirmation.wantsHardware, type: 'boolean' },{ name: 'Hardware Requested', From 412375cbddb1142fb19cb0aad5b3683ab0e6123f Mon Sep 17 00:00:00 2001 From: Jeremy Melnyk Date: Fri, 27 Oct 2017 13:52:44 -0400 Subject: [PATCH 11/23] Add allow minors toggle button #15 server: Add allowMinors in Settings schema. client: Add SettingsService updateAllowMinors function. server: Add '/settings/minors' api endpoint to update allowMinors setting. client: Add Additional Options section in admin settings. --- app/client/src/services/SettingsService.js | 7 ++++++- .../views/admin/settings/adminSettingsCtrl.js | 16 ++++++++++++++ app/client/views/admin/settings/settings.html | 21 +++++++++++++++++++ app/server/models/Settings.js | 3 +++ app/server/routes/api.js | 16 +++++++++++++- 5 files changed, 61 insertions(+), 2 deletions(-) diff --git a/app/client/src/services/SettingsService.js b/app/client/src/services/SettingsService.js index c65c5abce..f2789b3e1 100644 --- a/app/client/src/services/SettingsService.js +++ b/app/client/src/services/SettingsService.js @@ -42,7 +42,12 @@ angular.module('reg') return $http.put(base + 'confirmation', { text: text }); - } + }, + updateAllowMinors: function(allowMinors){ + return $http.put(base + 'minors', { + allowMinors: allowMinors + }); + }, }; } diff --git a/app/client/views/admin/settings/adminSettingsCtrl.js b/app/client/views/admin/settings/adminSettingsCtrl.js index fb568eb57..ab1659e69 100644 --- a/app/client/views/admin/settings/adminSettingsCtrl.js +++ b/app/client/views/admin/settings/adminSettingsCtrl.js @@ -21,6 +21,22 @@ angular.module('reg') $scope.settings = settings; } + + // Additional Options -------------------------------------- + + $scope.updateAllowMinors = function () { + $scope.allowMinors = !$scope.allowMinors; + + SettingsService + .updateAllowMinors($scope.allowMinors) + .success(function (data) { + $scope.settings.allowMinors = data.allowMinors; + var successText = $scope.settings.allowMinors ? + "Minors are now allowed to register." : + "Minors are no longer allowed to register." + swal("Looks good!", successText, "success"); + }); + }; // Whitelist -------------------------------------- diff --git a/app/client/views/admin/settings/settings.html b/app/client/views/admin/settings/settings.html index ebde9cc02..4260c1408 100644 --- a/app/client/views/admin/settings/settings.html +++ b/app/client/views/admin/settings/settings.html @@ -76,6 +76,27 @@
+ +
+ +
+ Additional Options +
+ +
+
+ +
+
+
+
Date: Fri, 27 Oct 2017 15:09:17 -0400 Subject: [PATCH 12/23] Change successText from var to const #15 --- app/client/views/admin/settings/adminSettingsCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/views/admin/settings/adminSettingsCtrl.js b/app/client/views/admin/settings/adminSettingsCtrl.js index ab1659e69..9daa9f7c9 100644 --- a/app/client/views/admin/settings/adminSettingsCtrl.js +++ b/app/client/views/admin/settings/adminSettingsCtrl.js @@ -31,7 +31,7 @@ angular.module('reg') .updateAllowMinors($scope.allowMinors) .success(function (data) { $scope.settings.allowMinors = data.allowMinors; - var successText = $scope.settings.allowMinors ? + const successText = $scope.settings.allowMinors ? "Minors are now allowed to register." : "Minors are no longer allowed to register." swal("Looks good!", successText, "success"); From 7ff83ea46a5312707893e89c01e133171b21d6a5 Mon Sep 17 00:00:00 2001 From: Jeremy Melnyk Date: Fri, 27 Oct 2017 15:15:55 -0400 Subject: [PATCH 13/23] Scope and settings not in sync #15 Fix bug where scope.allowMinors was mixed scope.settings.allowMinors. --- app/client/views/admin/settings/adminSettingsCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/client/views/admin/settings/adminSettingsCtrl.js b/app/client/views/admin/settings/adminSettingsCtrl.js index 9daa9f7c9..9e5b74e4c 100644 --- a/app/client/views/admin/settings/adminSettingsCtrl.js +++ b/app/client/views/admin/settings/adminSettingsCtrl.js @@ -25,10 +25,10 @@ angular.module('reg') // Additional Options -------------------------------------- $scope.updateAllowMinors = function () { - $scope.allowMinors = !$scope.allowMinors; + $scope.settings.allowMinors = !$scope.settings.allowMinors; SettingsService - .updateAllowMinors($scope.allowMinors) + .updateAllowMinors($scope.settings.allowMinors) .success(function (data) { $scope.settings.allowMinors = data.allowMinors; const successText = $scope.settings.allowMinors ? From 1a8fbd8109247b99dd5eeed6447eeade69d989d9 Mon Sep 17 00:00:00 2001 From: Jeremy Melnyk Date: Fri, 27 Oct 2017 16:03:04 -0400 Subject: [PATCH 14/23] Add minors validation to form validation #15 Modify 'checked' in adult form validation to user custom 'allowMinors' validation rule that uses the allowMinors flag from the current settings. --- .../views/application/applicationCtrl.js | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/app/client/views/application/applicationCtrl.js b/app/client/views/application/applicationCtrl.js index ce43cd8b9..110dcdbfc 100644 --- a/app/client/views/application/applicationCtrl.js +++ b/app/client/views/application/applicationCtrl.js @@ -63,7 +63,28 @@ angular.module('reg') }); } + function isMinor() { + return !$scope.user.profile.adult; + } + + function minorsAreAllowed() { + return Settings.data.allowMinors; + } + + function minorsValidation() { + // Are minors allowed to register? + if (isMinor() && !minorsAreAllowed()) { + return false; + } + return true; + } + function _setupForm(){ + // Custom minors validation rule + $.fn.form.settings.rules.allowMinors = function (value) { + return minorsValidation(); + }; + // Semantic-UI form validation $('.ui.form').form({ fields: { @@ -107,7 +128,7 @@ angular.module('reg') identifier: 'adult', rules: [ { - type: 'checked', + type: 'allowMinors', prompt: 'You must be an adult, or an MIT student.' } ] From 851e1c94242dc91528e29fa95a6b6e6fb8e8353f Mon Sep 17 00:00:00 2001 From: Jeremy Melnyk Date: Fri, 27 Oct 2017 20:04:48 -0400 Subject: [PATCH 15/23] Change button to checkbox #15 Changed the buttons to be toggle checkboxes. This is more intuitive than buttons, since 'allowMinors' reflects state, and not an action. --- .../views/admin/settings/adminSettingsCtrl.js | 2 -- app/client/views/admin/settings/settings.html | 21 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/client/views/admin/settings/adminSettingsCtrl.js b/app/client/views/admin/settings/adminSettingsCtrl.js index 9e5b74e4c..c534ca89c 100644 --- a/app/client/views/admin/settings/adminSettingsCtrl.js +++ b/app/client/views/admin/settings/adminSettingsCtrl.js @@ -25,8 +25,6 @@ angular.module('reg') // Additional Options -------------------------------------- $scope.updateAllowMinors = function () { - $scope.settings.allowMinors = !$scope.settings.allowMinors; - SettingsService .updateAllowMinors($scope.settings.allowMinors) .success(function (data) { diff --git a/app/client/views/admin/settings/settings.html b/app/client/views/admin/settings/settings.html index 4260c1408..ae67b32f0 100644 --- a/app/client/views/admin/settings/settings.html +++ b/app/client/views/admin/settings/settings.html @@ -86,14 +86,21 @@
-
- +
+
+
+
+ + +
+
+
From 7bdd53a2314695f7971504877104df1cd2cad542 Mon Sep 17 00:00:00 2001 From: xTEddie Date: Mon, 30 Oct 2017 04:03:35 -0400 Subject: [PATCH 16/23] Add schools.csv from MLH repo --- app/client/assets/schools.csv | 1234 +++++++++++++++++++++++++++++++++ 1 file changed, 1234 insertions(+) create mode 100644 app/client/assets/schools.csv diff --git a/app/client/assets/schools.csv b/app/client/assets/schools.csv new file mode 100644 index 000000000..3b8c22c12 --- /dev/null +++ b/app/client/assets/schools.csv @@ -0,0 +1,1234 @@ +ABES Engineering College +AGH University of Science and Technology +Aalto University +Aarhus University +Abbey Park High School +Abbey Park Middle School +Abington Senior High School +Abraham Lincoln High School +Academy of Technology +Acardia High School, Arizona +Acharya Institute of Technology +Acton-Boxborough Regional High School +Adelphi University +Adlai E. Stevenson High School +Advanced Math and Science Academy Charter School +Alameda High School +Albany Medical College +Alfa College +Allen High School +Ambala College of Engineering and Applied Research +American Heritage School +American River College, California +American University, Washington, D.C. +Amherst College +Amity University +Amrita School of Engineering +Ancaster High School +Anchor Bay High School +Andover Central High School +Anna University +Arcadia High School, California +Arizona State University +Aston University +Atlanta Metropolitan State College +Atlantic Cape Community College +Austin Community College District +Aviation Career & Technical Education High School +Avon High School +BMIIT, Uka Tarsadia University, Bardoli, Surat +Babaria Institute of Technology +Babson College +Baruch College, CUNY +Baton Rouge Community College +Bayside High School +Bayview Secondary School +Beihang University +Bellevue College, Washington +Benedictine College +Benha University +Bentley University +Bergen Catholic High School +Bergen Community College +Bergen County Academies +Berkshire Community College +Bharathiar University +Bilkent University +Binghamton University +Birkbeck, University of London +Birmingham City University +Blinn College +Bloomsburg University of Pennsylvania +Blue Mountain Academy +BlueCrest University College +Boca Raton Community High School +Boston College +Boston Latin School +Boston University +Boston University Metropolitan College +Bourne Grammar School +Bournemouth University +Bowdoin College +Bowie State University +Brampton Centennial Secondary School +Brandeis University +Briar Cliff University +Brigham Young University +Brock University +Brookdale Community College +Brooklyn Technical High School +Brooklyn College, CUNY +Medgar Evers College, CUNY +Brookwood High School +Brown University +Bucknell University +Business Academy Aarhus +COMSATS Institute of Information Technology +Caldwell University +California High School +California Institute of Technology +California Polytechnic State University, San Luis Obispo +California State Polytechnic University, Pomona +California State University, Fresno +California State University, Fullerton +California State University, Long Beach +California State University, Los Angeles +California State University, Northridge +California State University, Sacramento +California State University, San Bernardino +California State University, Bakersfield +California State University, San Francisco +California State University, Channel Islands +California State University, Maritime +California State University, San Jose +California State University, Chico +California State University, Monterey Bay +California State University, San Luis Obispo +California State University, Dominguez Hills +California State University, San Marcos +California State University, East Bay +California State University, Sonoma +California State University, Stanislaus +California State University, Humboldt +California State University, San Diego +Camden County College +Cameron Heights Collegiate Institute +Canyon Crest Academy +Carleton College +Carleton University +Carnegie Mellon University +Carteret High School +Carthage College +Case Western Reserve University +Case Western Reserve University School of Medicine +Cathedral High School, Los Angeles +Cedar Creek High School +Cedar Ridge High School +Cedarville University +Centennial High School +Cégep André-Laurendeau +Cégep de Saint-Laurent +Cégep du Vieux Montréal +Cégep Marie-Victorin +Central Connecticut State University +Central Peel Secondary School +Central Texas College +Cerritos College +Chalmers University of Technology +Champlain College +Channabasaveshwara Institute of Technology +Chaparral Star Academy +Chapel Hill High School +Chattahoochee Technical College +Cherokee High School +Cherry Hill High School East +Chinguacousy Secondary School +Cincinnati State Technical and Community College +Citrus College +City University London +Claremont McKenna College +Clark University +Clarksburg High School +Clarkson University +Clemson University +Cleveland State University +Coe College +Colegio Simón Bolívar +Colgate University +Collège Ahuntsic +Collège André-Grasset +Collège de Bois-de-Boulogne +Collège de Maisonneuve +Collège de Montréal +Collège de Rosemont +Collège Français +Collège Jean-de-Brébeuf +Collège Jean-Eudes +College of Charleston +College of Engineering, Pune +College of Staten Island, CUNY +College of Westchester +Collège Regina Assumpta +Colleyville Heritage High School +Collins Hill High School +Collège Lionel-Groulx +Colorado School of Mines +Columbia Secondary School +Columbia University +Columbus College of Art and Design +Columbus State Community College +Comenius University +Community College of Allegheny County +Community College of Baltimore County +Community College of Rhode Island +Concord Academy +Concordia University +Conestoga College +Connecticut College +Conroe ISD Academy of Science and Technology, Texas +Cooper Union +Coral Glades High School +Cornell College +Cornell University +Council Rock High School South +County College of Morris +Covenant University +Coventry University +Cranbrook Schools +Cranfield University +Creekview High School +Cupertino High School +Dartmouth College +Dawson College +DePaul University +DePauw University +DeSales University +Deerfield High School +Del Norte High School +Delhi Technological University +Denison University +Des Moines Area Community College +Dharmsinh Desai University +Diablo Valley College +Dougherty Valley High School +Dr. B. R. Ambedkar National Institute of Technology Jalandhar +Drake University +Drew University +Drexel University +Dublin High School +Dublin Jerome High School +Duke University +Dulaney High School +Duquesne University +Durant High School +Durham College +Durham University +Dwarkadas J. Sanghvi College of Engineering +Dwight-Englewood School +Earl of March Secondary School +Earlham College +East Brunswick High School +East Central University +East Chapel Hill High Schoo +East Los Angeles College +Eastern Michigan University +Eckerd College +Edina High School +Edinburgh Napier University +Edison High School +Edward R. Murrow High School +El Camino College +El Centro College +Elgin Academy +Elizabeth High School +Embry-Riddle Aeronautical University +Emory University +Erasmus Hogeschool Brussel +Ernest Manning High School +Evergreen Valley College +Fachhochschule Dortmund +Fahaheel Al-Watanieh Indian Private School +Fairfield University +Fairleigh Dickinson University +Fairview High School +Farmingdale State College +FernUniversität in Hagen +Fitchburg State University +Florida Atlantic University +Florida Gulf Coast University +Florida Institute Of Technology +Florida International University +Florida Polytechnic University +Florida State University +Fontys Hogeschool +Foothill College +Fordham University +Fort Scott Community College +Fr. Conceicao Rodrigues College of Engineering +Francis Holland School +Francis Lewis High School +Franklin High School +Franklin W. Olin College of Engineering +Frederick Community College +Freedom High School +Freehold High School +Full Sail University +Fullerton College +GIDC Degree Engineering College +Ganga International School +Ganpat University +Garnet Valley High School +George C. Marshall High School +George Heriot's School +George Mason University +Georgetown University +Georgia Institute of Technology +Georgia State University +Germantown Friends School +Glassboro High School +Glenaeon Rudolf Steiner School +Glenbrook North High School +Glendale Community College +Glenforest Secondary School +Goldsmiths, University of London +Gordon Graydon Memorial Secondary School +Gottfried Wilhelm Leibniz Universität Hannover +Government Model Engineering College, Thrikkakara +Grady High School +Grand Rapids Community College +Grand Valley State University +Greater Lowell Technical High School +Green River College +Greenwood College School +Grinnell College +Guelph Collegiate Vocational Institute +Gujarat Technological University +Gujarat University +Guru Gobind Singh Indraprastha University +Hampshire College +Hampton University +Hanze University of Applied Sciences +Harper College +Harvard Medical School +Harvard University +Hasso-Plattner-Institut Academy +Haverford College +Hazleton Area High School +Head-Royce School +Health Careers High School +Helwan University +Henry M. Gunn High School +Herguan University +Heritage Institute of Technology +Het Baarnsch Lyceum +High Technology High School +Highland Park High School +Hillsborough High School +Hinsdale Central High School +Hiram College +Hofstra University +Hogeschool Thomas More +Holton-Arms School +Homestead High School +Hong Kong University of Science and Technology +Horace Mann School +Houghton High School +Howard University +Hudson County Community College +Hudson Valley Community College +Hunter College High School +H.N. Werkman College +I.T.S Engineering College +IT University of Copenhagen +Iliria College +Illinois Institute of Technology +Illinois State University +Imperial College London +Indian Hills Community College +Indian Institute of Engineering Science and Technology Shibpur +Indian Institute of Technology Allahabad +Indian Institute of Technology Bhubaneswar +Indian Institute of Technology Bombay +Indian Institute of Technology Gandhinagar +Indian Institute of Technology Guwahati +Indian Institute of Technology Gwalior +Indian Institute of Technology Hyderabad +Indian Institute of Technology Jabalpur +Indian Institute of Technology Jodhpur +Indian Institute of Technology Kanpur +Indian Institute of Technology Kharagpur +Indian Institute of Technology Kota +Indian Institute of Technology Madras +Indian Institute of Technology Roorkee +Indian Institute of Technology Ropar +Indian School of Mines, Dhanbad +Indiana University +Indiana University of Pennsylvania +Indiana University-Purdue University Fort Wayne +Indiana University–Purdue University Indianapolis +Indira Gandhi Delhi Technical University for Women +Indira Gandhi National Open University +Indraprastha Institute of Information Technology +Institute of Engineering and Rural Technology Allahabad +Instituto Politécnico Nacional +Instituto Tecnologico Superior de San Martin Texmelucan +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Chihuahua +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Ciudad Juárez +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Cumbres +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Eugenio Garza Lagüera +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Eugenio Garza Sada +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Laguna +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Saltillo +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Santa Catarina +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Tampico +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Valle Alto +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Tampico +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Chiapas +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Cuernavaca +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Hidalgo +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Ciudad de Mexico +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Puebla +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Santa Fe +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Toluca +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Veracruz +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Aguascalientes +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Guadalajara +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Irapuato +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus León +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Morelia +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus León +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Obregón +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Querétaro +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus San Luis Potosí +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Sinaloa +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Sonora +Instituto Tecnológico y de Estudios Superiores de Monterrey (ITESM) Campus Zacatecas +Instytut Pamięci Narodowej +International Institute Of Information Technology-Naya Raipur +International Institute of Information Technology-Hyderabad +International Leadership Charter High School +International School of Choueifat +Iowa Central Community College +Iowa State University +Iowa Western Community College +Istanbul University +Ithaca College +Jacobs University Bremen +Jagiellonian University +Jaipur National University +Jalpaiguri Government Engineering College +James Gillespie's High School +James Madison High School +James Madison University +Jaypee Institute Of Information Technology +John A. Ferguson Senior High School +John Abbott College +John F. Kennedy Memorial High School +John Leggott College +John P. Stevens High School +Johns Hopkins University +Johnson & Wales University +Johnson C. Smith University +K.S. School of Business Management +Kansas State University +Kantipur Engineering College +Kean University +Keele University +Kennesaw State University +Kennett High School +Kent State University +King's College London +Kraków University of Economics +L D College Of Engineering Library +La Roche College +Lafayette College +Lake Braddock Secondary School +Lakeside High School +Lampeter-Strasburg High School +Lancaster University +Laval University +Lawrence Technological University +Lawrence University +Lehigh University +Leiden University +Lewis & Clark College +Lewis University +Lexington High School +Lick Wilmerding High School +Lincoln University +Lindenwood University +Linn-Mar High School +Lisgar Collegiate Institute +Little Flowers Public Sr Secondary School +Livingston High School +Lodz University of Technology +London Metropolitan University +London School of Economics and Political Science +Lone Star College System +Lord Krishna College of Engineering +Los Altos High School +Loughborough University +Louisiana State University +Lowell High School +Lynbrook High School +M.V.Jayaraman College of Engineering +MBM Engineering College, Jodhpur +MacArthur High School +Macalester College +Macaulay Honors College, CUNY +Macomb Community College +Madan Mohan Malaviya University of Technology +Madison College +Maggie L. Walker Governor's School +Maharaja Agrasen Institute of Technology +Maharaja Surajmal Institute of Technology +Malvern Preparatory School +Manalapan High School +Manchester Metropolitan University +Manhattan College +Manhattan High School +Manipal Institute of Technology +Marc Garneau Collegiate Institute +Marcellus High School +Marianopolis College +Marist College +Markham District High School +Markville Secondary School +Marlboro High School +Marquette University +Marshall High School +Marymount University +Masaryk University +Massachusetts Institute of Technology +Mater Academy High School +Maulana Abul Kalam Azad University of Technology +Maulana Azad National Institute of Technology +Maulana Azad National Institute of Technology Bhopal +Maumee Valley Country Day School +McGill University +McMaster University +Medical University of Silesia +Menlo School +Mercer County Community College +Mercer University +Meredith College +Messiah College +Metas Adventist School +Metropolitan State University +Metuchen High School +Miami Dade College +Miami Lakes Educational Center +Miami University +Michigan State University +Michigan Technological University +Middle Tennessee State University +Middlebury College +Middlesex County Academy for Science, Mathematics & Engineering Technologies +Middlesex County College +Middlesex University +Middletown High School South +Midwood +Miles College +Millburn High School +Millburn Middle School +Millville Senior High School +Milwaukee School of Engineering +Mission College Boulevard +Mission San Jose High School +Mississippi State University +Mississippi University for Women +Missouri State University +Mohammed V University +Molloy College +Monmouth College +Monmouth University +Monroe Community College +Monta Vista High School +Montana State University +Montclair State University +Montgomery Blair High School +Montgomery College +Montgomery County Community College +Montgomery High School +Montville Township High School +Moore Middle School +Moorestown High School +Moraine Valley Community College +Morgan State University +Morris County School of Technology +Moscow Institute of Physics and Technology +Moscrop Secondary School +Motilal Nehru National Institute of Technology +Motilal Nehru National Institute of Technology Allahabad +Mount Holyoke College +Mt. San Antonio College +Muhlenberg college +Nanyang Technological University +Narsee Monjee College of Commerce and Economics +Nashua High School South +National Institute of Engineering, Mysore +National Institute of Technology Calicut +National Institute of Technology, Jamshedpur +National Institute of Technology, Raipur +National Institute of Technology, Silchar +National Institute of Technology, Srinagar +National Institute of Technology, Tiruchirappalli +National Institute of Technology, Warangal +National Research University Higher School Of Economics +Netaji Subhas Institute Of Technology +Netaji Subhash Engineering College +New Albany High School +New Jersey City University +New Jersey Institute of Technology +New Providence High School +New River Community College +New York City College of Technology, CUNY +New York Institute of Technology +New York University +New York University Abu Dhabi +Newcastle University +Newton South High School +Niagara College +Nipissing University +Nirma University +Noakhali Science and Technology University +North American University +North Andover High School +North Brunswick Township High School +North Carolina School of Science and Mathematics +North Carolina State University +North Dakota State University +North Hunterdon High School +North Park Secondary School +North Shore Community College +Northeastern University +Northern Arizona University +Northern Illinois University +Northern Kentucky University +Northern Michigan University +Northern Secondary School +Northern Virginia Community College +Northview High School +Northwest Missouri State University +Northwest Vista College +Northwestern Oklahoma State University +Northwestern University +Nottingham Trent University +Novi High School +Oakland Community College +Oakland University +Ocean City High School +Ocean County College +Ohio Christian University +Okemos High School +Oklahoma State University +Onondaga Community College +Opolska University of Technology +Oregon State University +Otterbein University +Oxford Academy High School +Palo Alto High School +Palomar College +Pandit Deendayal Petroleum University +Paramount International School +Parkview High School +Parsippany High School +Parsons School of Design +Parul Institute of Engineering & Technology +Pasadena City College +Pascal English School, Cyprus +Penncrest High School +Piedmont High School +Pierre Elliott Trudeau High School +Pingree School +Piscataway Township High School +Pittsburgh Technical Institute +Plano East Senior High School +Plovdiv Medical University +Pokhara University +Polsko-Japońska Akademia Technik Komputerowych +Poolesville High School +Poornima College of Engineering +Pope John Paul II High School +Port Credit Secondary School +Porter-Gaud School +Portland State University +Poznań University of Technology +Presidency School, Surat. +Preston High School +Princeton High School +Princeton University +Purdue University +Queen Mary University of London +Queen's University +R.V. College Of Engineering +Radnor High School +Raksha Shakti University +Ramapo College of New Jersey +Ramapo High School +Rani Laxmi Bai Public School +Raritan Valley Community College +Ravenscroft School +Ravenwood High School +Red Bank Regional High School +Regis High School +Rensselaer Polytechnic Institute +Rhode Island College +Rhode Island School of Design +Rhodes College +Rice University +Richard Montgomery High School +Richard Stockton University +Richardson High School +Richland College +Richmond Hill High School +Rider University +Ridgewood High School +River Dell High School +Robert Gordon University +Rochester Institute of Technology +Rock Ridge High School +Roosevelt High School +Rosa Parks Middle School +Rose-Hulman Institute of Technology +Rowan College at Gloucester County +Rowan University +Roxbury High School +Rudbecksgymnasiet +Rutgers, The State University of New Jersey +Ryde School +Ryerson University +SOAS University of London +SUNY Polytechnic Institute +SUPINFO International University +Saginaw Valley State University +Sahrdaya College of Engineering and Technology +Saint Joseph High School +Saint Joseph's College of Maine +Saint Paul College +Saint Peter's Preparatory School +Saint Peter's University +San Diego State University +San Francisco State University +San Jose State University +San Marcos High School +San Marin High School +San Mateo High School +Sant Longowal Institute of Engineering and Technology +Santa Clara University +Santa Margarita Catholic High School +Santa Rosa Junior College +Saratoga High School +Sardar Patel University +Sardar Vallabhbhai National Institute of Technology, Surat +Sarvajanik College of Engineering & Technology +Saurashtra University Rajkot +Savitribai Phule Pune University +School of Visual Arts, New York +Seneca College +Seton Hall University +Seven Lakes High School +Seventh Day Adventist High School +Shaker High School +Shankersinh Vaghela Bapu Institute of Technology +Sheffield Hallam University +Shelton High School +Sherwood Convent School +Sherwood High School +Shiv Nadar University +Shri Govindram Seksaria Institute of Technology and Science +Shri Guru Ram Rai Public School +Shri Vaishnav Institute of Technology and Science +Siena College +Silesian University of Technology +Silver Oak College of Engineering & Technology +Simmons College +Simon Fraser University +Simpson College +Simón Bolívar University +Singapore University of Technology and Design +Sir Padampat Singhania University +Sitarambhai Naranji Patel Institute of Technology & Research Centre +Skidmore College +Slippery Rock University of Pennsylvania +Smith College +South Brunswick High School +South Carolina State University +South Dakota School of Mines and Technology +South Lakes High School +Southeastern Louisiana University +Southern Connecticut State University +Southern Illinois University Carbondale +Southern Illinois University Edwardsville +Southern Methodist University +Spotswood High School +Spring Arbor University +Sreenidhi Institute of Science & Technology +Sri Sivasubramaniya Nadar College of Engineering +St Brendan High School +St Edwards University +St Mary's CE High School – Cheshunt +St Mary's Catholic High School – Croydon +St Paul's Catholic College – Sunbury-on-Thames +St. Cloud State University +St. John's University, New York +St. Mark's School, Hong Kong +St. Mary's Ryken High School +St. Michael College of Engineering & Technology +St. Raymond High School for Boys And Girls +St. Theresa of Lisieux Catholic High School +St. Xavier's Senior Secondary School, Jaipur +St.Mary's Convent School +Stanford University +Staten Island Technical High School +Stephen F. Austin State University +Stetson University +Stevens Institute of Technology +Stevenson University +Stockton University +Stonehill College +Stonewall Jackson High School +Stony Brook University, SUNY +Stuyvesant High School +Sulphur High School +Susquehanna University +Sussex County Community College +Swansea University +Swarthmore College +Symbiosis International University +Syracuse University +Tadeusz Kościuszko University of Technology +Technische Universitaet München +Techno India College of Technology +Techno India University +Tecnológico de Estudio Superiores de Ixtapaluca +Tecnológico de Estudios Superiores de Ecatepec +Temple University +Tenafly High School +Texas A&M University +Texas A&M University – Central Texas +Texas A&M University – Corpus Christi +Texas A&M University – Kingsville +Texas Christian University +Texas Southern University +Texas Southmost College +Texas State University +Texas Tech University +Thakur College of Engineering and Technology +The British University In Egypt +The Bronx High School of Science +The City College of New York, CUNY +The College Of William & Mary +The College at Brockport, SUNY +The College of New Jersey +The College of Saint Rose +The George Washington University +The Harker School +The Hill School +The Katholieke Universiteit Leuven +The LNM Institute of Information Technology +The Maharaja Sayajirao University of Baroda +The Mount Tabor Training College +The Ohio State University +The Open University +The Pennsylvania State University +The Pennsylvania State University – Abington Campus +The Pennsylvania State University – Harrisburg +The Pennsylvania State University – York Campus +The Pennsylvania State University – Berks +The Roxbury Latin School +The SRM University +The Savannah College of Art and Design +The Technical University of Denmark +The Technische Universität Berlin +The University of Akron +The University of Alabama +The University of Alberta +The University of Applied Sciences Upper Austria +The University of Arizona +The University of Arkansas +The University of Bath +The University of Bedfordshire +The University of Birmingham +The University of Bolton +The University of Bonn +The University of Bristol +The University of British Columbia +The University of Calgary +The University of Calicut +The University of California, Berkeley +The University of California, Davis +The University of California, Irvine +The University of California, Los Angeles +The University of California, Riverside +The University of California, San Diego +The University of California, Santa Barbara +The University of California, Merced +The University of California, Santa Cruz +The University of Cambridge +The University of Central Florida +The University of Cincinnati +The University of Colorado Boulder +The University of Colorado Colorado Springs +The University of Connecticut +The University of Dallas +The University of Delaware +The University of Denver +The University of Derby +The University of Dundee +The University of Edinburgh +The University of Essex +The University of Evansville +The University of Exeter +The University of Falmouth +The University of Florida +The University of Gdańsk +The University of Georgia +The University of Glasgow +The University of Groningen +The University of Guelph +The University of Houston +The University of Houston – Clear Lake +The University of Houston – Downtown +The University of Huddersfield +The University of Idaho +The University of Illinois at Chicago +The University of Illinois at Urbana-Champaign +The University of Information Technology and Management in Rzeszow +The University of Iowa +The University of Kansas +The University of Kent +The University of Kentucky +The University of La Verne +The University of Leeds +The University of Leicester +The University of Lincoln +The University of Liverpool +The University of Ljubljana +The University of Louisiana at Lafayette +The University of Louisiana at Monroe +The University of Louisville +The University of Manchester +The University of Manitoba +The University of Maryland, Baltimore County +The University of Maryland, College Park +The University of Massachusetts Amherst +The University of Massachusetts Boston +The University of Massachusetts Dartmouth +The University of Massachusetts Lowell +The University of Miami +The University of Michigan +The University of Minnesota +The University of Missouri +The University of Missouri-Kansas City +The University of Málaga +The University of Nebraska-Lincoln +The University of New Brunswick +The University of New Hampshire +The University of New Haven +The University of North Carolina at Chapel Hill +The University of North Carolina at Charlotte +The University of North Carolina at Greensboro +The University of North Texas +The University of Northampton +The University of Notre Dame +The University of Nottingham +The University of Oklahoma +The University of Ontario Institute of Technology +The University of Oregon +The University of Ottawa +The University of Oulu +The University of Oxford +The University of Pennsylvania +The University of Petroleum and Energy Studies +The University of Phoenix +The University of Pittsburgh +The University of Portland +The University of Portsmouth +The University of Puerto Rico, Mayagüez Campus +The University of Puerto Rico, Río Piedras Campus +The University of Richmond +The University of Rochester +The University of Salford +The University of San Francisco +The University of Sharjah +The University of Sheffield +The University of Silesia in Katowice +The University of South Carolina +The University of South Florida +The University of Southampton +The University of Southern California +The University of Southern Denmark +The University of St Andrews +The University of St. Gallen +The University of St. Thomas +The University of Stirling +The University of Strathclyde +The University of Stuttgart +The University of Surrey +The University of Sussex +The University of Tampa +The University of Tennessee +The University of Texas Rio Grande Valley +The University of Texas at Arlington +The University of Texas at Austin +The University of Texas at Dallas +The University of Texas at El Paso +The University of Texas at San Antonio +The University of Texas of the Permian Basin +The University of Texas – Pan American +The University of Toledo +The University of Toronto +The University of Toronto Scarborough +The University of Toronto Mississauga +The University of Tulsa +The University of Utah +The University of Vermont +The University of Victoria +The University of Virginia +The University of Warsaw +The University of Warwick +The University of Washington +The University of Waterloo +The University of West Georgia +The University of Western Ontario +The University of Westminster +The University of Windsor +The University of Wisconsin-Eau Claire +The University of Wisconsin-Green Bay +The University of Wisconsin-La Crosse +The University of Wisconsin-Madison +The University of Wisconsin-Milwaukee +The University of Wisconsin-Oshkosh +The University of Wisconsin-Parkside +The University of Wisconsin-Platteville +The University of Wisconsin-River Falls +The University of Wisconsin-Stevens Point +The University of Wisconsin-Stout +The University of Wisconsin-Superior +The University of Wisconsin-Whitewater +The University of Wolverhampton +The University of Wrocław +The University of York +The University of Zagreb +The University of the Pacific +The Université de Sherbrooke +Thomas Edison State College +Thomas Jefferson High School for Science and Technology +Thomas Nelson Community College +Thomas S. Wootton High School +Tongji University +Towson University +Trent University +Trinity College +Trinity Valley School +Troy Athens High School +Troy High School +Troy University +Tshwane University of Technology +Tufts University +Tulane University +Tunis El Manar University +Turner Fenton Secondary School +UNAM FES Aragón +Ulster University +Union County College +Union County Magnet High School +Union County Vocational-Technical Schools +Unionville High School +United College of Engineering and Research +United Institute of Technology +Universidad Autónoma Metropolitana +Universidad Autónoma de Coahuila +Universidad Autónoma de Nuevo León +Universidad Autónoma de San Luis Potosí +Universidad Autónoma de Tlaxcala +Universidad Autónoma del Estado de Morelos +Universidad Autónoma del Estado de México +Universidad Autónoma del Perú +Universidad Centro de Estudios Cortazar +Universidad Iberoamericana +Universidad Nacional Autónoma de México +Universidad Panamericana +Universidad Politécnica de Guanajuato +Universidad Politécnica de Querétaro +Universidad TecMilenio +Universidad Tecnológica de México +Universidad Tecnológica de Puebla +Universidad Veracruzana +Universidad de Guadalajara +Universidad de Guanajuato +Universidad de La Salle Bajío +Universidad de Monterrey +Universidad del Desarrollo +Universidad del Valle de México +Universitat Politècnica de Catalunya, UPC +Universitat Autònoma de Barcelona, UAB +Universitat de Barcelona +Universidad en Línea, Mexico +Universitat Politècnica de Catalunya +Universitat Pompeu Fabra +University Campus Suffolk +University College London +University at Albany, SUNY +University at Binghamton, SUNY +University at Buffalo, SUNY +University at New Paltz, SUNY +University at Orange, SUNY +University at Oswego, SUNY +University at Plattsburgh, SUNY +University of Białystok +University of Cincinnati Clermont College +University of Udaipur +University of the People +Université du Québec à Montréal +Upper Canada College +Upper Iowa University +Urbana High School +Ursinus College +Utah State University +Utica College +Utkal University +Uttar Pradesh Technical University +Uttaranchal Institute of Technology +VIA University College +VIT University +Vadodara Institute of Engineering +Valley Christian High School +Valley High School +Vanderbilt University +Vanier College +Vassar College +Veer Narmad South Gujarat University +Veer Surendra Sai University of Technology, Burla +Vel Tech Multi Tech Dr.Rangarajan Dr.Sakunthala Engineering College +Vellore Institute of Technology +Veterans Memorial Early College High School +Victoria Park Collegiate Institute +Vidyakunj International School +Villanova University +Vincennes University +Vincent Massey Secondary School +Virginia Commonwealth University +Virginia Tech +Visvesvaraya National Institute of Technology +Visvesvaraya Technological University +Vivekanand Education Society's Institute of Technology +Vivekananda College for BCA +Wake Forest University +Walt Whitman High School +Ward Melville High School +Warsaw School of Economics +Warsaw University of Technology +Wartburg College +Washington State University +Washington Township High School +Washington University in St. Louis +Wayne State University +Webb Bridge Middle School +Wellesley College +Wentworth Institute of Technology +Wesleyan University +West Chester University +West Morris Mendham High School +West Potomac High School +West Windsor-Plainsboro High School South +Western Governors University +Western Kentucky University +Western Michigan University +Western New England University +Western University +Western Washington University +Westfield High School +Westminster College +Westminster School +Westwood High School +Wichita State University +Wilfrid Laurier University +Wilkes University +William Lyon Mackenzie Collegiate Institute +William Paterson University +Williams College +Wilmington University +Winona State University +Winston Churchill High School +Winthrop University +Woodbridge High School +Worcester Polytechnic Institute +Worcester State University +Wright State University +Wrocław University of Economics +Wrocław University of Technology +Wyższa Szkoła Biznesu – National-Louis University +Xavier University +YMCA University of Science & Technology +Yale University +Yale-NUS College +York College of Pennsylvania +York University +Youngstown State University +Zespół Szkół Nr.2 im. Jana Pawła II w Miechowie +Zespół Szkół nr 1 im. Jana Pawła II w Przysusze +Zespół Szkół Łączności, Monte Cassino 31 +Zespół szkół nr 1 im. Stanisława Staszica w Bochni +Zespół Szkół im. Jana Pawła II w Niepołomicach +École Centrale Paris +École Polytechnique de Montréal +École de technologie supérieure +The University of Chicago +Appalachian State University +Eidgenössische Technische Hochschule (ETH) Zürich +Hunter College, CUNY +School of Professional Studies, CUNY +John Jay College of Criminal Justice, CUNY +York College, CUNY +Lehman College, CUNY +Borough of Manhattan Community College, CUNY +Kingsborough Community College, CUNY +Bronx Community College, CUNY +LaGuardia Community College, CUNY +Guttman Community College, CUNY +Queensborough Community College, CUNY +Hostos Community College, CUNY +Potsdam, SUNY +University of Southampton +Florida Agricultural & Mechanical (A&M) University +Truman State University +EPFL | École polytechnique fédérale de Lausanne +Santa Barbara City College +TU/e Technische Universiteit Eindhoven University of Technology +Berea College +Delft University of Technology +De Anza College +Queens College, CUNY +Yeshiva University +Instituto Tecnólogico de La Laguna (ITL) +Bryn Mawr College +Instituto Tecnológico y de Estudios Superiores de Occidente (ITESO) +Salem State University +Hood College +Brno University of Technology +Tacoma Community College +University of Pikeville +Slovak University of Technology in Bratislava (STU) +South Texas College +Instituto Tecnológico Superior de los Ríos +Cardiff Metropolitan University +Loyola Marymount University +LIM College +University of North America +Université de Mons +Instituto Tecnológico Superior de El Mante +Glenbrook South High School +Eastern Washington University +Canada (Cañada) College +Barton College +Bergen County Technical High School - Teterboro +Trinity International University +Davidson College +The University of the South - Sewanee +Norco College +Universidad Interamericana de Puerto Rico +Maine South High School +American High School \ No newline at end of file From c802e4104839176214d747f91a6208a0a8bf539a Mon Sep 17 00:00:00 2001 From: xTEddie Date: Mon, 30 Oct 2017 04:05:09 -0400 Subject: [PATCH 17/23] Add school dropdown --- app/client/stylesheets/site.scss | 3 +++ app/client/views/application/application.html | 9 ++++--- .../views/application/applicationCtrl.js | 24 ++++++++++++++++++- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/app/client/stylesheets/site.scss b/app/client/stylesheets/site.scss index afec2d8c0..297912628 100644 --- a/app/client/stylesheets/site.scss +++ b/app/client/stylesheets/site.scss @@ -119,4 +119,7 @@ fieldset { border: none; } +.ui.search >.results { + width: 100%; +} // @import 'animation'; diff --git a/app/client/views/application/application.html b/app/client/views/application/application.html index 35159a29c..5eff73377 100644 --- a/app/client/views/application/application.html +++ b/app/client/views/application/application.html @@ -37,9 +37,12 @@
- +
diff --git a/app/client/views/application/applicationCtrl.js b/app/client/views/application/applicationCtrl.js index ce43cd8b9..a58e87c55 100644 --- a/app/client/views/application/applicationCtrl.js +++ b/app/client/views/application/applicationCtrl.js @@ -31,7 +31,6 @@ angular.module('reg') * TODO: JANK WARNING */ function populateSchools(){ - $http .get('/assets/schools.json') .then(function(res){ @@ -43,6 +42,29 @@ angular.module('reg') $scope.autoFilledSchool = true; } }); + + $http + .get('/assets/schools.csv') + .then(function(res){ + $scope.schools = res.data.split('\n'); + $scope.schools.push('Other'); + + var content = []; + + for(i = 0; i < $scope.schools.length; i++) { + $scope.schools[i] = $scope.schools[i].trim(); + content.push({title: $scope.schools[i]}) + } + + $('#school.ui.search') + .search({ + source: content, + cache: true, + onSelect: function(result, response) { + $scope.user.profile.school = result.title.trim(); + } + }) + }); } function _updateUser(e){ From 48028204652824d9578e546be14ec048b74daefd Mon Sep 17 00:00:00 2001 From: xTEddie Date: Mon, 30 Oct 2017 04:05:32 -0400 Subject: [PATCH 18/23] Clean up --- app/client/stylesheets/._custom.scss.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/client/stylesheets/._custom.scss.swp diff --git a/app/client/stylesheets/._custom.scss.swp b/app/client/stylesheets/._custom.scss.swp deleted file mode 100644 index bf3da8e8a22bb252e3afd3479d82f23a3e683ca5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&yH3L}6b4|o%m@S$v!SfH^de|s12Hf#g4kL&aT-G|mhBW}0SVp#UWT24w_riy zDR8QkN(@C}1O1kx6Z_al^0!6t*uOYEqx)``*tSl{%gO8I^V3%IO%Za%wJxjqA6gg( z(rNc?A2@B__JJFgnVSmZ@~~KJzMU2HVisK6+&nspPlPs#8Ifm>RD3Gctd&8j6CQn@*XuT+mHwZvrxjsZ0&5*&5iTrdys_y1Rwwb z2tWV=5P$##{*{1{4RU8s)T~dnQpd)(SPu~(009U<00Izz00bZa0SG_<0ucCv0xTpX zTO;JrKGpyK`S<^a9lzJ}4>sOcc{B(>00Izz00bZa0SG_<0uX=z1b!>9E0su@Di3I@ z*Xi#?y+h)8^f;F#oiZiZ*xr7pk;+p#8jcmqLXk~o7vM+K Date: Tue, 31 Oct 2017 16:55:35 -0400 Subject: [PATCH 19/23] Prevent users to fill out confirmation form without being admitted --- app/client/src/routes.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/client/src/routes.js b/app/client/src/routes.js index b33bcf8b0..463c03714 100644 --- a/app/client/src/routes.js +++ b/app/client/src/routes.js @@ -76,6 +76,9 @@ angular.module('reg') url: "/confirmation", templateUrl: "views/confirmation/confirmation.html", controller: 'ConfirmationCtrl', + data: { + requireCompletedProfile: true + }, resolve: { currentUser: function(UserService){ return UserService.getCurrentUser(); @@ -183,6 +186,7 @@ angular.module('reg') var requireLogin = toState.data.requireLogin; var requireAdmin = toState.data.requireAdmin; var requireVerified = toState.data.requireVerified; + var requireCompletedProfile = toState.data.requireCompletedProfile; if (requireLogin && !Session.getToken()) { event.preventDefault(); @@ -199,6 +203,11 @@ angular.module('reg') $state.go('app.dashboard'); } + if (requireCompletedProfile && !Session.getUser().completedProfile) { + event.preventDefault(); + $state.go('app.dashboard'); + } + }); }]); \ No newline at end of file From ec70bb53aa6ea3619375149e0b2f3866f628293c Mon Sep 17 00:00:00 2001 From: xTEddie Date: Wed, 1 Nov 2017 15:45:35 -0400 Subject: [PATCH 20/23] Change school dropdown styling similar to the other form fields --- app/client/stylesheets/_application.scss | 7 +++++++ app/client/stylesheets/site.scss | 1 + app/client/views/application/application.html | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 app/client/stylesheets/_application.scss diff --git a/app/client/stylesheets/_application.scss b/app/client/stylesheets/_application.scss new file mode 100644 index 000000000..4db43c789 --- /dev/null +++ b/app/client/stylesheets/_application.scss @@ -0,0 +1,7 @@ +#application { + #school .title { + text-align: left; + text-transform: none; + letter-spacing: 0; + } +} \ No newline at end of file diff --git a/app/client/stylesheets/site.scss b/app/client/stylesheets/site.scss index 297912628..6cb4867f0 100644 --- a/app/client/stylesheets/site.scss +++ b/app/client/stylesheets/site.scss @@ -46,6 +46,7 @@ $brand-tertiary: $tertiary; @import 'sidebar'; @import 'page'; @import 'dashboard'; +@import 'application'; @import 'verify'; @import 'team'; @import 'admin'; diff --git a/app/client/views/application/application.html b/app/client/views/application/application.html index 5eff73377..c77012548 100644 --- a/app/client/views/application/application.html +++ b/app/client/views/application/application.html @@ -1,4 +1,4 @@ -
+
Application
From 8574219b0670776867e03d91225a0bf6c436adec Mon Sep 17 00:00:00 2001 From: chriswongtv Date: Thu, 9 Nov 2017 16:14:18 -0800 Subject: [PATCH 21/23] Fix confirmation page permission bug --- app/client/src/routes.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/client/src/routes.js b/app/client/src/routes.js index 463c03714..402bf1fdc 100644 --- a/app/client/src/routes.js +++ b/app/client/src/routes.js @@ -77,7 +77,7 @@ angular.module('reg') templateUrl: "views/confirmation/confirmation.html", controller: 'ConfirmationCtrl', data: { - requireCompletedProfile: true + requireAdmitted: true }, resolve: { currentUser: function(UserService){ @@ -186,7 +186,7 @@ angular.module('reg') var requireLogin = toState.data.requireLogin; var requireAdmin = toState.data.requireAdmin; var requireVerified = toState.data.requireVerified; - var requireCompletedProfile = toState.data.requireCompletedProfile; + var requireAdmitted = toState.data.requireAdmitted; if (requireLogin && !Session.getToken()) { event.preventDefault(); @@ -203,7 +203,7 @@ angular.module('reg') $state.go('app.dashboard'); } - if (requireCompletedProfile && !Session.getUser().completedProfile) { + if (requireAdmitted && !Session.getUser().status.admitted) { event.preventDefault(); $state.go('app.dashboard'); } From 51370de2f6dfcbd7d3ee348ba40c0571306ba932 Mon Sep 17 00:00:00 2001 From: Aswin VB Date: Thu, 4 Jan 2018 19:34:37 +0530 Subject: [PATCH 22/23] add alert for required fields --- app/client/views/application/applicationCtrl.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/client/views/application/applicationCtrl.js b/app/client/views/application/applicationCtrl.js index ccd0efc43..b843ea5c5 100644 --- a/app/client/views/application/applicationCtrl.js +++ b/app/client/views/application/applicationCtrl.js @@ -165,6 +165,9 @@ angular.module('reg') if ($('.ui.form').form('is valid')){ _updateUser(); } + else{ + sweetAlert("Uh oh!", "Please Fill The Required Fields", "error"); + } }; - }]); \ No newline at end of file + }]); From f1ada1698f560f9716aee2d6432ee18b1990ca73 Mon Sep 17 00:00:00 2001 From: jlin816 Date: Sun, 21 Jan 2018 22:22:39 -0800 Subject: [PATCH 23/23] Add semantic validation messages for required fields --- app/client/views/application/applicationCtrl.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/client/views/application/applicationCtrl.js b/app/client/views/application/applicationCtrl.js index b843ea5c5..a124704bc 100644 --- a/app/client/views/application/applicationCtrl.js +++ b/app/client/views/application/applicationCtrl.js @@ -109,6 +109,7 @@ angular.module('reg') // Semantic-UI form validation $('.ui.form').form({ + inline: true, fields: { name: { identifier: 'name',
- Follow on Twitter   Like on Facebook    - Email Us + Follow on Twitter   Like on Facebook    + Email Us
- Copyright © HackMIT 2015, All rights reserved. + Copyright © {{ hackathonName }} 2017, All rights reserved.