Skip to content

Commit 66975f9

Browse files
committed
Squashed commit of the following:
commit 1599fe1 Author: Chris Baudouin, Jr <[email protected]> Date: Wed Sep 16 18:45:42 2020 -0400 refactor(docs): Updates Environment Variable docs (#300) * refactor(docs): Updates Environment Variable docs * Update docs/deployment-environment-variables.md Co-authored-by: Peter Kos <[email protected]> * refactor: Redesigns EV page * Update docs/deployment-environment-variables.md Co-authored-by: Peter Kos <[email protected]> * refactor: Adds optional notice Co-authored-by: Peter Kos <[email protected]> commit 69e8d6e Author: Chris Baudouin, Jr <[email protected]> Date: Mon Sep 14 12:34:28 2020 -0400 refactor: Redesigns password reset pages (#308) * refactor: Redesigns password reset pages * fix: Hound newline issue commit 03e632c Author: Chris Baudouin, Jr <[email protected]> Date: Mon Sep 14 12:18:45 2020 -0400 fix(dashboard): Map data refactored for faster load times (#269) Co-authored-by: Peter Kos <[email protected]> commit 9e6fe39 Author: Chris Baudouin, Jr <[email protected]> Date: Mon Sep 14 10:57:47 2020 -0400 refactor: Updates 24hr reminder to remove MyMLH reference (#302) * refactor: Updates 24hr reminder to remove MyMLH reference * refactor: Improves verbiage of 24hr message * Update db/seed_messages/user--24hr_incomplete_application.md Co-authored-by: Peter Kos <[email protected]> Co-authored-by: Peter Kos <[email protected]> commit 12cc746 Author: Chris Baudouin, Jr <[email protected]> Date: Sun Sep 13 22:33:00 2020 -0400 refactor: Renames "Guides" to "Docs" (#353) Co-authored-by: Peter Kos <[email protected]> commit 8617981 Author: Chris Baudouin, Jr <[email protected]> Date: Sun Sep 13 22:12:51 2020 -0400 fix(docs): Refactors page titles and makes API pages visible again (#320) * refactor: Changes "Development" to "Developer" * fix(docs): Refactors page titles and makes API pages visible again * FIx “too” -> “to” typo * refactor: Refactors API section * fix: Fixes broken link to API testing page Co-authored-by: Peter Kos <[email protected]> commit 7c3cc0a Author: Chris Baudouin, Jr <[email protected]> Date: Sat Sep 12 01:31:56 2020 -0400 build(deps): Updates Rails to 5.2.4.4 (#349) commit e72166d Author: Chris Baudouin, Jr <[email protected]> Date: Sat Sep 12 01:18:49 2020 -0400 build(deps): Updates ChartKick to 3.4 (#347) commit a767446 Author: Chris Baudouin, Jr <[email protected]> Date: Wed Sep 9 11:31:00 2020 -0400 refactor(docs): Updates Messages and customization instructions (#321) * refactor(docs): Updates Messages and customization instructions * Enable default questionnaire deined message Syncs documentation Co-authored-by: Peter Kos <[email protected]> commit 9c61d1f Author: Chris Baudouin, Jr <[email protected]> Date: Wed Sep 9 11:20:24 2020 -0400 feat(docs): Adds new Resources page (#318) commit fe66870 Author: Chris Baudouin, Jr <[email protected]> Date: Tue Sep 8 12:56:24 2020 -0400 refactor: Cleans update method in rsvps_controller (#305) * refactor: Cleans update method in rsvps_controller * refactor: Fixes whitespace issue for Hound commit cb16869 Author: Chris Baudouin, Jr <[email protected]> Date: Mon Sep 7 00:07:59 2020 -0400 fix: Shows manage button for admin_limited_access (#331) commit 767715a Author: Chris Baudouin, Jr <[email protected]> Date: Wed Sep 2 13:51:35 2020 -0400 build(deps): Upgrades yarn dependencies (#316) * build(deps): Upgrades yarn dependencies * build(deps): Upgrades yarn dependencies commit e0e537c Author: Chris Baudouin, Jr <[email protected]> Date: Wed Sep 2 11:37:14 2020 -0400 fix(deps): Updates the locked Ruby version (#340) commit ac720d9 Author: Chris Baudouin, Jr <[email protected]> Date: Tue Sep 1 01:26:46 2020 -0400 refactor(questionnaire): No longer deletes user with questionnaire (#287) * refactor(questionnaire): No longer deletes user with questionnaire * Hound whitespace commit 5e96a9c Author: Chris Baudouin, Jr <[email protected]> Date: Sun Aug 30 01:04:37 2020 -0400 feat(messages): Transitions from SparkPost to SendGrid (#285) * feat(messages): Transitions from SparkPost to SendGrid * Fixes Hound issues (v1) * fix: Hound whitespace issue * refactor: Removes stubbed-out code for HM2.1 * Update README.md * Update README.md Co-authored-by: Peter Kos <[email protected]> commit abcf634 Author: Chris Baudouin, Jr <[email protected]> Date: Sun Aug 30 00:36:26 2020 -0400 feat(Dashboard): Redesigns sidebar with category labels (#290) * feat(dashboard): Adds category labels to sidebar * refactor: Changes config to settings, adds localization * refactor: Adds localization to sidebar * refactor: Adds localization to page titles * refactor: Adds "Overview" category for event-wide pages * refactor: Adds missing localizers commit c6d33a9 Author: Chris Baudouin, Jr <[email protected]> Date: Sun Aug 30 00:08:09 2020 -0400 build(deps): Updates gem cache (#334) commit 68b8590 Author: Chris Baudouin, Jr <[email protected]> Date: Sat Aug 29 23:52:39 2020 -0400 build: Upgrades Rails to 2.6.6 (#312) Co-authored-by: Peter Kos <[email protected]> commit 6266f5a Author: Peter Kos <[email protected]> Date: Sat Aug 29 23:38:17 2020 -0400 refactor: `first_name` and `last_name` move from `questionnaire` to `user` (#241) * Initial move: first/last name; user->quesitonnaire - Models adjusted - Migration made (needs to be updated to a MOVE, not a delete) - Updated SOME tests and factories - Create account works * refactor: Attempt to fix backend params Includes fixing any discrepancies on routes like `/manage` * refactor: Make HoundBot a little happier * feat: Admin list shows first/last names * inprog on stats page - Actually retreive first/last names on questionnaires page * Refactored stats datatable and controller - Checkin datatable also tweaked to work. - Removed resumes; #244 * Migration is now backwards compatible with pre-2.0 Needs to be added to 2.0 migration guide! * 4space->2space 😡 #downwith2spaces * Fix various first_name/last_name bugs Most annoying one is in the questionnaire edit screen... * Fixed remainder of tests for name refactor * Fix datatable style and count ranges * Fix some more style bugs * Viewing bus list w/ passengers now works * Adds Users & Staff support for #222 * Adds #222 support to stats, fixes stats layout * Fixes Hound issues * Removes Hound whitespace issues * History audit bugfix No longer nil as we don’t check the type of the previous history and just show both, risking a nil visible on the questionnaire page if value is set for the first time * Add nil check back, whoops. This works better. * Squashed commit of the following: commit 4d1b4e2 Author: Chris Baudouin, Jr <[email protected]> Date: Wed Jul 1 01:08:19 2020 -0400 Back merge master (#273) * fix(dashboard): Fixes security vulnerability that allowed event_tracking role to access Dashboard (#215) * chore(release): 1.22.3 [skip ci] ## [1.22.3](v1.22.2...v1.22.3) (2020-05-16) ### Bug Fixes * **dashboard:** Fixes security vulnerability that allowed event_tracking role to access Dashboard ([#215](#215)) ([](74a40ad)) ### Styles * **check-in:** Changes table header to be more descriptive ([#207](#207)) ([](889fbd0)) * **config:** Removes unused event_is_over flag ([#208](#208)) ([](0c73e66)) * build(deps): Upgrade yarn (#212) * build(deps): Upgrade yarn * build(deps): Upgrade gems * build(deps): Remove obsolete gems * v0.0.0 * build(deps): Update semantic-release * fix(questionnaire): visual bug in school autocomplete school dropdown the css was set for an "a" tag when the list was made up of divs so I switched the css to work for the "div" tag in the autocomplete * fix(questionnaire): visual bug in school autocomplete school dropdown the css was set for an "a" tag when the list was made up of divs so I switched the css to work for the "div" tag in the autocomplete. I also hide a element that was not present earlier * build(deps): Upgrades Rails to 5.2.4.3 * build(deps): Upgrades gems Co-authored-by: Jeremy Rudman <[email protected]> * build(deps): Bump puma from 4.3.4 to 4.3.5 (#219) Bumps [puma](https://github.com/puma/puma) from 4.3.4 to 4.3.5. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/commits) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): Upgrades Puma cache (#221) * fix(questionnaire): Fixes error when trying to view a questionnaire modified by a deleted admin (#236) * chore(release): 1.22.4 [skip ci] ## [1.22.4](v1.22.3...v1.22.4) (2020-05-26) ### Bug Fixes * **questionnaire:** Fixes error when trying to view a questionnaire modified by a deleted admin ([#236](#236)) ([](2ffe116)) * build(deps): Bump websocket-extensions from 0.1.4 to 0.1.5 (#250) * build(deps): Bump websocket-extensions from 0.1.4 to 0.1.5 Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-ruby) from 0.1.4 to 0.1.5. - [Release notes](https://github.com/faye/websocket-extensions-ruby/releases) - [Changelog](https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md) - [Commits](faye/websocket-extensions-ruby@0.1.4...0.1.5) Signed-off-by: dependabot[bot] <[email protected]> * build(deps): Updates websocket-extensions gem cache Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Chris Baudouin, Jr <[email protected]> * build(deps): Bump rack from 2.2.2 to 2.2.3 (#268) * build(deps): Bump rack from 2.2.2 to 2.2.3 Bumps [rack](https://github.com/rack/rack) from 2.2.2 to 2.2.3. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](rack/rack@v2.2.2...2.2.3) Signed-off-by: dependabot[bot] <[email protected]> * Adds rack gem cache Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Chris Baudouin, Jr <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: Jeremy Rudman <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Kos <[email protected]> commit 513e1c2 Author: Chris Baudouin, Jr <[email protected]> Date: Tue Jun 30 18:45:42 2020 -0400 fix(login): Removes always visible login error (#263) * fix(login): Removes always visible login error * Fixes Hound spacing requirement commit 58601a1 Author: Chris Baudouin, Jr <[email protected]> Date: Sun Jun 28 19:16:08 2020 -0400 build(deps): Updates gems (#275) commit d1a01f8 Author: Peter Kos <[email protected]> Date: Sat Jun 20 19:26:53 2020 -0400 docs: Add guide for local API setup, update api-usage slightly (#235) * docs: Add API/OAuth 2 setup guide Also rename api to api-usage * docs: Cleanup api-usage page, add notes about 2.0 * docs: Apply suggestions from code review Co-authored-by: Stuart Olivera <[email protected]> * docs: Reword API introduction to be more friendly - Clarifies what Postman and Paw are, with links to their product pages - Notes that this process works for remote instances as well, not just localhost - Removed trailing whitespace and extra newlines - Fixed a single typo * Verbiage and HM typo fixes * Added .DS_Store to .gitignore Co-authored-by: Stuart Olivera <[email protected]> commit 82a7ff4 Author: Chris Baudouin, Jr <[email protected]> Date: Thu Jun 18 08:58:35 2020 -0400 fix(config): Removes disable_account_registration from database (#247) * fix(config): Removes disable_account_registration from database * fix(config): Saves new config item, adds extra precautionary check commit f07ec28 Author: Chris Baudouin, Jr <[email protected]> Date: Thu Jun 11 17:35:16 2020 -0400 fix(questionnaire): Fixes error when trying to view a questionnaire modified by a deleted admin (#238) * fix(dashboard): Fixes security vulnerability that allowed event_tracking role to access Dashboard (#215) * chore(release): 1.22.3 [skip ci] ## [1.22.3](v1.22.2...v1.22.3) (2020-05-16) ### Bug Fixes * **dashboard:** Fixes security vulnerability that allowed event_tracking role to access Dashboard ([#215](#215)) ([](74a40ad)) ### Styles * **check-in:** Changes table header to be more descriptive ([#207](#207)) ([](889fbd0)) * **config:** Removes unused event_is_over flag ([#208](#208)) ([](0c73e66)) * build(deps): Upgrade yarn (#212) * build(deps): Upgrade yarn * build(deps): Upgrade gems * build(deps): Remove obsolete gems * v0.0.0 * build(deps): Update semantic-release * fix(questionnaire): visual bug in school autocomplete school dropdown the css was set for an "a" tag when the list was made up of divs so I switched the css to work for the "div" tag in the autocomplete * fix(questionnaire): visual bug in school autocomplete school dropdown the css was set for an "a" tag when the list was made up of divs so I switched the css to work for the "div" tag in the autocomplete. I also hide a element that was not present earlier * build(deps): Upgrades Rails to 5.2.4.3 * build(deps): Upgrades gems Co-authored-by: Jeremy Rudman <[email protected]> * build(deps): Bump puma from 4.3.4 to 4.3.5 (#219) Bumps [puma](https://github.com/puma/puma) from 4.3.4 to 4.3.5. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/commits) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): Upgrades Puma cache (#221) * fix(questionnaire): Fixes error when trying to view a questionnaire modified by a deleted admin * refactor(tests): Cleans verbage of tests to match Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: Jeremy Rudman <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix undefined err on bus list info * Fix bus captain bug, update schema * Squashed commit of the following: commit ede300f Author: Chris Baudouin, Jr <[email protected]> Date: Sat Aug 29 21:05:53 2020 -0400 feat: Updates MyMLH to V3 (#329) * feat: Updates MyMLH to V3 * fix(User): Adds missing provider field * refactor: Updates MyMLH branding * Autofill MyMLH provider if info is missing * houndbot Co-authored-by: Peter Kos <[email protected]> commit 675b3f6 Author: Chris Baudouin, Jr <[email protected]> Date: Sun Aug 23 22:43:48 2020 -0400 refactor: Changes "Applications" to "Questionnaires" in map (#326) commit 388c9bd Author: Chris Baudouin, Jr <[email protected]> Date: Sun Aug 23 22:08:26 2020 -0400 fix(Dashboard): Fixes missing location data in map (#324) commit a062140 Author: Chris Baudouin, Jr <[email protected]> Date: Wed Aug 19 11:02:07 2020 -0400 feat(docs): Initial documentation for 2.0 (#291) * feat(docs): Initial documentation for 2.0 * refactor: Updates maintenance.md for verbage changes * refactor: Refactors structure of navigation commit 79831f6 Author: JeremyRudman <[email protected]> Date: Sat Jul 25 12:47:35 2020 -0400 feat(messages): Adds a confirmation modal to send messages (#272) * feat(message): added a confirmation modal to send messages added a modal for when you send a message that displays the number of people you are sending it to in large red text. * fix: houndci formatting errors * fix(messages): fixed error and made changes to text made "send message" singular and made only the the number red. I also fixed the variable not loading properly * fix: houndci styling changes * feat: made email modal text black instead of red the email confirmation modal displays the number in black instead of red * refactor: Adds number delimiter to recipients, changes cancel outline Co-authored-by: Chris Baudouin, Jr <[email protected]> commit e4169a7 Author: JeremyRudman <[email protected]> Date: Thu Jul 9 00:39:23 2020 -0400 fix(questionnaire): School autocomplete matches form field width (#278) * fix(questionnaire): school autocomplete matchs fourm field width * fix(questionnaires): added ellipsis to autocomplete when the forum field is smaller the school name the autocomplete goes beyond the width the field and this causes the text to ellipsis in thet case * Actually assign current_user * mymlh working * Refactor questionnnaire new to be nicer to read * Patch condition error for info refactor Was attempting to use potentially nil value before checking if the value was nil ALso cleaned up part of the test in questionnaires controler to create the entire user object as we need both first/last name, as well as email. #goodcodestyle #pleasehiremegoogle Co-authored-by: Chris Baudouin, Jr <[email protected]> Co-authored-by: Chris Baudouin, Jr <[email protected]>
1 parent 8f6e894 commit 66975f9

File tree

103 files changed

+12332
-840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+12332
-840
lines changed

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ AWS_ACCESS_KEY_ID="abc"
55
AWS_SECRET_ACCESS_KEY="123"
66
AWS_REGION="us-east-1"
77
AWS_ENDPOINT=""
8-
SPARKPOST_API_KEY="foo"
8+
SENDGRID_API_KEY="foo"

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
/public/assets
2424
.byebug_history
2525

26+
/coverage
27+
2628
# Ignore master key for decrypting credentials and more.
2729
/config/master.key
2830

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.5
1+
2.6.6

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55
ruby '>= 2.5'
66

77
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
8-
gem 'rails', '~> 5.2.4.3'
8+
gem 'rails', '~> 5.2.4.4'
99
# Use mysql as the database for Active Record
1010
gem 'mysql2', '>= 0.4.4', '< 0.6.0'
1111
# Use Puma as the app server
@@ -53,7 +53,7 @@ gem 'haml-rails', '~> 2.0'
5353
gem 'simple_form'
5454
gem 'ajax-datatables-rails', '~> 1.0'
5555
gem 'roadie-rails'
56-
gem 'chartkick', '~> 3.3'
56+
gem 'chartkick', '~> 3.4'
5757
gem 'groupdate'
5858
gem 'font-awesome-rails', '~> 4.0' # needed for icon helpers
5959
gem 'mustache', '~> 1.0'
@@ -82,7 +82,7 @@ gem 'sidekiq-cron', '~> 1.1'
8282
gem 'rails-settings-cached', '~> 0.7.2'
8383
gem 'blazer'
8484
gem 'simple_spark'
85-
gem 'sparkpost_rails'
85+
gem 'sendgrid-actionmailer'
8686
gem 'httparty'
8787
gem 'rollbar', '~> 2.8'
8888
gem 'rubyzip', '>= 1.3.0'

Gemfile.lock

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.2.4.3)
5-
actionpack (= 5.2.4.3)
4+
actioncable (5.2.4.4)
5+
actionpack (= 5.2.4.4)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailer (5.2.4.3)
9-
actionpack (= 5.2.4.3)
10-
actionview (= 5.2.4.3)
11-
activejob (= 5.2.4.3)
8+
actionmailer (5.2.4.4)
9+
actionpack (= 5.2.4.4)
10+
actionview (= 5.2.4.4)
11+
activejob (= 5.2.4.4)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.2.4.3)
15-
actionview (= 5.2.4.3)
16-
activesupport (= 5.2.4.3)
14+
actionpack (5.2.4.4)
15+
actionview (= 5.2.4.4)
16+
activesupport (= 5.2.4.4)
1717
rack (~> 2.0, >= 2.0.8)
1818
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.2.4.3)
22-
activesupport (= 5.2.4.3)
21+
actionview (5.2.4.4)
22+
activesupport (= 5.2.4.4)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.2.4.3)
28-
activesupport (= 5.2.4.3)
27+
activejob (5.2.4.4)
28+
activesupport (= 5.2.4.4)
2929
globalid (>= 0.3.6)
30-
activemodel (5.2.4.3)
31-
activesupport (= 5.2.4.3)
32-
activerecord (5.2.4.3)
33-
activemodel (= 5.2.4.3)
34-
activesupport (= 5.2.4.3)
30+
activemodel (5.2.4.4)
31+
activesupport (= 5.2.4.4)
32+
activerecord (5.2.4.4)
33+
activemodel (= 5.2.4.4)
34+
activesupport (= 5.2.4.4)
3535
arel (>= 9.0)
36-
activestorage (5.2.4.3)
37-
actionpack (= 5.2.4.3)
38-
activerecord (= 5.2.4.3)
36+
activestorage (5.2.4.4)
37+
actionpack (= 5.2.4.4)
38+
activerecord (= 5.2.4.4)
3939
marcel (~> 0.3.1)
40-
activesupport (5.2.4.3)
40+
activesupport (5.2.4.4)
4141
concurrent-ruby (~> 1.0, >= 1.0.2)
4242
i18n (>= 0.7, < 2)
4343
minitest (~> 5.1)
@@ -100,15 +100,15 @@ GEM
100100
rack-test (>= 0.6.3)
101101
regexp_parser (~> 1.5)
102102
xpath (~> 3.2)
103-
chartkick (3.3.1)
103+
chartkick (3.4.0)
104104
childprocess (3.0.0)
105105
chromedriver-helper (2.1.1)
106106
archive-zip (~> 0.10)
107107
nokogiri (~> 1.8)
108108
codeclimate-test-reporter (0.6.0)
109109
simplecov (>= 0.7.1, < 1.0.0)
110110
coderay (1.1.3)
111-
concurrent-ruby (1.1.6)
111+
concurrent-ruby (1.1.7)
112112
connection_pool (2.2.3)
113113
crack (0.4.3)
114114
safe_yaml (~> 1.0.0)
@@ -195,7 +195,7 @@ GEM
195195
httparty (0.18.1)
196196
mime-types (~> 3.0)
197197
multi_xml (>= 0.5.2)
198-
i18n (1.8.3)
198+
i18n (1.8.5)
199199
concurrent-ruby (~> 1.0)
200200
io-like (0.3.1)
201201
jmespath (1.4.0)
@@ -211,7 +211,7 @@ GEM
211211
rb-fsevent (~> 0.9, >= 0.9.4)
212212
rb-inotify (~> 0.9, >= 0.9.7)
213213
ruby_dep (~> 1.2)
214-
loofah (2.6.0)
214+
loofah (2.7.0)
215215
crass (~> 1.0.2)
216216
nokogiri (>= 1.5.9)
217217
lumberjack (1.2.6)
@@ -226,7 +226,7 @@ GEM
226226
mimemagic (0.3.5)
227227
mini_mime (1.0.2)
228228
mini_portile2 (2.4.0)
229-
minitest (5.14.1)
229+
minitest (5.14.2)
230230
minitest-reporters (1.4.2)
231231
ansi
232232
builder
@@ -239,8 +239,8 @@ GEM
239239
mustache (1.1.1)
240240
mysql2 (0.5.3)
241241
nenv (0.3.0)
242-
nio4r (2.5.2)
243-
nokogiri (1.10.9)
242+
nio4r (2.5.3)
243+
nokogiri (1.10.10)
244244
mini_portile2 (~> 2.4.0)
245245
notiffany (0.1.3)
246246
nenv (~> 0.1)
@@ -279,18 +279,18 @@ GEM
279279
rack
280280
rack-test (1.1.0)
281281
rack (>= 1.0, < 3)
282-
rails (5.2.4.3)
283-
actioncable (= 5.2.4.3)
284-
actionmailer (= 5.2.4.3)
285-
actionpack (= 5.2.4.3)
286-
actionview (= 5.2.4.3)
287-
activejob (= 5.2.4.3)
288-
activemodel (= 5.2.4.3)
289-
activerecord (= 5.2.4.3)
290-
activestorage (= 5.2.4.3)
291-
activesupport (= 5.2.4.3)
282+
rails (5.2.4.4)
283+
actioncable (= 5.2.4.4)
284+
actionmailer (= 5.2.4.4)
285+
actionpack (= 5.2.4.4)
286+
actionview (= 5.2.4.4)
287+
activejob (= 5.2.4.4)
288+
activemodel (= 5.2.4.4)
289+
activerecord (= 5.2.4.4)
290+
activestorage (= 5.2.4.4)
291+
activesupport (= 5.2.4.4)
292292
bundler (>= 1.3.0)
293-
railties (= 5.2.4.3)
293+
railties (= 5.2.4.4)
294294
sprockets-rails (>= 2.0.0)
295295
rails-controller-testing (1.0.5)
296296
actionpack (>= 5.0.1.rc1)
@@ -308,9 +308,9 @@ GEM
308308
rails_stdout_logging
309309
rails_serve_static_assets (0.0.5)
310310
rails_stdout_logging (0.0.5)
311-
railties (5.2.4.3)
312-
actionpack (= 5.2.4.3)
313-
activesupport (= 5.2.4.3)
311+
railties (5.2.4.4)
312+
actionpack (= 5.2.4.4)
313+
activesupport (= 5.2.4.4)
314314
method_source
315315
rake (>= 0.8.7)
316316
thor (>= 0.19.0, < 2.0)
@@ -333,6 +333,7 @@ GEM
333333
rollbar (2.26.0)
334334
ruby-progressbar (1.10.1)
335335
ruby_dep (1.5.0)
336+
ruby_http_client (3.5.0)
336337
ruby_parser (3.14.2)
337338
sexp_processor (~> 4.9)
338339
rubyzip (2.3.0)
@@ -353,6 +354,11 @@ GEM
353354
selenium-webdriver (3.142.7)
354355
childprocess (>= 0.5, < 4.0)
355356
rubyzip (>= 1.2.2)
357+
sendgrid-actionmailer (3.0.2)
358+
mail (~> 2.7)
359+
sendgrid-ruby (~> 6.0)
360+
sendgrid-ruby (6.3.2)
361+
ruby_http_client (~> 3.4)
356362
sexp_processor (4.15.0)
357363
shellany (0.0.1)
358364
shoulda (3.5.0)
@@ -379,8 +385,6 @@ GEM
379385
docile (~> 1.1)
380386
simplecov-html (~> 0.11)
381387
simplecov-html (0.12.2)
382-
sparkpost_rails (1.5.2)
383-
rails (>= 4.0, < 6.1)
384388
spring (2.1.0)
385389
spring-watcher-listen (2.0.1)
386390
listen (>= 2.7, < 4.0)
@@ -423,7 +427,7 @@ GEM
423427
addressable (>= 2.3.6)
424428
crack (>= 0.3.2)
425429
hashdiff (>= 0.4.0, < 2.0.0)
426-
websocket-driver (0.7.2)
430+
websocket-driver (0.7.3)
427431
websocket-extensions (>= 0.1.0)
428432
websocket-extensions (0.1.5)
429433
xpath (3.2.0)
@@ -444,7 +448,7 @@ DEPENDENCIES
444448
bootstrap (~> 4.3.1)
445449
byebug
446450
capybara (>= 2.15)
447-
chartkick (~> 3.3)
451+
chartkick (~> 3.4)
448452
chromedriver-helper
449453
codeclimate-test-reporter (~> 0.6.0)
450454
devise (~> 4.7)
@@ -469,7 +473,7 @@ DEPENDENCIES
469473
omniauth-mlh (~> 0.4.1)
470474
omniauth-rails_csrf_protection
471475
puma (~> 4.3)
472-
rails (~> 5.2.4.3)
476+
rails (~> 5.2.4.4)
473477
rails-controller-testing
474478
rails-settings-cached (~> 0.7.2)
475479
rails_12factor
@@ -481,14 +485,14 @@ DEPENDENCIES
481485
sass-rails (~> 6.0)
482486
selectize-rails
483487
selenium-webdriver
488+
sendgrid-actionmailer
484489
shoulda (~> 3.5)
485490
shoulda-matchers (~> 2.0)
486491
sidekiq (< 7)
487492
sidekiq-cron (~> 1.1)
488493
simple_form
489494
simple_spark
490495
simplecov
491-
sparkpost_rails
492496
spring
493497
spring-watcher-listen (~> 2.0.0)
494498
sprockets
@@ -503,7 +507,7 @@ DEPENDENCIES
503507
webmock (~> 3.4)
504508

