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

Author: peterkos

Gemfile

@@ -39,7 +39,7 @@ gem 'bootsnap', '>= 1.1.0', require: false
 
 # Authentication
 gem 'devise', '~> 4.7'
-gem 'omniauth-mlh', '~> 0.1'
+gem 'omniauth-mlh', '~> 0.4.1'
 gem 'doorkeeper', '~> 5.0'
 gem 'devise-doorkeeper'
 gem 'omniauth-rails_csrf_protection'

Gemfile.lock

@@ -233,7 +233,7 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     msgpack (1.3.3)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mustache (1.1.1)
@@ -254,7 +254,7 @@ GEM
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-    omniauth-mlh (0.3.1)
+    omniauth-mlh (0.4.1)
       activesupport
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.3.1)
@@ -466,7 +466,7 @@ DEPENDENCIES
   minitest-reporters
   mustache (~> 1.0)
   mysql2 (>= 0.4.4, < 0.6.0)
-  omniauth-mlh (~> 0.1)
+  omniauth-mlh (~> 0.4.1)
   omniauth-rails_csrf_protection
   puma (~> 4.3)
   rails (~> 5.2.4.3)

app/assets/javascripts/manage/map.js

@@ -61,7 +61,7 @@ $.fn.initMap = function() {
       })
       .append('title')
       .text(function(d) {
-        return d.properties.name + '\nApplications: ' + formatNumber(appsById.get(d.id) || 0);
+        return d.properties.name + '\nQuestionnaires: ' + formatNumber(appsById.get(d.id) || 0);
       });
   }
 

app/assets/stylesheets/forms/_forms.sass

@@ -265,11 +265,17 @@ input[type=submit]
     padding: 2px 5px
     display: block
     cursor: pointer
-    &:hover, &.ui-state-focus
+    overflow: hidden
+    text-overflow: ellipsis
+    white-space: nowrap
+    &:hover
       @include css4
         background: var(--primary)
       @include css4
         color: var(--white)
+// needed for ellipsis in text to work and acts as a min-width
+.ui-menu
+  width: 50px
 
 // form wizard
 .wizard-stage

app/controllers/questionnaires_controller.rb

@@ -32,9 +32,6 @@ def new
         q.level_of_study = session["devise.provider_data"]["info"]["level_of_study"]
         q.major = session["devise.provider_data"]["info"]["major"]
         q.date_of_birth = session["devise.provider_data"]["info"]["date_of_birth"]
-        q.shirt_size = session["devise.provider_data"]["info"]["shirt_size"]
-        q.dietary_restrictions = session["devise.provider_data"]["info"]["dietary_restrictions"]
-        q.special_needs = session["devise.provider_data"]["info"]["special_needs"]
         q.gender = session["devise.provider_data"]["info"]["gender"]
 
         school = School.where(name: session["devise.provider_data"]["info"]["school"]["name"]).first_or_create do |s|

app/controllers/users/omniauth_callbacks_controller.rb

@@ -4,7 +4,7 @@ def mlh
     if @user.persisted?
       sign_in_and_redirect @user, event: :authentication # this will throw if @user is not activated
       session["devise.provider_data"] = request.env["omniauth.auth"]
-      set_flash_message(:notice, :success, kind: "My MLH") if is_navigational_format?
+      set_flash_message(:notice, :success, kind: "MyMLH") if is_navigational_format?
     else
       redirect_to new_user_registration_url
     end

app/models/user.rb

@@ -60,19 +60,25 @@ def self.from_omniauth(auth)
     matching_provider = where(provider: auth.provider, uid: auth.uid)
     matching_email = where(email: auth.info.email)
     matching_provider.or(matching_email).first_or_create do |user|
+      user.uid = auth.uid
       user.first_name = auth.first_name
       user.last_name = auth.last_name
-      user.uid = auth.uid
       user.email = auth.info.email
+      user.provider = auth.provider
       user.password = Devise.friendly_token[0, 20]
     end
+    # Autofill MyMLH provider if provider info is missing
+    # (as we are executing this from OAuth)
+    if current_user.provider.blank?
+      current_user.provider = auth.provider
+    end
+    current_user
   end
 
   def self.non_admins
     User.where.not(role: :admin).where.not(role: :admin_limited_access)
   end
 
