hackathon_manager 0.4.4 → 0.5.0

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

@@ -1,29 +1,38 @@
-%section.section.manage
-  - title "RSVP"
-  %h1.section-title RSVP for #{Rails.configuration.hackathon['name']}
-  .form-container
-    #disclaimer
-      - if flash[:notice]
-        = flash[:notice]
-        %br
-        %br
-      - if @questionnaire.acc_status == "rsvp_confirmed" || @questionnaire.checked_in?
-        .fa.fa-check
-        Congratulations! You're all set to attend #{Rails.configuration.hackathon['name']}.
-        %br
-        %br
-        Expect an email closer to February 11th with additional logistics & travel info.
-      - elsif @questionnaire.acc_status == "rsvp_denied"
-        Sorry to hear you won't be with us this year.
+- title "RSVP"
+.form-container
+  #disclaimer
+    %h1.section-title
+      RSVP
+      %span.emphasized Preferences
+    - if @questionnaire.acc_status == "rsvp_confirmed" || @questionnaire.checked_in?
+      %strong
+        - if @questionnaire.riding_bus
+          ALL SET TO ATTEND & RIDE THE BUS!
+        - else
+          ALL SET TO ATTEND!
+      %br
+      %br
+      Expect an email closer to February 11th with additional logistics & travel info.
+    - else
+      %strong= current_user.questionnaire.verbal_status.upcase
+      - if @questionnaire.acc_status == "rsvp_denied"
+        %p Sorry to hear you won't be with us this year.
       - else
-        You've been accepted to #{Rails.configuration.hackathon['name']}!
-        Will you be attending?
+        %p You've been accepted to #{Rails.configuration.hackathon['name']}!
+        %p Will you be attending?
+
+    %hr
+
+    - if flash[:notice]
+      .alert
+        = flash[:notice]
+
     = simple_form_for @questionnaire, url: url_for(controller: "rsvps", action: "update"), html: { "data-validate" => "form" } do |f|
       .form-inputs
-        = f.input :acc_status, as: :radio_buttons, collection: { " Attending" => "rsvp_confirmed", " Not Attending" => "rsvp_denied" }, label: "RSVP Status:"
+        = f.input :acc_status, as: :radio_buttons, collection: { " Attending!" => "rsvp_confirmed", " Not Attending." => "rsvp_denied" }, label: "Attendance:", required: true
 
         .hide-if-not-attending{ style: @questionnaire.acc_status == "rsvp_denied" ? "display: none;" : "" }
-          = f.input :phone, input_html: { "data-validate" => "presence" }, label: "Verify Phone #:"
+          = f.input :phone, input_html: { "data-validate" => "presence" }, label: "Please verify your phone number:"
 
       .hide-if-not-attending{ style: @questionnaire.acc_status == "rsvp_denied" ? "display: none;" : "" }
         - if @questionnaire.eligible_for_a_bus?
@@ -31,7 +40,7 @@
             #disclaimer
               Aw, shucks. Your school is eligible for a bus, but all the seats are currently taken.
           - else
-            #disclaimer
+            %p
               - if @questionnaire.riding_bus && @questionnaire.acc_status != "rsvp_denied"
                 .fa.fa-check
                 You're all set to ride the bus.
@@ -41,22 +50,20 @@
                   .fa.fa-warning
                   Your bus is currently full. If you are no longer riding, please update your status so someone else may use it.
               - else
-                Good news! Your school is eligible for a bus! Will you be riding?
-
-            = f.input :riding_bus, as: :radio_buttons, collection: { " Yes!" => true, " No thank you" => false }, label: "Riding the bus:"
-            %p You MUST sign up here if you wish to ride the bus! IDs will be checked at boarding.
-            - if @questionnaire.bus_list.needs_bus_captain
-              %p We're also looking for bus captains from your school. Are you interested?
-              = f.input :bus_captain_interest, as: :radio_buttons, collection: { " Yes!" => true, " No thank you" => false }, label: "Bus capain interest:"
-
-            = render partial: 'bus_list_info', locals: { bus_list: @questionnaire.bus_list }
+                Good news: your school is eligible for a bus! Will you be riding?
+            .form-inputs
+              = f.input :riding_bus, as: :radio_buttons, collection: { " Yes!" => true, " No thank you." => false }, label: "Riding the bus:", hint: "You MUST sign up here if you wish to ride the bus! IDs will be checked at boarding."
+              - if @questionnaire.bus_list.needs_bus_captain
+                = f.input :bus_captain_interest, as: :radio_buttons, collection: { " Yes!" => true, " No thank you." => false }, label: "We're also looking for bus captains from your school. Are you interested?"
 
         - else
           = f.input :riding_bus, as: :hidden, value: false
 
-      .center
-        = btn_link_to "Edit Application", edit_questionnaires_path
+      .right
         = f.button :submit, value: "Update"
         %br
         - if @questionnaire.eligible_for_a_bus? && @questionnaire.is_bus_captain?
           %p= link_to "Manage Bus List »".html_safe, bus_list_path
+
+  - if @questionnaire.eligible_for_a_bus?
+    = render partial: 'bus_list_info', locals: { bus_list: @questionnaire.bus_list }

