Merge branch '2.0' into hm-242

Author: cbaudouinjr

app/assets/stylesheets/forms/_forms.sass

@@ -61,6 +61,11 @@ hr
   .btn
     margin-bottom: 30px
 
+.text-overflow-center
+  text-align: center
+  display: flex
+  justify-content: center
+
 .simple_form
   @include css4
     color: var(--grey)

app/controllers/manage/application_controller.rb

@@ -1,7 +1,7 @@
 class Manage::ApplicationController < ApplicationController
   before_action :logged_in
   before_action :require_director_or_organizer_or_volunteer
-  before_action :limit_write_access_to_directors, only: ["edit", "update", "new", "create", "destroy", "convert_to_admin", "deliver", "merge", "perform_merge", "toggle_bus_captain", "duplicate", "update_acc_status", "send_update_email", "live_preview"]
+  before_action :limit_write_access_to_directors, only: ["edit", "update", "new", "create", "destroy", "deliver", "merge", "perform_merge", "toggle_bus_captain", "duplicate", "update_acc_status", "send_update_email", "live_preview"]
   skip_before_action :verify_authenticity_token, if: :json_request?
 
   def logged_in

app/controllers/manage/questionnaires_controller.rb

@@ -1,7 +1,7 @@
 class Manage::QuestionnairesController < Manage::ApplicationController
   include QuestionnairesControllable
 
-  before_action :set_questionnaire, only: [:show, :edit, :update, :destroy, :check_in, :convert_to_director, :update_acc_status]
+  before_action :set_questionnaire, only: [:show, :edit, :update, :destroy, :check_in, :update_acc_status]
 
   respond_to :html, :json
 
@@ -95,13 +95,6 @@ def check_in
     redirect_to index_redirect_path
   end
 
-  def convert_to_director
-    user = @questionnaire.user
-    @questionnaire.destroy
-    user.update_attributes(role: :director)
-    redirect_to edit_manage_user_path(user)
-  end
-
   def destroy
     @questionnaire.destroy
     respond_with(:manage, @questionnaire)

app/controllers/questionnaires_controller.rb

@@ -58,6 +58,7 @@ def create
     if current_user.reload.questionnaire.present?
       return redirect_to questionnaires_path, notice: 'Application already exists.'
     end
+    return unless HackathonConfig['accepting_questionnaires']
     @questionnaire = Questionnaire.new(convert_school_name_to_id(questionnaire_params))
     @questionnaire.user_id = current_user.id
 

app/mailers/user_mailer.rb

@@ -16,8 +16,15 @@ def bulk_message_email(message_id, user_id, message = nil, use_examples = false)
 
   def incomplete_reminder_email(user_id)
     @user = User.find_by_id(user_id)
-    return if @user.blank? || @user.director? || @user.questionnaire || Time.now.to_date > Date.parse(HackathonConfig["last_day_to_apply"])
+    return if @user.blank? || @user.director? || @user.questionnaire || Time.now.in_time_zone.to_date > Date.parse(HackathonConfig["last_day_to_apply"]).in_time_zone.to_date
 
     Message.queue_for_trigger("user.24hr_incomplete_application", @user.id)
   end
+
+  def rsvp_reminder_email(user_id)
+    @user = User.find_by_id(user_id)
+    return if @user.blank? || !@user.questionnaire.acc_status == "accepted" || Time.now.in_time_zone.to_date > Date.parse(HackathonConfig["event_start_date"]).in_time_zone.to_date
+
+    Message.queue_for_trigger("questionnaire.rsvp_reminder", @user.id)
+  end
 end

app/models/message.rb

@@ -37,6 +37,7 @@ class Message < ApplicationRecord
     "questionnaire.late_waitlist" => "Questionnaire Status: Waitlisted, Late",
     "questionnaire.rsvp_confirmed" => "Questionnaire Status: RSVP Confirmed",
     "questionnaire.rsvp_denied" => "Questionnaire Status: RSVP Denied",
+    "questionnaire.rsvp_reminder" => "Questionnaire: RSVP Reminder",
     "user.24hr_incomplete_application" => "User: Incomplete application (24 hours later)",
     "bus_list.new_captain_confirmation" => "Bus List: New captain confirmation",
     "bus_list.notes_update" => "Bus List: Updated notes (manually triggered)"

app/models/questionnaire.rb

@@ -10,6 +10,7 @@ class Questionnaire < ApplicationRecord
   before_validation :clean_negative_dietary_restrictions
   after_create :queue_triggered_email_create
   after_update :queue_triggered_email_update
+  after_update :queue_triggered_email_rsvp_reminder
   after_save :update_school_questionnaire_count
   after_destroy :update_school_questionnaire_count
 
@@ -249,4 +250,18 @@ def queue_triggered_email_update
   def queue_triggered_email_create
     Message.queue_for_trigger("questionnaire.#{acc_status}", user_id)
   end
+
+  def queue_triggered_email_rsvp_reminder
+    if saved_change_to_acc_status? && acc_status == "accepted"
+      days_remaining = Date.parse(HackathonConfig["event_start_date"]).in_time_zone.to_date - Time.now.in_time_zone.to_date
+      if days_remaining > 14
+        deliver_date = 7.days.from_now
+      elsif days_remaining > 10
+        deliver_date = 5.days.from_now
+      elsif days_remaining > 3
+        deliver_date = 2.days.from_now
+      end
+      UserMailer.rsvp_reminder_email(user_id).deliver_later(wait_until: deliver_date) if deliver_date.present?
+    end
+  end
 end

app/views/devise/passwords/edit.html.haml

@@ -2,7 +2,7 @@
 .form-container.password
   .section-title.center
     Change Your
-    %span.emphasized Password
+    .emphasized Password
   = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
     = f.error_notification
     = f.input :reset_password_token, as: :hidden

app/views/devise/passwords/new.html.haml

@@ -2,6 +2,6 @@
 .form-container.password
   %h1.section-title.center
     Reset Your
-    %span.emphasized Password
+    .emphasized Password
 
   = render 'form'

app/views/devise/registrations/new.html.haml

@@ -2,7 +2,7 @@
 .form-container.signup
   %h1.section-title.center
     Register for
-    %span.emphasized= HackathonConfig['name']
+    .emphasized.text-overflow-center= HackathonConfig['name']
 
   - if !HackathonConfig['accepting_questionnaires'] || HackathonConfig['disclaimer_message'].present?
     #disclaimer