Merge branch 'hm-540' of https://github.com/codeRIT/hackathon-manager into hm-540

Author: JeremyRudman

Gemfile

@@ -65,6 +65,8 @@ gem 'jquery-ui-rails'
 gem 'selectize-rails'
 gem 'highcharts-rails', '~> 6.0'
 gem 'bootstrap', '~> 4.3.1'
+gem 'fullcalendar-rails'
+gem 'momentjs-rails'
 
 # Markdown parsing
 gem 'redcarpet'

Gemfile.lock

@@ -129,7 +129,7 @@ GEM
       dotenv (= 2.7.5)
       railties (>= 3.2, < 6.1)
     errbase (0.2.0)
-    erubi (1.9.0)
+    erubi (1.10.0)
     erubis (2.7.0)
     et-orbi (1.2.4)
       tzinfo
@@ -152,6 +152,10 @@ GEM
     fugit (1.3.6)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.3)
+    fullcalendar-rails (3.9.0.0)
+      jquery-rails (>= 4.0.5, < 5.0.0)
+      jquery-ui-rails (>= 5.0.2)
+      momentjs-rails (>= 2.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     groupdate (5.0.0)
@@ -205,7 +209,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.7.0)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.6)
@@ -226,14 +230,16 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
+    momentjs-rails (2.20.1)
+      railties (>= 3.1)
     msgpack (1.3.3)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mustache (1.1.1)
     mysql2 (0.5.3)
     nenv (0.3.0)
-    nio4r (2.5.3)
+    nio4r (2.5.4)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.3)
@@ -386,7 +392,7 @@ GEM
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -402,7 +408,7 @@ GEM
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (1.2.7)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
@@ -451,6 +457,7 @@ DEPENDENCIES
   factory_bot_rails
   file_validators
   font-awesome-rails (~> 4.0)
+  fullcalendar-rails
   groupdate
   guard
   guard-minitest
@@ -461,6 +468,7 @@ DEPENDENCIES
   jquery-ui-rails
   listen (>= 3.0.5, < 3.2)
   minitest-reporters
+  momentjs-rails
   mustache (~> 1.0)
   mysql2 (>= 0.4.4, < 0.6.0)
   omniauth-mlh (~> 0.4.1)

app/assets/javascripts/application.js

@@ -21,3 +21,6 @@
 //= require_directory .
 //= require_directory ./channels
 //= require ./vendor/simplemde.min.js
+//= require moment
+//= require fullcalendar
+//= require fullcalendar/locale-all

app/assets/javascripts/events.js

@@ -0,0 +1,38 @@
+function eventCalendar() {
+  return $('#calendar').fullCalendar({
+    defaultView: 'listYear',
+    buttonText: {
+      today: 'Today'
+    },
+    eventRender: function (event, element, view) {
+      var description = event.description ? event.description : '';
+      var location = event.location ? event.location : '';
+      element.find('.fc-event-dot').css('display','none');
+      element.find('.fc-list-item-title').append('<div></div><span style="font-size: 12px">' + description + '</span>');
+      element.find('.fc-list-item-title').append('<div></div><span style="font-size: 12px">' + location + '</span>');
+    },
+    events: {
+      url: '/manage/events.json',
+      success: function(response) {
+        // due to "end" being a keyword in ruby and what fullcalender uses it is stored as finish and than it is
+        // converted to "end" when sending it to fullcalendar
+        response = JSON.parse(JSON.stringify(response).split('"finish":').join('"end":'));
+        return response;
+      }
+    },
+    eventClick: function (info) {
+      window.location = 'events/' + info.id;
+    },
+    height: 'auto',
+  });
+}
+
+function clearCalendar() {
+  $('#calendar').fullCalendar('delete');
+  $('#calendar').html('');
+}
+
+document.addEventListener('turbolinks:load', function () {
+  eventCalendar();
+});
+document.addEventListener('turbolinks:before-cache', clearCalendar);

app/assets/stylesheets/manage.sass

@@ -6,6 +6,7 @@
 @import general/variables
 @import general/css4
 @import manage/autocomplete
+@import manage/events
 
 $grey-dark: #555
 $grey-med: #999
@@ -15,6 +16,7 @@ $grey-med: #999
 @import vendor/datatables.min
 @import selectize
 @import selectize.default
+@import fullcalendar
 
 .icon-space-r
   margin-right: 0.5em
@@ -137,6 +139,10 @@ $grey-med: #999
   height: calc(100vh - 2.25rem)
   overflow: scroll
 