data/config/initializers/devise.rb

@@ -260,6 +260,7 @@ Devise.setup do |config|
   # Devise
   Rails.application.config.to_prepare do
     Devise::Mailer.layout "mailer"
-    Devise::SessionsController.layout "hackathon_manager"
+    Devise::SessionsController.layout "hackathon_manager/application"
+    Devise::PasswordsController.layout "hackathon_manager/application"
   end
 end

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.4.4'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -475,10 +475,10 @@ files:
 - app/assets/stylesheets/hackathon_manager/general/_base.sass
 - app/assets/stylesheets/hackathon_manager/general/_button.sass
 - app/assets/stylesheets/hackathon_manager/general/_footer.sass
+- app/assets/stylesheets/hackathon_manager/general/_header.sass
 - app/assets/stylesheets/hackathon_manager/general/_main.sass
 - app/assets/stylesheets/hackathon_manager/general/_media-queries.sass
 - app/assets/stylesheets/hackathon_manager/general/_mixins.sass
-- app/assets/stylesheets/hackathon_manager/general/_sidebar.sass
 - app/assets/stylesheets/hackathon_manager/general/_status-colors.sass
 - app/assets/stylesheets/hackathon_manager/general/_table.sass
 - app/assets/stylesheets/hackathon_manager/mailer.sass
@@ -531,9 +531,11 @@ files:
 - app/views/devise/registrations/new.html.haml
 - app/views/devise/sessions/_form.html.haml
 - app/views/devise/sessions/new.html.haml
-- app/views/layouts/_shared_footer.html.haml
-- app/views/layouts/_sidebar.html.haml
-- app/views/layouts/hackathon_manager.html.haml
+- app/views/layouts/hackathon_manager/_account_nav.html.haml
+- app/views/layouts/hackathon_manager/_footer.html.haml
+- app/views/layouts/hackathon_manager/_header.html.haml
+- app/views/layouts/hackathon_manager/_shared_footer.html.haml
+- app/views/layouts/hackathon_manager/application.html.haml
 - app/views/layouts/mailer.html.erb
 - app/views/layouts/manage/application.html.haml
 - app/views/mailer/accepted_email.html.erb

data/app/assets/stylesheets/hackathon_manager/general/_sidebar.sass

@@ -1,70 +0,0 @@
-#sidebar-toggle
-  background: $primary
-  color: $white
-  cursor: pointer
-  display: none
-  font-size: 2rem
-  left: 100%
-  padding: 10px 15px 10px 15px
-  position: absolute
-
-.sidebar, .sidebar.open
-  background: $black
-  bottom: 0
-  left: 0
-  min-height: 100%
-  position: fixed
-  text-align: center
-  top: 0
-  @include transition(200ms, left, ease-in-out, 0s)
-  width: $sidebar-width
-  z-index: 10001
-  .pusher
-    height: 100%
-    overflow-y: auto
-    padding-bottom: 33px
-    z-index: 1000
-
-  #logo
-    display: block
-    margin: auto
-    width: 80%
-    padding: 10% 0
-
-.nav-list
-  font-size: 1.125rem
-  list-style: none
-  margin: 10px 0 0
-  padding: 0
-  .nav-link
-    color: $white
-    display: block
-    padding: 15px 20px
-    text-align: center
-    @include transition(250ms, all, ease-in-out, 0ms)
-    width: 100%
-    &:hover
-      background: darken($primary, 10%)
-
-.social-list
-  font-size: 0.875rem
-  list-style: none
-  padding: 25px 0
-  li
-    margin: 3px 10px
-  .fa
-    text-align: center
-    width: 20px
-  .sm-link
-    color: $white
-    display: inline-block
-    padding: 8px
-    margin-top: 3px
-    @include transition(250ms, all, ease-in-out, 0ms)
-    &:hover
-      background: darken($primary, 10%)
-.social-list-inverse
-  .sm-link
-    color: $secondary
-    &:hover
-      background: $primary

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

@@ -1,25 +0,0 @@
-%div{ class:"sidebar #{controller.controller_name}" }
-  %span#sidebar-toggle
-    %i.fa.fa-navicon
-  .pusher
-    - if Rails.configuration.hackathon['logo_asset']
-      #logo-cta
-        = link_to root_path do
-          = image_tag Rails.configuration.hackathon['logo_asset'], id: 'logo', alt: "#{Rails.configuration.hackathon['name']} logo", title: Rails.configuration.hackathon['name']
-    %nav
-      %ul.nav-list
-        %li
-          = link_to "Home", root_path, class: 'nav-link'
-        - if user_signed_in?
-          %li
-            - if current_user.admin?
-              = link_to "Manage", manage_root_path, class: 'nav-link'
-            - else
-              = link_to "My Account", new_questionnaires_path, class: 'nav-link'
-          %li
-            = link_to "Sign Out", destroy_user_session_path, method: :delete, class: 'nav-link'
-        - else
-          %li
-            = link_to "Sign In", new_user_session_path, class: 'nav-link'
-          %li
-            = link_to "Sign Up", new_user_registration_path, class: 'nav-link'