hackathon_manager 0.7.1 → 0.8.0

data/app/views/manage/configs/show.html.haml

@@ -1,7 +1,7 @@
 = render "layouts/manage/page_title", title: "Hackathon Configuration"
 
 .row
-  .col-lg-6
+  .col-lg-6.mb-3
     .card
       .card-body
         %h5.card-title Hackathon Manager Config
@@ -15,7 +15,7 @@
             %b #{key}:
             %pre= Rails.configuration.hackathon[key]
 
-  .col-lg-6
+  .col-lg-6.mb-3
     .card
       .card-body
         %h5.card-title Environment Variables

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

@@ -3,6 +3,8 @@
 <%
 counties = {}
 amount = 1
+redo_count = 0
+redo_limit = 10
 @schools.each do |school|
   if school.fips_code.blank?
     next if school.city.blank? || school.state.blank?
@@ -10,8 +12,13 @@ amount = 1
     resp = HTTParty.get("https://maps.googleapis.com/maps/api/geocode/json?address=#{CGI.escape(school.city)}+#{CGI.escape(school.state)}&sensor=true")
     results = resp.parsed_response["results"][0]
     if results.blank?
+      if redo_count >= redo_limit
+        raise 'Exceeded maximum number of retries: No results from Google Maps API.'
+      end
+      redo_count += 1
       redo
     end
+    redo_count = 0
 
     lat = results["geometry"]["location"]["lat"]
     lng = results["geometry"]["location"]["lng"]

data/app/views/manage/messages/_form.html.haml

@@ -3,15 +3,24 @@
     = f.error_notification
 
     .form-inputs
+      = f.input :type, as: :select, collection: Message::POSSIBLE_TYPES.map { |x| [x.titleize, x] }, include_blank: false
+      = f.input :trigger, as: :select, collection: Message::POSSIBLE_TRIGGERS.invert, include_blank: "(disabled)"
       = f.input :name
       = f.input :subject, hint: "All emails are from <pre class=\"d-inline\">#{html_escape(Rails.configuration.hackathon['email_from'])}</pre>".html_safe
       = f.input :template, as: :select, collection: Message::POSSIBLE_TEMPLATES.map { |x| [x.titleize, x] }, include_blank: false
       - if @message.status == "drafted"
-        = f.input :recipients, as: :select, collection: @message.possible_recipients, input_html: { class: "selectize", multiple: true,  }, hint: "Sent manually, in bulk", placeholder: "Type to search by school or type..."
+        = f.input :recipients, as: :select, collection: @message.possible_recipients, input_html: { class: "selectize", multiple: true,  }, placeholder: "Type to search by school or type..."
       - else
         = f.input :recipients, as: :select, collection: @message.possible_recipients, input_html: { class: "selectize", multiple: true }, hint: "Cannot be edited once a message has been delivered", disabled: true
-      = f.input :trigger, as: :select, collection: Message::POSSIBLE_TRIGGERS.invert, include_blank: "(no automatic trigger)", hint: "Sent automatically, to an individual applicant"
-      = f.input :body, input_html: { rows: 10 }, hint: "Supports markdown and HTML"
+      %br
 
-    .form-actions
+    .row
+      .col-lg-6.mb-3
+        %h5.mb-3 Body
+        = f.input :body, input_html: { rows: 23, 'data-message-live-preview' => 'textarea', class: 'text-monospace', style: 'font-size: 14px' }, hint: "Supports markdown and HTML", label: false, wrapper: :bootstrap_inline_form
+      .col-lg-6.mb-3
+        %h5.mb-3 Preview
+        %iframe.email-preview{src: live_preview_manage_messages_path(body: @message.body), 'data-message-live-preview' => 'iframe', 'data-message-live-preview-base-src' => live_preview_manage_messages_path}
+
+    .form-actions.mb-3
       = f.button :submit, class: 'btn-primary'

data/app/views/manage/messages/index.html.haml

@@ -2,15 +2,16 @@
   = link_to "New Message", new_manage_message_path, class: "btn btn-sm btn-outline-secondary"
 
 %div
-  %table.messages.datatable.table.table-striped.table-hover{ "data-source" => datatable_manage_messages_path(format: :json) }
+  %table.bulk-messages.datatable.table.table-striped.table-hover{ "data-source" => datatable_manage_messages_path(format: :json) }
     %thead
       %tr
         %th ID
         %th Name
         %th Subject