505509
RUBY VERSION
506-
ruby 2.6.1p33
510+
ruby 2.6.6p146
507511

508512
BUNDLED WITH
509513
1.17.2

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ HackathonManager makes use of a few different third-party services & Ruby gems:
3131

3232
- [Devise](https://github.com/plataformatec/devise) + [MyMLH](https://my.mlh.io/) (authentication & attendee identity)
3333
- [Sidekiq](https://github.com/mperham/sidekiq) (background jobs)
34-
- [SparkPost](https://www.sparkpost.com/) (email)
35-
- [Amazon S3](https://aws.amazon.com/s3/) (resume storage)
36-
- [Chartkick](http://chartkick.com/) (management UI charts)
34+
- [SendGrid](https://sendgrid.com) (email)
35+
- [Amazon S3](https://aws.amazon.com/s3) (resume storage)
36+
- [Chartkick](http://chartkick.com) (management UI charts)
3737
- [Blazer](https://github.com/ankane/blazer) (custom SQL queries, analytics, and charts)
3838
- [Doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) (authentication via OAuth for API usage)
3939

app.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,8 @@
5858
"description": "Rollbar access token for code exception reporting",
5959
"required": false
6060
},
61-
"SPARKPOST_API_KEY": {
62-
"description": "SparkPost API key for sending email",
63-
"required": false
64-
},
65-
"SPARKPOST_CAMPAIGN_ID": {
66-
"description": "SparkPost campaign ID for sending email (e.g. the name of your hackathon)",
61+
"SENDGRID_API_KEY": {
62+
"description": "SendGrid API key for sending email",
6763
"required": false
6864
},
6965
"HM_DOMAIN_NAME": {

app/assets/stylesheets/forms/_forms.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ hr
5656
padding-right: 5px
5757

5858
// custom styles
59-
.form-container.login, .form-container.signup
59+
.form-container.login, .form-container.signup, .form-container.password
6060
max-width: 360px
6161
.btn
6262
margin-bottom: 30px

app/controllers/manage/questionnaires_controller.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class Manage::QuestionnairesController < Manage::ApplicationController
22
include QuestionnairesControllable
33

4-
before_action :set_questionnaire, only: [:show, :edit, :update, :destroy, :check_in, :convert_to_admin, :update_acc_status, :message_events]
4+
before_action :set_questionnaire, only: [:show, :edit, :update, :destroy, :check_in, :convert_to_admin, :update_acc_status]
55

66
respond_to :html, :json
77

@@ -103,9 +103,7 @@ def convert_to_admin
103103
end
104104

105105
def destroy
106-
user = @questionnaire.user
107106
@questionnaire.destroy
108-
user.destroy if user.present?
109107
respond_with(:manage, @questionnaire)
110108
end
111109

@@ -146,10 +144,6 @@ def bulk_apply
146144
head :ok
147145
end
148146

149-
def message_events
150-
render json: @questionnaire.message_events
151-
end
152-
153147
private
154148

155149
def questionnaire_params

0 commit comments

Comments
 (0)