hackathon_manager 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b629f9fbc6de4475abdcae57d3249f940073f93
-  data.tar.gz: cfa43250214ba8b096fc81d63cbf52fddd2f49b8
+  metadata.gz: b094f3052081eed2e1934b6d9614f3445d375650
+  data.tar.gz: 52e54d51b7842bc792b6331f292994134ae3bed6
 SHA512:
-  metadata.gz: 47a1c3daf4157814e45ee0a59c8c46367862d88fe9b5db918f46e41f2bb2ebf8152da0d260ac60539d7e5769a4a17448ed345856fa8b64f34dc62e1593790678
-  data.tar.gz: 023a806098e9254409b4757d2cf6290fd69afe72226e31f0dbe4a893dfe949cc1303d702eee7b02f4951134f8030db313afe32a5924fc436593efaa834e40dcc
+  metadata.gz: b09f0085305e16198ed495f6fc168813f5819eff20d39ad66fb0c3cc6902e3a4b207574c9cf756904218dc0d8dfb8a5558d292526bae4207890ccd5f4e85cc43
+  data.tar.gz: 53d3039108ff4f156d914d1f5847d7e2fe9fe5805e92a933adcea8a6c7c9ecbcf23af4b81995201016a2a1d31009d06a9223f9ae832fd7c2bfd52255fbd6ccfd

data/app/controllers/questionnaires_controller.rb

@@ -28,6 +28,7 @@ class QuestionnairesController < ApplicationController
     @questionnaire = Questionnaire.new
 
     if session["devise.provider_data"] && session["devise.provider_data"]["info"]
+      @skip_my_mlh_fields = true
       @questionnaire.tap do |q|
         q.first_name = session["devise.provider_data"]["info"]["first_name"]
         q.last_name = session["devise.provider_data"]["info"]["last_name"]

data/app/controllers/users/registrations_controller.rb

@@ -16,12 +16,12 @@ class Users::RegistrationsController < Devise::RegistrationsController
 
   # GET /resource/edit
   def edit
-    redirect_to questionnaires_path
+    super
   end
 
   # PUT /resource
   def update
-    redirect_to questionnaires_path
+    super
   end
 
   # DELETE /resource

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

@@ -15,7 +15,8 @@
   = @questionnaire.travel_not_from_school ? "Somewhere else (#{@questionnaire.travel_location})" : "My school (#{@questionnaire.school.full_name})"
 
 %fieldset
-  %legend Provided by My MLH
+  - if @questionnaire.user.provider == 'mlh'
+    %legend Provided by My MLH
   %p
     %b First name:
     = @questionnaire.first_name

data/app/views/devise/passwords/_form.html.haml

@@ -1,4 +1,4 @@
-%div{class:'form-container'}
+.form-container
   = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
     = f.error_notification
     .form-inputs
@@ -6,4 +6,4 @@
     .center
       .form-actions
         = f.button :submit, "Send Reset Instructions"
-      = render "devise/shared/links"
+      = render "devise/shared/links"

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

@@ -1,7 +1,7 @@
-%section{class:'section'}
-  %div{class:'container'}
-    %h1{class:'section-title'} Change your password
-    %div{class:'form-container'}
+.section
+  .container
+    .section-title Change your password
+    .form-container
       = 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

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

@@ -1,5 +1,5 @@
-%section{class:'section'}
-  %div{class:'container'}
-    %h1{class:'section-title'} Password Reset
+.section
+  .container
+    %h1.section-title Password Reset
 
     = render 'form'

data/app/views/devise/registrations/_form.html.haml

@@ -1,8 +1,16 @@
 = simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
   .form-actions
     .center
-      = btn_link_to "Sign Up with My MLH »".html_safe, user_mlh_omniauth_authorize_path
+      = btn_link_to "Sign Up using My MLH »".html_safe, user_mlh_omniauth_authorize_path
+      %p
+        %em or create an account:
+  .form-inputs
+    = f.input :email, required: true, autofocus: true
+    = f.input :password, required: true
+    = f.input :password_confirmation, required: true, label:"Confirm"
+  .form-actions
+    .center
+      = f.button :submit, "Sign up"
     %p.center
       Already applied?
-      %br
-      = btn_link_to "Sign In »".html_safe, user_mlh_omniauth_authorize_path
+      = link_to "Sign In".html_safe, new_user_session_path

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

@@ -1,15 +1,13 @@
 %section.section
   .container
     .form-container.signup
-      %h1.section-title Sign Up or Sign In
+      %h1.section-title Sign Up
 
       #disclaimer
         - unless Rails.configuration.hackathon['registration_is_open']
           .center
             %strong Registration is now closed. Thanks to everyone who applied!
           %br