-        %th Trigger
-        %th Bulk Status
-        %th Bulk Delivered
+        %th Status
+        %th Created
+        %th Last modified
+        %th Delivered
     %tbody
 
   %hr

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

@@ -28,29 +28,29 @@
       %dt.col-md-3 Template
       %dd.col-md-9= @message.template.titleize
   .col-lg-6
-    %p.mb-1
-      %b Recipients
-      %small
-        %em Sent manually, in bulk
-    %ul.pl-4.mb-1
-      - @message.recipients_list.each do |recipient|
-        %li= recipient
-    - if @message.recipients.blank?
-      %p.text-muted (none)
-    - if @message.recipients.present?
-      %p.small
-        - if recipient_error.present?
-          %strong{style: 'color: red;'} Error parsing recipients:
-          = recipient_error
-          %br To resolve this, edit & remove the offending recipient.
-        - else
-          %em #{recipient_count} currently match this query
-    %p.mb-1
-      %b Trigger
-      %small
-        %em Sent automatically, to an applicant once they match this criteria
-    %p
-      = Message::POSSIBLE_TRIGGERS[@message.trigger] || "<span class=\"text-muted\">(no automatic trigger)</span>".html_safe
+    - if @message.bulk?
+      %p.mb-1
+        %b Recipients
+      %ul.pl-4.mb-1
+        - @message.recipients_list.each do |recipient|
+          %li= recipient
+      - if @message.recipients.blank?
+        %p.text-muted (none)
+      - if @message.recipients.present?
+        %p.small
+          - if recipient_error.present?
+            %strong{style: 'color: red;'} Error parsing recipients:
+            = recipient_error
+            %br To resolve this, edit & remove the offending recipient.
+          - else
+            %em #{recipient_count} currently match this query
+    - if @message.automated?
+      %p.mb-1
+        %b Trigger
+        %small
+          %em Sent automatically to an applicant upon meeting this criteria
+      %p
+        = Message::POSSIBLE_TRIGGERS[@message.trigger] || "<span class=\"text-muted\">(disabled)</span>".html_safe
 
 %div
   %p
@@ -61,7 +61,7 @@
 
   %iframe.email-preview{src: preview_manage_message_path(@message)}
 
-  - if @message.recipients_list.present?
+  - if @message.bulk?
     .card.mt-3.mb-3
       .card-body
         %h5.card-title Bulk delivery details

data/app/views/manage/questionnaires/_overview.html.haml

@@ -82,9 +82,19 @@
       .card-body
         .row
           %dt.col-md-4 Dietary restrictions
-          %dd.col-md-8= @questionnaire.dietary_restrictions || "<span class=\"text-muted\">(none)</span>".html_safe
+          %dd.col-md-8
+            - if @questionnaire.dietary_restrictions.present?
+              %span.fa.fa-exclamation-triangle.text-warning.icon-space-r-half
+              = @questionnaire.dietary_restrictions
+            - else
+              %span.text-muted (none)
           %dt.col-md-4 Special needs
-          %dd.col-md-8= @questionnaire.special_needs || "<span class=\"text-muted\">(none)</span>".html_safe
+          %dd.col-md-8
+            - if @questionnaire.special_needs.present?
+              %span.fa.fa-exclamation-triangle.text-warning.icon-space-r-half
+              = @questionnaire.special_needs
+            - else
+              %span.text-muted (none)
           %dt.col-md-4 Traveling from
           %dd.col-md-8
             = @questionnaire.travel_not_from_school ? "Somewhere else (#{@questionnaire.travel_location})" : "<span class=\"text-muted\">My school</span>".html_safe

data/app/views/manage/questionnaires/index.html.haml

@@ -23,11 +23,13 @@
         %th Email
         %th Phone
         %th Gender
-        %th Date of Birth
+        %th Date of birth
         %th Status
         %th Checked In
         %th School
         %th Applied on
+        %th Dietary restrictions
+        %th Special needs
     %tbody
 
   .row

data/config/locales/en.yml

@@ -40,6 +40,10 @@ en:
         notes: Notes are shared with applicants. Supports Markdown and HTML.
       user:
         admin_limited_access: Limited access prevents the admin from adding, modifying, or deleting any records. Modifications through the check-in process are allowed.
+      message:
+        type: Bulk emails are sent once, manually. Automated emails are sent upon a desired trigger/event.
+        name: A friendly name to recognize this email. Applicants won't see this.
+        trigger: Sent automatically when a new or updated applicant matches this criteria. Does not send to anyone already matching this criteria.
     placeholders:
       bus_list:
         notes: |