-  # TODO: No longer needed?
   def self.without_questionnaire
     non_admins.left_outer_joins(:questionnaire).where(questionnaires: { id: nil })
   end

app/views/application/_questionnaire_summary.html.haml

@@ -17,10 +17,19 @@
 %p
   %b Traveling from:
   = @questionnaire.travel_not_from_school ? "Somewhere else (#{@questionnaire.travel_location})" : "My school (#{@questionnaire.school.full_name})"
+%p
+  %b Shirt size:
+  = @questionnaire.shirt_size
+%p
+  %b Dietary restrictions
+  = @questionnaire.dietary_restrictions || "<i>(none)</i>".html_safe
+%p
+  %b Special needs
+  = @questionnaire.special_needs || "<i>(none)</i>".html_safe
 
 %fieldset
   - if @questionnaire.user.provider == 'mlh'
-    %legend Provided by My MLH
+    %legend Provided by MyMLH
   %p
     %b First name:
     = @questionnaire.user.first_name
@@ -48,12 +57,3 @@
   %p
     %b Level of study:
     = @questionnaire.level_of_study
-  %p
-    %b Shirt size:
-    = @questionnaire.shirt_size
-  %p
-    %b Dietary restrictions
-    = @questionnaire.dietary_restrictions || "<i>(none)</i>".html_safe
-  %p
-    %b Special needs
-    = @questionnaire.special_needs || "<i>(none)</i>".html_safe

app/views/manage/dashboard/map_data.tsv.erb

@@ -23,8 +23,8 @@ redo_limit = 10
     addressMatches = result["addressMatches"]
     next if addressMatches.blank?
 
-    lat = result["addressMatches"][0]["coordinates"]["x"]
-    lng = result["addressMatches"][0]["coordinates"]["y"]
+    lng = result["addressMatches"][0]["coordinates"]["x"]
+    lat = result["addressMatches"][0]["coordinates"]["y"]
     next if lat.blank? || lng.blank?
 
     resp = HTTParty.get("https://geo.fcc.gov/api/census/area?lat=#{lat}&lon=#{lng}&format=json")

app/views/manage/messages/show.html.haml

@@ -1,6 +1,12 @@
 :ruby
   begin
-    recipient_count = pluralize(BulkMessageJob.build_recipients(@message.recipients).count, "recipient")
+    recipient_count = pluralize(BulkMessageJob.build_recipients(@message.recipients).count, "Recipient")
+    number_of_recipients = BulkMessageJob.build_recipients(@message.recipients).count
+    recipient_plural = "Recipient"
+    if number_of_recipients > 1
+      recipient_plural = "Recipients"
+    end
+
   rescue => recipient_error
   end
 
@@ -10,9 +16,25 @@
       - if recipient_error.present?
         %button.btn.btn-sm.btn-outline-secondary{disabled: 'disabled', title: 'Cannot deliver when there is a recipient error; see error above.'} Deliver
       - else
-        = link_to deliver_manage_message_path(@message), method: :patch, data: { confirm: "Are you sure? The message \"#{@message.name}\" will be sent to #{recipient_count}." }, class: 'btn btn-sm btn-primary' do
+        %button.btn.btn-sm.btn-primary{"data-toggle"=>"modal", "data-target"=>"#confirm-messages"}
           %span.fa.fa-send.icon-space-r-half
-          Send
+          %span Send
+        .modal{:id => "confirm-messages"}
+          .modal-dialog{:role => "document"}
+            .modal-content
+              .modal-header
+                %h5{:class => "modal-title"} Confirm
+              .modal-body
+                %p Are you sure? The message "#{@message.name}" will be sent to:
+                %h3.center
+                  %span.font-weight-bold
+                    = number_with_delimiter(number_of_recipients)
+                  %span
+                    = recipient_plural
+              .modal-footer
+                %button.btn.btn-outline-secondary{'data-dismiss'=>"modal"} Close
+                = link_to deliver_manage_message_path(@message), method: :patch, class: 'btn btn-danger' do
+                  %span Send Message
     - if @message.can_edit?
       = link_to 'Edit', edit_manage_message_path(@message), class: 'btn btn-sm btn-outline-secondary'
       = link_to 'Delete', manage_message_path(@message), method: :delete, data: { confirm: "Are you sure? The message \"#{@message.name}\" will be permanently erased. This action is irreversible." }, class: 'btn btn-sm btn-outline-secondary'