-          %br
-        Registration is simplified with #{link_to "My MLH", "https://my.mlh.io", style: "color: #f5f5f5; text-decoration: underline;"}! Click below to sign into your existing My MLH account, or create one. You'll be redirected back to BrickHack to finish your application afterwards.
         %ul
           %li Applicants must be 18 years of age by February 11th
           %li RIT students must still apply

data/app/views/devise/sessions/_form.html.haml

@@ -1,8 +1,18 @@
-.form-actions
-  .center
-    %p
-      = btn_link_to "Sign In with My MLH »".html_safe, user_mlh_omniauth_authorize_path
+= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+  .form-actions
+    .center
+      %p
+        = btn_link_to "Sign in using My MLH »".html_safe, user_mlh_omniauth_authorize_path
+      %p
+        %em or use an account:
+  .form-inputs
+    = f.input :email, required: false, input_html: { autofocus: true }
+    = f.input :password, required: false
+    = f.input :remember_me, as: :boolean if devise_mapping.rememberable?
+  .form-actions{class:'center'}
+    = f.button :submit, "Sign In"
     %p
       Need an account?
-      %br
-      = btn_link_to "Sign Up »".html_safe, new_user_registration_path
+      = link_to "Sign Up".html_safe, new_user_registration_path
+      \-
+      = link_to "Forgot password", new_user_password_path

data/app/views/devise/sessions/new.html.haml

@@ -1,7 +1,7 @@
 .section
   .container
     .form-container.login
-      %h1.section-title Log In
+      %h1.section-title Sign In
       - if notice
         .form-success
           .success_message

data/app/views/layouts/_sidebar.html.haml

@@ -14,9 +14,9 @@
           = btn_link_to "Review", new_questionnaires_path
     - else
       %div
-        = btn_link_to "Login", new_user_session_path
+        = btn_link_to "Sign In", new_user_session_path
       %div
-        = btn_link_to "Register", new_user_registration_path
+        = btn_link_to "Sign Up", new_user_registration_path
     - if user_signed_in?
       %div
         = btn_link_to "Sign Out", destroy_user_session_path, method: :delete

data/app/views/layouts/dayof.html.haml

@@ -6,7 +6,7 @@
     = stylesheet_link_tag "application", :media => "all"
     = csrf_meta_tags
   %body
-    %div{class:'day-of'}
+    .day-of
       = yield
     = javascript_include_tag "application"
-    = javascript_include_tag "vendor/owl.carousel.min.js"
+    = javascript_include_tag "vendor/owl.carousel.min.js"

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

@@ -1,4 +1,4 @@
-%div{class:'form-container'}
+.form-container
   = simple_form_for @questionnaire, url: url_for(action: @questionnaire.new_record? ? "create" : "update", controller: "questionnaires"), html: { "data-validate" => "form" } do |f|
 
     - if f.error_notification.present?
@@ -10,7 +10,9 @@
 
     .form-inputs
       %fieldset
-        %legend Provided by My MLH
+        - if @questionnaire&.user&.provider == 'mlh'
+          %legend Provided by My MLH
+        %br
         = f.input :first_name, placeholder: "Joe", input_html: { "data-validate" => "presence" }, label: "First Name", autofocus: true
         = f.input :last_name, placeholder: "Smith", input_html: { "data-validate" => "presence" }, label: "Last Name"
         = f.input :email, placeholder: "joe@example.com", input_html: { "data-validate" => "presence email", value: @questionnaire.user.try(:email) }, required: true
@@ -26,6 +28,7 @@
         = f.input :special_needs, placeholder: "Any special needs or requests (optional)", label: "Special needs"
 
     .form-inputs
+      %br
       = f.input :experience, as: :select, collection: Questionnaire::POSSIBLE_EXPERIENCES.invert, include_blank: "(select one...)", label: "Experience", input_html: { "data-validate" => "presence" }
       = f.input :interest, as: :select, collection: Questionnaire::POSSIBLE_INTERESTS.invert, include_blank: "(select one...)", label: "Interest", input_html: { "data-validate" => "presence" }
 
@@ -50,5 +53,5 @@
         %a{href:"/assets/BrickHack_ReleaseAgreement.pdf", target:"_blank"} BrickHack Agreement
       = f.input :agreement_accepted, as: :formatted_boolean, label: "I accept the BrickHack Agreement", input_html: { "data-validate" => "presence" }
 
-    %div{class:'center'}
+    .center
       = f.button :submit, value: ( @questionnaire.new_record? ? 'Create' : 'Save' )

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

@@ -1,4 +1,4 @@
-%div{class:'form-container'}
+.form-container
   = simple_form_for @school, url: url_for(action: @school.new_record? ? "create" : "update", controller: "schools"), html: { "data-validate" => "form" } do |f|
 
     - if f.error_notification.present?
@@ -12,5 +12,5 @@
       = f.input :state
       = f.association :bus_list, include_blank: "(none)"
 