data/config/routes.rb

@@ -53,6 +53,7 @@ Rails.application.routes.draw do
     end
     resources :messages do
       get :preview, on: :member
+      get :live_preview, on: :collection
       post :datatable, on: :collection
       patch :deliver, on: :member
       patch :duplicate, on: :member

data/db/migrate/20180801144544_add_type_to_messages.rb

@@ -0,0 +1,17 @@
+class AddTypeToMessages < ActiveRecord::Migration[5.1]
+  def up
+    add_column :messages, :type, :string
+
+    Message.all.each do |message|
+      if message.trigger.present?
+        message.update_attribute(:type, 'automated')
+      else
+        message.update_attribute(:type, 'bulk')
+      end
+    end
+  end
+
+  def down
+    remove_column :messages, :type, :string
+  end
+end

data/{app/views/mailer/accepted_email.html.erb → db/seed_messages/questionnaire--accepted.md}

@@ -1,5 +1,7 @@
-<h2>Congratulations <%= @questionnaire.first_name %>, you're in!</h2>
-<p>You have been accepted to attend <%= Rails.configuration.hackathon['name'] %>! Please RSVP:</p>
+## Congratulations <%= @questionnaire.first_name %>, you're in!
+
+You have been accepted to attend <%= Rails.configuration.hackathon['name'] %>! **Please RSVP:**
+
 <p>
   <a href="https://brickhack.io/rsvp/accept" class="button" target="_blank">Yes, I will Attend &raquo;</a>
   <a href="https://brickhack.io/rsvp/deny" class="button" target="_blank">No, I Can't Attend &raquo;</a>

data/db/seed_messages/questionnaire--denied.md

@@ -0,0 +1,16 @@
+<!--
+
+IMPLEMENT THIS!
+
+You'll probably want something along the lines of:
+
+### Dear @questionnaire.first_name,
+
+It is with our sincerest regret to inform you that our admissions committee has chosen to not accept your application to BrickHack at this time. We were overjoyed with the number of applicants we received, but unfortunately we can not accept everyone due to capacity for only 400.
+
+We invite you to apply again next year. There are plenty of other hackathons this season, and it may not be too late to apply for those. Checkout <a href="https://mlh.io" target="_blank">https://mlh.io</a> to find out more information.
+
+Thank you for applying,<br>
+ - The BrickHack Team
+
+-->

data/db/seed_messages/questionnaire--pending.md

@@ -0,0 +1,13 @@
+<h2 class="center">
+  Thanks for Applying!
+</h2>
+
+Hey <%= @questionnaire.first_name %>,
+
+We've received your application to <%= Rails.configuration.hackathon['name'] %>!
+
+If needed, you can edit your information by clicking the button below.
+
+<%= link_to questionnaires_url, class: 'button' do %>
+  My Profile
+<% end %>

data/db/seed_messages/questionnaire--rsvp_confirmed.md

