hackathon_manager 0.6.6 → 0.7.0

data/app/datatables/school_datatable.rb

@@ -16,9 +16,8 @@ class SchoolDatatable < AjaxDatatablesRails::Base
   def data
     records.map do |record|
       {
-        link: link_to('<i class="fa fa-search"></i>'.html_safe, manage_school_path(record)),
         id: record.id,
-        name: record.name,
+        name: link_to(record.name, manage_school_path(record)),
         city: record.city,
         state: record.state,
         questionnaire_count: record.questionnaire_count,
@@ -27,8 +26,9 @@ class SchoolDatatable < AjaxDatatablesRails::Base
     end
   end
 
-  # rubocop:disable Style/AccessorMethodName
+  # rubocop:disable Naming/AccessorMethodName
   def get_raw_records
     School.all
   end
+  # rubocop:enable Naming/AccessorMethodName
 end

data/app/helpers/hackathon_manager_helper.rb

@@ -1,7 +1,7 @@
 module HackathonManagerHelper
   def title(page_title)
     content_for(:page_title) { page_title }
-    content_for(:title) { page_title + " - #{Rails.configuration.hackathon['name']}" }
+    content_for(:title) { page_title }
     page_title
   end
 
@@ -26,11 +26,33 @@ module HackathonManagerHelper
     markdown.render(text).html_safe
   end
 
+  # Same as link_to, but adds a special active class whenever the link matches
+  # the current page.
+  # Only  https://github.com/rails/rails/blob/master/actionview/lib/action_view/helpers/url_helper.rb
   def active_link_to(name = nil, options = nil, html_options = nil, &block)
-    if current_page?(options)
-      html_options[:class] = html_options[:class] + ' ' + html_options[:active_class]
+    # this is from Rails source - ignore rubocop
+    # rubocop:disable Style/ParallelAssignment
+    html_options, options, name = options, name, block if block_given?
+    options ||= {}
+    # rubocop:enable Style/ParallelAssignment
+
+    html_options = convert_options_to_data_attributes(options, html_options)
+
+    url = url_for(options)
+    html_options["href".freeze] ||= url
+
+    # Begin custom
+    active_children = html_options.delete('active_children')
+    active_children = true if active_children.nil?
+    current_url = request.env['PATH_INFO']
+    if current_page?(url) || (active_children && current_url.include?(url))
+      active_class = html_options.delete('active_class') || 'active'
+      existing_class = html_options['class'] || ''
+      html_options['class'] = existing_class + ' ' + active_class
     end
-    link_to(name, options, html_options, &block)
+    # End custom
+
+    content_tag("a".freeze, name || url, html_options, &block)
   end
 
   # https://github.com/rails/sprockets-rails/issues/298#issuecomment-168927471
@@ -45,4 +67,41 @@ module HackathonManagerHelper
   def collection_or_text(model_value, collection)
     model_value.blank? || collection.include?(model_value) ? collection : nil
   end
+
+  def acc_status_class(acc_status)
+    case acc_status
+    when "denied"
+      "danger"
+    when "accepted"
+      "success"
+    when "waitlist"
+      "info"
+    when "late_waitlist"
+      "secondary"
+    when "pending"
+      "secondary"
+    when "rsvp_denied"
+      "danger"
+    when "rsvp_confirmed"
+      "success"
+    end
+  end
+
+  def display_datetime(datetime, opts = {})
+    formatted = ""
+    if Time.now - datetime < 5.hours
+      formatted << "#{time_ago_in_words(datetime, include_seconds: true)} ago"
+    else
+      format = datetime.year == Time.now.year ? "%b %-d at %I:%M %P" : "%b %-d, %Y at %I:%M %P"
+      formatted << "on " if opts[:in_sentence]
+      formatted << datetime.strftime(format)
+    end
+    "<span title=\"#{datetime}\">#{formatted}</span>".html_safe
+  end
+
+  def google_maps_link(*args)
+    query = args.reject(&:blank?).join('+')
+    query = CGI.escape(query)
+    "https://www.google.com/maps/search/?api=1&query=#{query}"
+  end
 end

data/app/helpers/manage/bootstrap_form_helper.rb

@@ -0,0 +1,98 @@
+module Manage
+  module BootstrapFormHelper
+    def bs_vertical_simple_form(path, options, &block)
+      bootstrap_options = {
+        wrapper: :bootstrap_vertical_form,
+        wrapper_mappings: {
+          boolean:       :bootstrap_vertical_boolean,
+          check_boxes:   :bootstrap_vertical_collection,
+          date:          :bootstrap_vertical_multi_select,
+          datetime:      :bootstrap_vertical_multi_select,
+          file:          :bootstrap_vertical_file,
+          radio_buttons: :bootstrap_vertical_collection,
+          range:         :bootstrap_vertical_range,
+          time:          :bootstrap_vertical_multi_select
+        }
+      }
+      options = options.deep_merge(bootstrap_options)
+      patch_simple_form_config do
+        simple_form_for(path, options, &block)
+      end
+    end
+
+    def bs_horizontal_simple_form_for(path, options, &block)
+      bootstrap_options = {
+        wrapper: :bootstrap_horizontal_form,
+        wrapper_mappings: {
+          boolean:       :bootstrap_horizontal_boolean,
+          check_boxes:   :bootstrap_horizontal_collection,
+          date:          :bootstrap_horizontal_multi_select,
+          datetime:      :bootstrap_horizontal_multi_select,
+          file:          :bootstrap_horizontal_file,
+          radio_buttons: :bootstrap_horizontal_collection,
+          range:         :bootstrap_horizontal_range,
+          time:          :bootstrap_horizontal_multi_select
+        }
+      }
+      options = options.deep_merge(bootstrap_options)
+      patch_simple_form_config do
+        simple_form_for(path, options, &block)
+      end
+    end
+
+    private
+
+    def set_config(key, value)
+      @saved_values ||= {}
+      @saved_values[key] = SimpleForm.send(key)
+      SimpleForm.send("#{key}=", value)
+    end
+
+    def restore_config
+      @saved_values.keys.each do |key|
+        value = @saved_values.delete(key)
+        SimpleForm.send("#{key}=", value)
+      end
+    end
+
+    def patch_simple_form_config
+      # Values copied from the top of
+      # https://github.com/rafaelfranca/simple_form-bootstrap/blob/master/config/initializers/simple_form_bootstrap.rb
+
+      # Default class for buttons
+      set_config(:button_class, 'btn')
+
+      # Define the default class of the input wrapper of the boolean input.
+      set_config(:boolean_label_class, 'form-check-label')
+
+      # How the label text should be generated altogether with the required text.
+      set_config(:label_text, ->(label, required, _explicit_label) { "#{label} #{required}" })
+
+      # Define the way to render check boxes / radio buttons with labels.
+      set_config(:boolean_style, :inline)
+
+      # You can wrap each item in a collection of radio/check boxes with a tag
+      set_config(:item_wrapper_tag, :div)
+
+      # Defines if the default input wrapper class should be included in radio
+      # collection wrappers.
+      set_config(:include_default_input_wrapper_class, false)
+
+      # CSS class to add for error notification helper.
+      set_config(:error_notification_class, 'alert alert-danger')
+
+      # Method used to tidy up errors. Specify any Rails Array method.
+      # :first lists the first message for each field.
+      # :to_sentence to list all errors for each field.
+      set_config(:error_method, :to_sentence)
+
+      # add validation classes to `input_field`
+      set_config(:input_field_error_class, 'is-invalid')
+      # set_config(:input_field_valid_class, 'is-valid')
+
+      yield
+    ensure
+      restore_config
+    end
+  end
+end

data/app/models/bus_list.rb

@@ -1,5 +1,5 @@
 class BusList < ApplicationRecord
-  validates_presence_of :name
+  validates_presence_of :name, :capacity
   validates_uniqueness_of :name
 
   has_many :schools

data/app/models/message.rb

@@ -18,7 +18,7 @@ class Message < ApplicationRecord
     "rsvp-denied"                      => "RSVP Denied Attendees",
     "checked-in"                       => "Checked-In Attendees",
     "non-checked-in"                   => "Non-Checked-In, Accepted & RSVP'd Applications",
-    "non-checked-in-excluding"         => "Non-Checked-In Applications, Excluding Accepted & RSVP'd",
+    "non-checked-in-excluding"         => "Non-Checked-In Applications, Excluding Accepted & RSVP'd"
   }.freeze
 
   POSSIBLE_TRIGGERS = {
@@ -43,13 +43,13 @@ class Message < ApplicationRecord
     labels = recipients.map do |r|
       if POSSIBLE_SIMPLE_RECIPIENTS.include?(r)
         POSSIBLE_SIMPLE_RECIPIENTS[r]
-      elsif r =~ /(.*)::(\d*)/
+      elsif r.match? /(.*)::(\d*)/
         MessageRecipientQuery.friendly_name(r)
       else
         "(unknown)"
       end
     end
-    labels.join(', ')
+    labels
   end
 
   def delivered?

data/app/models/questionnaire.rb

@@ -100,7 +100,7 @@ class Questionnaire < ApplicationRecord
   belongs_to :user
 
   def email
-    user.email
+    user&.email
   end
 
   def portfolio_url=(value)

data/app/models/school.rb

@@ -11,15 +11,21 @@ class School < ApplicationRecord
   def full_name
     out = ""
     out << name
-    if city.present? || state.present?
+    if full_location.present?
       out << " in "
-      out << city if city.present?
-      out << ", " if city.present? && state.present?
-      out << state if state.present?
+      out << full_location
     end
     out
   end
 
+  def full_location
+    out = ""
+    out << city if city.present?
+    out << ", " if city.present? && state.present?
+    out << state if state.present?
+    out
+  end
+
   def bus_list
     return unless bus_list_id
     BusList.find(bus_list_id)

data/app/models/user.rb

@@ -41,7 +41,9 @@ class User < ApplicationRecord
   end
 
   def self.from_omniauth(auth)
-    where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
+    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.email             = auth.info.email
       user.password          = Devise.friendly_token[0, 20]

data/app/views/application/_triggered_email_summary.html.haml

@@ -1,11 +1,13 @@
-%h3.no-margin Triggered Email Overview
-%p
-  Recipient updates that match a given event will be sent the corresponding email(s) automatically.
-  %br
-  For example, when a user moves from the "Accepted" to "RSVP Confirmed" state, the user will be sent an email for the "RSVP Confirmed" event.
-%p Hard-coded emails are those managed in the source code repository, and cannot be disabled.
+%h3.pb-2#triggered-email-overview Triggered Email Overview
 
-%table.table
+%table.table.table-striped
+  %caption
+    %ul
+      %li.mb-1
+        Recipient updates that match a given event will be sent the corresponding email(s) automatically.
+        %br
+        For example, when a user moves from the "Accepted" to "RSVP Confirmed" state, the user will be sent an email for the "RSVP Confirmed" event.
+      %li Hard-coded emails are those managed in the source code repository, and cannot be disabled.
   %thead
     %tr
       %th Trigger Event
@@ -17,10 +19,10 @@
         %td= Message::POSSIBLE_TRIGGERS[trigger]
         - messages = Message.where(trigger: trigger).all
         %td
-          = ['questionnaire.pending', 'questionnaire.accepted', 'questionnaire.denied', 'questionnaire.rsvp_confirmed'].include?(trigger) ? '<strong>Yes</strong>'.html_safe : 'No'
+          = ['questionnaire.pending', 'questionnaire.accepted', 'questionnaire.denied', 'questionnaire.rsvp_confirmed'].include?(trigger) ? '<strong class="text-success">Yes</strong>'.html_safe : 'No'
         %td
           - if messages.present?
-            %ul.no-margin
+            %ul.list-unstyled.mb-0
               - messages.each do |message|
                 %li= link_to(message.name, manage_message_path(message))
           - else

data/app/views/layouts/hackathon_manager/application.html.haml

@@ -4,6 +4,10 @@
     %title= yield(:title) || Rails.configuration.hackathon['default_page_title']
     %meta{ charset: "utf-8" }
     %meta{ name:"viewport", content: "width=device-width, initial-scale=1" }
+
+    - if Rails.configuration.hackathon['favicon_asset'].present?
+      %link{ href: image_url(Rails.configuration.hackathon['favicon_asset']), rel: "shortcut icon" }
+
     = stylesheet_link_tag "hackathon_manager/core", media: "all"
     = csrf_meta_tags
 

data/app/views/layouts/manage/_flashes.html.haml

@@ -0,0 +1,4 @@
+- if flash[:notice].present?
+  .alert.alert-info.mt-3
+    %span.fa.fa-info-circle.icon-space-r-half
+    = flash[:notice].html_safe

data/app/views/layouts/manage/_page_title.html.haml

@@ -0,0 +1,8 @@
+.d-flex.justify-content-between.flex-wrap.flex-md-nowrap.align-items-center.pt-3.pb-2.mb-3.border-bottom
+  %h1.h2
+    = title title
+    - if defined?(subtitle) && subtitle.present?
+      %small.text-muted= subtitle
+
+  - unless current_user.admin_limited_access?
+    = yield

data/app/views/layouts/manage/application.html.haml

@@ -1,28 +1,81 @@
 !!! 5
 %html
   %head
-    %title= yield(:title) || "Manage - #{Rails.configuration.hackathon['name']}"
+    %title= yield(:title).presence || "#{Rails.configuration.hackathon['name']} Manager"
+    %meta{ content: "width=device-width, initial-scale=1, shrink-to-fit=no", name: "viewport" }/
+
+    - if Rails.configuration.hackathon['favicon_asset'].present?
+      %link{ href: image_url(Rails.configuration.hackathon['favicon_asset']), rel: "shortcut icon" }
+
     = stylesheet_link_tag "hackathon_manager/manage", :media => "all"
     = csrf_meta_tags
 
   %body
-    = render "layouts/hackathon_manager/header"
     = javascript_include_tag "hackathon_manager/manage/application"
-    #main
-      #manageNav
-        %p #{Rails.configuration.hackathon['name']} Manager
-        = link_to "Dashboard", manage_root_path
-        = link_to "Questionnaires", manage_questionnaires_path
-        = link_to "Admins", manage_admins_path
-        = link_to "Messages", manage_messages_path
-        = link_to "Bus Lists", manage_bus_lists_path
-        = link_to "Schools", manage_schools_path
-        = link_to "Stats", manage_stats_path
-        - unless current_user.admin_limited_access?
-          \|
-          = link_to "Config", manage_config_path
-          = link_to "Sidekiq", sidekiq_web_path
-          = link_to "Blazer", blazer_path
-      = render "layouts/hackathon_manager/flashes"
-      = yield
+
+    %nav.navbar.navbar-dark.fixed-top.bg-dark.flex-md-nowrap.p-0.shadow
+      %a.navbar-brand.col-sm-3.col-md-2.mr-0{href: "#"} #{Rails.configuration.hackathon['name']} Manager
+      %input.form-control.form-control-dark.w-100{"aria-label" => "Search", placeholder: "Search", type: "text"}/
+      %ul.navbar-nav.px-3
+        %li.nav-item.text-nowrap
+          = link_to "Sign out", destroy_user_session_path, method: :delete, class: "nav-link"
+
+    .container-fluid
+      .row
+        %nav.col-md-2.d-none.d-md-block.bg-light.sidebar
+          .sidebar-sticky
+            %ul.nav.flex-column
+              %li.nav-item
+                = active_link_to manage_root_path, class: "nav-link", active_children: false do
+                  .fa.fa-area-chart.fa-fw.icon-space-r-half
+                  Dashboard
+              %li.nav-item
+                = active_link_to manage_questionnaires_path, class: "nav-link" do
+                  .fa.fa-inbox.fa-fw.icon-space-r-half
+                  Questionnaires
+              %li.nav-item
+                = active_link_to manage_admins_path, class: "nav-link" do
+                  .fa.fa-users.fa-fw.icon-space-r-half
+                  Admins
+              %li.nav-item
+                = active_link_to manage_messages_path, class: "nav-link" do
+                  .fa.fa-bullhorn.fa-fw.icon-space-r-half
+                  Messages
+              %li.nav-item
+                = active_link_to manage_bus_lists_path, class: "nav-link" do
+                  .fa.fa-bus.fa-fw.icon-space-r-half
+                  Bus Lists
+              %li.nav-item
+                = active_link_to manage_schools_path, class: "nav-link" do
+                  .fa.fa-home.fa-fw.icon-space-r-half
+                  Schools
+              %li.nav-item
+                = active_link_to manage_stats_path, class: "nav-link" do
+                  .fa.fa-table.fa-fw.icon-space-r-half
+                  Stats
+            - unless current_user.admin_limited_access?
+              %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted
+                %span Advanced
+              %ul.nav.flex-column.mb-2
+                %li.nav-item
+                  = active_link_to manage_config_path, class: "nav-link" do
+                    .fa.fa-wrench.fa-fw.icon-space-r-half
+                    Config
+                    .nav-item-description View configuration
+                %li.nav-item
+                  = active_link_to sidekiq_web_path, target: '_blank', class: "nav-link" do
+                    .fa.fa-tasks.fa-fw.icon-space-r-half
+                    Sidekiq
+                    %span.fa.fa-external-link.icon-space-l-half
+                    .nav-item-description Monitor background jobs
+                %li.nav-item
+                  = active_link_to blazer_path, target: '_blank', class: "nav-link" do
+                    .fa.fa-terminal.fa-fw.icon-space-r-half
+                    Blazer
+                    %span.fa.fa-external-link.icon-space-l-half
+                    .nav-item-description Run custom SQL queries
+        %main.col-md-9.ml-sm-auto.col-lg-10.px-4{role: "main"}
+          = render "layouts/manage/flashes"
+          = yield
+
     = render "layouts/hackathon_manager/shared_footer"