-    %div{class:'center'}
+    .center
       = f.button :submit, value: ( @school.new_record? ? 'Create' : 'Save' )

data/app/views/manage/schools/merge.html.haml

@@ -27,7 +27,7 @@
         %strong= @school.full_name
         school name to this new school.
 
-      %div{class:'center'}
+      .center
         = f.button :submit, value: 'Merge'
 
   .form-container

data/app/views/questionnaires/_form.html.haml

@@ -1,4 +1,4 @@
-%div{class:"form-container wizard#{action_name == "new" ? " wizard-skip-valid" : ""}"}
+%div{class:"form-container wizard#{@skip_my_mlh_fields ? " wizard-skip-valid" : ""}"}
   = simple_form_for @questionnaire, url: url_for(controller: "questionnaires", action: "update"), html: { "data-validate" => "form" } do |f|
 
     - if f.error_notification.present?
@@ -65,6 +65,6 @@
             I agree to the terms of both the MLH Contest Terms and Conditions and the MLH Privacy Policy. Please note that you may receive pre and post-event informational e-mails and occasional messages about hackathons from MLH as per the MLH Privacy Policy.
         = f.input :data_sharing_accepted, as: :formatted_boolean, label: "I accept the MLH data sharing notice", input_html: { "data-validate" => "presence" }
 
-      %div{class:'center'}
+      .center
         %button.button{ type: "button", "data-wizard" => "previous" } Previous
         = f.button :submit, value: ( @questionnaire.new_record? ? 'Apply' : 'Save' )

data/app/views/questionnaires/show.html.haml

@@ -1,6 +1,6 @@
 - title "Application"
-%div{class:'form-success'}
-  %div{class:'success_message'}
+.form-success
+  .success_message
     %p#notice= notice
     - if @questionnaire.can_rsvp?
       - if @questionnaire.did_rsvp?
@@ -19,12 +19,14 @@
       - else
         %p Thanks for applying!
 
-  %div{class:'participant_info'}
+  .participant_info
     %p Below is a copy of your application.
 
     = render partial: 'questionnaire_summary'
 
     %p
       = btn_link_to '<span class="fa fa-pencil icon-space-r"></span> Edit Application'.html_safe, edit_questionnaires_path
+      - if !@questionnaire.user.provider
+        = btn_link_to '<span class="fa fa-user icon-space-r"></span> Edit Account'.html_safe, edit_user_registration_path
     %p
       Unhappy? #{link_to "Revoke my application", user_registration_path, data: { confirm: "Are you sure? Your account and application will be permanently erased." }, method: :delete}

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -512,7 +512,6 @@ files:
 - app/models/fips.rb
 - app/models/message.rb
 - app/models/questionnaire.rb
-- app/models/schedule.rb
 - app/models/school.rb
 - app/models/school_name_duplicate.rb
 - app/models/user.rb

data/app/models/schedule.rb

@@ -1,53 +0,0 @@
-require 'httparty'
-SHEETS_KEY = ENV['GOOGLESHEETS_KEY']
-SHEETS_URL = "https://sheets.googleapis.com/v4/spreadsheets/".freeze
-SHEETS_FIELDS = "fields=sheets(data.rowData.values.userEnteredValue)".freeze
-SECTION = ":section".freeze
-ITEM = ":item".freeze
-
-class Schedule
-  def initialize(spreadsheet_id, sheet = 0)
-    cache_key = "schedule/#{spreadsheet_id}"
-    parsed_response = Rails.cache.fetch(cache_key, expires_in: 1.hour) do
-      response = HTTParty.get(SHEETS_URL + "#{spreadsheet_id}?#{SHEETS_FIELDS}&key=#{SHEETS_KEY}")
-      response ? response.parsed_response.to_hash : nil
-    end
-
-    unless parsed_response && parsed_response["error"].nil?
-      Rails.logger.error "Error reading Google Sheet #{spreadsheet_id}"
-      return
-    end
-
-    @sheet = parsed_response["sheets"][sheet]
-  end
-
-  def rows
-    @sheet ? @sheet["data"][0]["rowData"] : []
-  end
-
-  def sections
-    section = []
-    sections = []
-    rows.each do |row|
-      if row["values"][0]["userEnteredValue"]["stringValue"] == SECTION
-        sections << section unless section.count.zero?
-        section = [row["values"][1]["userEnteredValue"]["stringValue"]]
-      else
-        fill_section(section, row)
-      end
-    end
-    sections << section unless section.empty?
-    sections
-  end
-
-  private
-
-  def fill_section(section, row)
-    r = []
-    row["values"].map do |col|
-      next if !col.empty? && col["userEnteredValue"]["stringValue"] == ITEM
-      r << (col.empty? ? '' : col["userEnteredValue"]["stringValue"])
-    end
-    section << r unless r.count.zero?
-  end
-end