@@ -0,0 +1,9 @@
+## You are confirmed!
+
+This is your confirmation for <%= Rails.configuration.hackathon['name'] %>! We can't wait to see you there. In the meantime, follow us on [Facebook](https://www.facebook.com/brickhackrit) and [Twitter](https://twitter.com/brickhackrit) to get news and updates.
+
+**If you can no longer attend, please let us know so we can open the spot to someone else. [I Can No Longer Attend &raquo;](https://brickhack.io/rsvp/deny)**
+
+### Meet Other Hackers
+
+Join our [Facebook Group](https://www.facebook.com/groups/brickhack3attendees/) to get in touch with other attendees. This will be the best way to find teammates if you don't have a team already!

data/db/seeds.rb

@@ -8,6 +8,45 @@
 
 require 'csv'
 
+puts "Seeding messages..."
+
+subject_mapping = {
+  "questionnaire.pending" => "Application Received",
+  "questionnaire.accepted" => "You've been accepted!",
+  "questionnaire.denied" => "Your application status",
+  "questionnaire.rsvp_confirmed" => "RSVP Confirmation"
+}
+
+name_mapping = {
+  "questionnaire.pending" => "Application Received",
+  "questionnaire.accepted" => "Accepted email",
+  "questionnaire.denied" => "Denied email",
+  "questionnaire.rsvp_confirmed" => "RSVP confirmed email"
+}
+
+path = File.join(File.dirname(__FILE__), 'seed_messages/*.md')
+files = FileList.glob(path)
+files.each do |filepath|
+  filename = File.basename(filepath)
+  trigger = filename.sub('.md', '').sub('--', '.')
+
+  if Message.automated.where(trigger: trigger).count >= 1
+    puts "Skipping seed for automated message #{trigger}: existing automated email found"
+    next
+  end
+
+  body = File.read(filepath)
+  Message.create(
+    type: 'automated',
+    name: name_mapping[trigger],
+    subject: subject_mapping[trigger],
+    trigger: trigger,
+    body: body
+  )
+
+  puts "Seeded automated message for #{trigger}"
+end
+
 puts "Seeding school list..."
 
 csv_file = File.join(File.dirname(__FILE__), 'schools.csv')
@@ -16,3 +55,5 @@ csv = CSV.parse(csv_text, headers: true)
 csv.each do |row|
   School.create(row.to_hash)
 end
+
+puts "Done"

data/lib/hackathon_manager.rb

@@ -5,9 +5,9 @@ module HackathonManager
     hackathon = app.config_for(:hackathon)
 
     # Applications without a specified config.time_zone will parse
-    # this as a string instead of a DateTime
+    # this as a string instead of a Time
     if hackathon['last_day_to_apply'].is_a?(String)
-      hackathon['last_day_to_apply'] = DateTime.parse(hackathon['last_day_to_apply'])
+      hackathon['last_day_to_apply'] = Time.parse(hackathon['last_day_to_apply'])
     end
 
     app.config.hackathon = hackathon

data/lib/hackathon_manager/engine.rb

@@ -33,7 +33,7 @@ module HackathonManager
     end
 
     initializer 'hackathon_manager.factories', after: 'factory_bot.set_factory_paths' do
-      FactoryBot.definition_file_paths << File.expand_path('../../../test/factories', __FILE__) if defined?(FactoryBot)
+      FactoryBot.definition_file_paths << File.expand_path('../../test/factories', __dir__) if defined?(FactoryBot)
     end
 
     ActionController::Base.class_eval do

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.7.1'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/test/factories/bus_list.rb

@@ -4,7 +4,7 @@ FactoryBot.define do
     sequence :name do |n|
       "Bus List #{n}"
     end
-    capacity 50
-    notes    "Notes!"
+    capacity { 50 }
+    notes    { "Notes!" }
   end
 end

data/test/factories/fips.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :fips do
-    fips_code  "36055"
-    city       "Rochester"
-    state      "NY"
+    fips_code  { "36055" }
+    city       { "Rochester" }
+    state      { "NY" }
   end
 end

data/test/factories/message.rb

@@ -1,10 +1,11 @@
 FactoryBot.define do
   factory :message do
-    name         "Message Name"
-    subject      "Message Subject"
-    recipients   ["all"]
-    body         "Hello world!"
-    queued_at    nil
-    delivered_at nil
+    type         { "bulk" }
+    name         { "Message Name" }
+    subject      { "Message Subject" }
+    recipients   { ["all"] }
+    body         { "Hello world!" }
+    queued_at    { nil }
+    delivered_at { nil }
   end
 end

data/test/factories/questionnaire.rb

@@ -1,24 +1,24 @@
 FactoryBot.define do
   factory :questionnaire do
-    first_name            "John"
-    last_name             "Doe"
-    phone                 "(123) 456-7890"
-    international         false
-    date_of_birth         Date.today - 20.years
-    experience            "first"
-    interest              "design"
+    first_name            { "John" }
+    last_name             { "Doe" }
+    phone                 { "(123) 456-7890" }
+    international         { false }
+    date_of_birth         { Date.today - 20.years }
+    experience            { "first" }
+    interest              { "design" }
     school_id             { create(:school).id }
-    shirt_size            "Unisex - M"
-    dietary_restrictions  ""
-    special_needs         ""
-    agreement_accepted    true
-    code_of_conduct_accepted true
-    data_sharing_accepted true
-    can_share_info        true
-    gender                "Male"
-    major                 "Computer Science"
-    level_of_study        "University (Undergraduate)"
-    why_attend            "This sounds cool"
+    shirt_size            { "Unisex - M" }
+    dietary_restrictions  { "" }
+    special_needs         { "" }
+    agreement_accepted    { true }
+    code_of_conduct_accepted { true }
+    data_sharing_accepted { true }
+    can_share_info        { true }
+    gender                { "Male" }
+    major                 { "Computer Science" }
+    level_of_study        { "University (Undergraduate)" }
+    why_attend            { "This sounds cool" }
 
     association :user
   end