+.calendar-list
+  width: 100%
+  min-width: 500px
+  margin: auto
 
 /*
  * Datatable changes

app/assets/stylesheets/manage/events.sass

@@ -0,0 +1,9 @@
+.fc-list-item
+  cursor: pointer !important
+
+.event_start select:first-child, .event_finish select:first-child
+  margin-left: 0 !important
+
+.event_start select:last-child, .event_finish select:last-child
+  margin-right: 0 !important
+

app/controllers/manage/events_controller.rb

@@ -0,0 +1,54 @@
+class Manage::EventsController < Manage::ApplicationController
+  before_action :require_director
+  respond_to :html, :json
+
+  def index
+    @start_date = HackathonConfig['event_start_date']
+    respond_to do |format|
+      format.html
+      format.json { render json: Event.all }
+    end
+  end
+
+  def new
+    @event = ::Event.new
+  end
+
+  def create
+    @event = ::Event.new(event_params)
+    if @event.save
+      redirect_to(manage_events_path)
+    else
+      render('new')
+    end
+  end
+
+  def show
+    @event = Event.find_by_id(params[:id])
+    respond_with(:manage, @event)
+  end
+
+  def update
+    @event = Event.find_by_id(params[:id])
+    if @event.update(event_params)
+      redirect_to(manage_events_path)
+    else
+      render('show')
+    end
+  end
+
+  def destroy
+    @event = Event.find_by_id(params[:id])
+    if @event.destroy
+      redirect_to(manage_events_path)
+    else
+      render('show')
+    end
+  end
+
+  def event_params
+    params.require(:event).permit(
+      :title, :description, :location, :public, :start, :finish, owner: []
+    )
+  end
+end

app/models/event.rb

@@ -0,0 +1,12 @@
+class Event < ApplicationRecord
+  validates_presence_of :title, :start
+
+  validate :finish_before_start
+
+  def finish_before_start
+    return if finish.nil?
+    unless finish > start
+      errors.add(:finish, 'time must be after start time')
+    end
+  end
+end

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

@@ -18,7 +18,7 @@
         .fa.fa-bars.m-3.mx-4.text-white.h-auto
 
       / TODO: move acc/signin inside the sidebar
-      %a.navbar-brand.px-3.mr-0{href: manage_root_path} #{HackathonConfig['name']} Manager
+      %a.navbar-brand.px-3.mr-0.col-xl-2.col-lg-3{href: manage_root_path} #{HackathonConfig['name']} Manager
 
       / %input.form-control.form-control-dark.w-100{"aria-label" => "Search", placeholder: "Search", type: "text"}/
       %ul.navbar-nav.ml-auto.px-3
@@ -29,7 +29,7 @@
 
     .container-fluid
       .row
-        %nav.col-md-3.d-none.d-md-block.bg-light.sidebar
+        %nav.col-md-3.d-none.d-md-block.bg-light.sidebar.col-xl-2.col-lg-3
           .sidebar-sticky
             %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted
               %span
@@ -68,6 +68,10 @@
                   = active_link_to manage_checkins_path, class: "nav-link" do
                     .fa.fa-drivers-license-o.fa-fw.icon-space-r-half
                     = t(:title, scope: 'pages.manage.check-in')
+                %li.nav-item
+                  = active_link_to manage_events_path, class: "nav-link" do
+                    .fa.fa-calendar.fa-fw.icon-space-r-half
+                    = t(:title, scope: 'pages.manage.events')
                 %li.nav-item
                   = active_link_to manage_stats_path, class: "nav-link" do
                     .fa.fa-table.fa-fw.icon-space-r-half

app/views/manage/data_exports/_form.html.haml

@@ -1,11 +1,9 @@
 .form-container
   = bs_horizontal_simple_form_for @data_export, url: url_for(action: @data_export.new_record? ? "create" : "update", controller: "data_exports") do |f|
     = f.error_notification
-
-    .form-inputs
-      = f.input :export_type, as: :select, collection: DataExport::POSSIBLE_TYPES.map { |x| [x.titleize, x] }, include_blank: false
-
-    .form-actions.mb-3.mt-3
-      = f.button :submit, class: 'btn-primary'
+      .form-inputs
+        = f.input :export_type, as: :select, collection: DataExport::POSSIBLE_TYPES.map { |x| [x.titleize, x] }, include_blank: false
+      .form-actions.mb-3.mt-3
+        = f.button :submit, class: 'btn-primary'
 
 .mb-4