hackathon_manager 0.4.4 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/hackathon_manager/core.sass +1 -1
  3. data/app/assets/stylesheets/hackathon_manager/forms/_confirmation.sass +2 -4
  4. data/app/assets/stylesheets/hackathon_manager/forms/_forms.sass +161 -120
  5. data/app/assets/stylesheets/hackathon_manager/general/_base.sass +16 -12
  6. data/app/assets/stylesheets/hackathon_manager/general/_button.sass +15 -11
  7. data/app/assets/stylesheets/hackathon_manager/general/_header.sass +67 -0
  8. data/app/assets/stylesheets/hackathon_manager/general/_main.sass +4 -2
  9. data/app/assets/stylesheets/hackathon_manager/general/_mixins.sass +59 -53
  10. data/app/assets/stylesheets/hackathon_manager/mailer.sass +3 -3
  11. data/app/assets/stylesheets/variables.sass +100 -11
  12. data/app/controllers/bus_lists_controller.rb +1 -1
  13. data/app/controllers/questionnaires_controller.rb +1 -1
  14. data/app/controllers/rsvps_controller.rb +1 -1
  15. data/app/controllers/users/registrations_controller.rb +1 -1
  16. data/app/helpers/hackathon_manager_helper.rb +8 -0
  17. data/app/inputs/deletable_attachment_input.rb +1 -1
  18. data/app/models/questionnaire.rb +14 -0
  19. data/app/views/bus_lists/show.html.haml +5 -2
  20. data/app/views/devise/passwords/edit.html.haml +15 -14
  21. data/app/views/devise/passwords/new.html.haml +6 -4
  22. data/app/views/devise/registrations/_form.html.haml +5 -6
  23. data/app/views/devise/registrations/edit.html.haml +18 -20
  24. data/app/views/devise/registrations/new.html.haml +14 -13
  25. data/app/views/devise/sessions/_form.html.haml +5 -5
  26. data/app/views/devise/sessions/new.html.haml +10 -9
  27. data/app/views/layouts/hackathon_manager/_account_nav.html.haml +10 -0
  28. data/app/views/layouts/hackathon_manager/_footer.html.haml +0 -0
  29. data/app/views/layouts/hackathon_manager/_header.html.haml +14 -0
  30. data/app/views/layouts/{_shared_footer.html.haml → hackathon_manager/_shared_footer.html.haml} +1 -1
  31. data/app/views/layouts/{hackathon_manager.html.haml → hackathon_manager/application.html.haml} +7 -3
  32. data/app/views/layouts/manage/application.html.haml +2 -2
  33. data/app/views/manage/questionnaires/_form.html.haml +1 -1
  34. data/app/views/questionnaires/_form.html.haml +42 -45
  35. data/app/views/questionnaires/edit.html.haml +11 -8
  36. data/app/views/questionnaires/new.html.haml +6 -6
  37. data/app/views/questionnaires/show.html.haml +46 -27
  38. data/app/views/rsvps/show.html.haml +40 -33
  39. data/config/initializers/devise.rb +2 -1
  40. data/lib/hackathon_manager/version.rb +1 -1
  41. metadata +8 -6
  42. data/app/assets/stylesheets/hackathon_manager/general/_sidebar.sass +0 -70
  43. data/app/views/layouts/_sidebar.html.haml +0 -25
@@ -1,29 +1,38 @@
1
- %section.section.manage
2
- - title "RSVP"
3
- %h1.section-title RSVP for #{Rails.configuration.hackathon['name']}
4
- .form-container
5
- #disclaimer
6
- - if flash[:notice]
7
- = flash[:notice]
8
- %br
9
- %br
10
- - if @questionnaire.acc_status == "rsvp_confirmed" || @questionnaire.checked_in?
11
- .fa.fa-check
12
- Congratulations! You're all set to attend #{Rails.configuration.hackathon['name']}.
13
- %br
14
- %br
15
- Expect an email closer to February 11th with additional logistics & travel info.
16
- - elsif @questionnaire.acc_status == "rsvp_denied"
17
- Sorry to hear you won't be with us this year.
1
+ - title "RSVP"
2
+ .form-container
3
+ #disclaimer
4
+ %h1.section-title
5
+ RSVP
6
+ %span.emphasized Preferences
7
+ - if @questionnaire.acc_status == "rsvp_confirmed" || @questionnaire.checked_in?
8
+ %strong
9
+ - if @questionnaire.riding_bus
10
+ ALL SET TO ATTEND & RIDE THE BUS!
11
+ - else
12
+ ALL SET TO ATTEND!
13
+ %br
14
+ %br
15
+ Expect an email closer to February 11th with additional logistics & travel info.
16
+ - else
17
+ %strong= current_user.questionnaire.verbal_status.upcase
18
+ - if @questionnaire.acc_status == "rsvp_denied"
19
+ %p Sorry to hear you won't be with us this year.
18
20
  - else
19
- You've been accepted to #{Rails.configuration.hackathon['name']}!
20
- Will you be attending?
21
+ %p You've been accepted to #{Rails.configuration.hackathon['name']}!
22
+ %p Will you be attending?
23
+
24
+ %hr
25
+
26
+ - if flash[:notice]
27
+ .alert
28
+ = flash[:notice]
29
+
21
30
  = simple_form_for @questionnaire, url: url_for(controller: "rsvps", action: "update"), html: { "data-validate" => "form" } do |f|
22
31
  .form-inputs
23
- = f.input :acc_status, as: :radio_buttons, collection: { " Attending" => "rsvp_confirmed", " Not Attending" => "rsvp_denied" }, label: "RSVP Status:"
32
+ = f.input :acc_status, as: :radio_buttons, collection: { " Attending!" => "rsvp_confirmed", " Not Attending." => "rsvp_denied" }, label: "Attendance:", required: true
24
33
 
25
34
  .hide-if-not-attending{ style: @questionnaire.acc_status == "rsvp_denied" ? "display: none;" : "" }
26
- = f.input :phone, input_html: { "data-validate" => "presence" }, label: "Verify Phone #:"
35
+ = f.input :phone, input_html: { "data-validate" => "presence" }, label: "Please verify your phone number:"
27
36
 
28
37
  .hide-if-not-attending{ style: @questionnaire.acc_status == "rsvp_denied" ? "display: none;" : "" }
29
38
  - if @questionnaire.eligible_for_a_bus?
@@ -31,7 +40,7 @@
31
40
  #disclaimer
32
41
  Aw, shucks. Your school is eligible for a bus, but all the seats are currently taken.
33
42
  - else
34
- #disclaimer
43
+ %p
35
44
  - if @questionnaire.riding_bus && @questionnaire.acc_status != "rsvp_denied"
36
45
  .fa.fa-check
37
46
  You're all set to ride the bus.
@@ -41,22 +50,20 @@
41
50
  .fa.fa-warning
42
51
  Your bus is currently full. If you are no longer riding, please update your status so someone else may use it.
43
52
  - else
44
- Good news! Your school is eligible for a bus! Will you be riding?
45
-
46
- = f.input :riding_bus, as: :radio_buttons, collection: { " Yes!" => true, " No thank you" => false }, label: "Riding the bus:"
47
- %p You MUST sign up here if you wish to ride the bus! IDs will be checked at boarding.
48
- - if @questionnaire.bus_list.needs_bus_captain
49
- %p We're also looking for bus captains from your school. Are you interested?
50
- = f.input :bus_captain_interest, as: :radio_buttons, collection: { " Yes!" => true, " No thank you" => false }, label: "Bus capain interest:"
51
-
52
- = render partial: 'bus_list_info', locals: { bus_list: @questionnaire.bus_list }
53
+ Good news: your school is eligible for a bus! Will you be riding?
54
+ .form-inputs
55
+ = 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."
56
+ - if @questionnaire.bus_list.needs_bus_captain
57
+ = 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?"
53
58
 
54
59
  - else
55
60
  = f.input :riding_bus, as: :hidden, value: false
56
61
 
57
- .center
58
- = btn_link_to "Edit Application", edit_questionnaires_path
62
+ .right
59
63
  = f.button :submit, value: "Update"
60
64
  %br
61
65
  - if @questionnaire.eligible_for_a_bus? && @questionnaire.is_bus_captain?
62
66
  %p= link_to "Manage Bus List »".html_safe, bus_list_path
67
+
68
+ - if @questionnaire.eligible_for_a_bus?
69
+ = render partial: 'bus_list_info', locals: { bus_list: @questionnaire.bus_list }
@@ -260,6 +260,7 @@ Devise.setup do |config|
260
260
  # Devise
261
261
  Rails.application.config.to_prepare do
262
262
  Devise::Mailer.layout "mailer"
263
- Devise::SessionsController.layout "hackathon_manager"
263
+ Devise::SessionsController.layout "hackathon_manager/application"
264
+ Devise::PasswordsController.layout "hackathon_manager/application"
264
265
  end
265
266
  end
@@ -1,3 +1,3 @@
1
1
  module HackathonManager
2
- VERSION = '0.4.4'.freeze
2
+ VERSION = '0.5.0'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hackathon_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.4
4
+ version: 0.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stuart Olivera
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-12-13 00:00:00.000000000 Z
11
+ date: 2017-12-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -475,10 +475,10 @@ files:
475
475
  - app/assets/stylesheets/hackathon_manager/general/_base.sass
476
476
  - app/assets/stylesheets/hackathon_manager/general/_button.sass
477
477
  - app/assets/stylesheets/hackathon_manager/general/_footer.sass
478
+ - app/assets/stylesheets/hackathon_manager/general/_header.sass
478
479
  - app/assets/stylesheets/hackathon_manager/general/_main.sass
479
480
  - app/assets/stylesheets/hackathon_manager/general/_media-queries.sass
480
481
  - app/assets/stylesheets/hackathon_manager/general/_mixins.sass
481
- - app/assets/stylesheets/hackathon_manager/general/_sidebar.sass
482
482
  - app/assets/stylesheets/hackathon_manager/general/_status-colors.sass
483
483
  - app/assets/stylesheets/hackathon_manager/general/_table.sass
484
484
  - app/assets/stylesheets/hackathon_manager/mailer.sass
@@ -531,9 +531,11 @@ files:
531
531
  - app/views/devise/registrations/new.html.haml
532
532
  - app/views/devise/sessions/_form.html.haml
533
533
  - app/views/devise/sessions/new.html.haml
534
- - app/views/layouts/_shared_footer.html.haml
535
- - app/views/layouts/_sidebar.html.haml
536
- - app/views/layouts/hackathon_manager.html.haml
534
+ - app/views/layouts/hackathon_manager/_account_nav.html.haml
535
+ - app/views/layouts/hackathon_manager/_footer.html.haml
536
+ - app/views/layouts/hackathon_manager/_header.html.haml
537
+ - app/views/layouts/hackathon_manager/_shared_footer.html.haml
538
+ - app/views/layouts/hackathon_manager/application.html.haml
537
539
  - app/views/layouts/mailer.html.erb
538
540
  - app/views/layouts/manage/application.html.haml
539
541
  - app/views/mailer/accepted_email.html.erb
@@ -1,70 +0,0 @@
1
- #sidebar-toggle
2
- background: $primary
3
- color: $white
4
- cursor: pointer
5
- display: none
6
- font-size: 2rem
7
- left: 100%
8
- padding: 10px 15px 10px 15px
9
- position: absolute
10
-
11
- .sidebar, .sidebar.open
12
- background: $black
13
- bottom: 0
14
- left: 0
15
- min-height: 100%
16
- position: fixed
17
- text-align: center
18
- top: 0
19
- @include transition(200ms, left, ease-in-out, 0s)
20
- width: $sidebar-width
21
- z-index: 10001
22
- .pusher
23
- height: 100%
24
- overflow-y: auto
25
- padding-bottom: 33px
26
- z-index: 1000
27
-
28
- #logo
29
- display: block
30
- margin: auto
31
- width: 80%
32
- padding: 10% 0
33
-
34
- .nav-list
35
- font-size: 1.125rem
36
- list-style: none
37
- margin: 10px 0 0
38
- padding: 0
39
- .nav-link
40
- color: $white
41
- display: block
42
- padding: 15px 20px
43
- text-align: center
44
- @include transition(250ms, all, ease-in-out, 0ms)
45
- width: 100%
46
- &:hover
47
- background: darken($primary, 10%)
48
-
49
- .social-list
50
- font-size: 0.875rem
51
- list-style: none
52
- padding: 25px 0
53
- li
54
- margin: 3px 10px
55
- .fa
56
- text-align: center
57
- width: 20px
58
- .sm-link
59
- color: $white
60
- display: inline-block
61
- padding: 8px
62
- margin-top: 3px
63
- @include transition(250ms, all, ease-in-out, 0ms)
64
- &:hover
65
- background: darken($primary, 10%)
66
- .social-list-inverse
67
- .sm-link
68
- color: $secondary
69
- &:hover
70
- background: $primary
@@ -1,25 +0,0 @@
1
- %div{ class:"sidebar #{controller.controller_name}" }
2
- %span#sidebar-toggle
3
- %i.fa.fa-navicon
4
- .pusher
5
- - if Rails.configuration.hackathon['logo_asset']
6
- #logo-cta
7
- = link_to root_path do
8
- = image_tag Rails.configuration.hackathon['logo_asset'], id: 'logo', alt: "#{Rails.configuration.hackathon['name']} logo", title: Rails.configuration.hackathon['name']
9
- %nav
10
- %ul.nav-list
11
- %li
12
- = link_to "Home", root_path, class: 'nav-link'
13
- - if user_signed_in?
14
- %li
15
- - if current_user.admin?
16
- = link_to "Manage", manage_root_path, class: 'nav-link'
17
- - else
18
- = link_to "My Account", new_questionnaires_path, class: 'nav-link'
19
- %li
20
- = link_to "Sign Out", destroy_user_session_path, method: :delete, class: 'nav-link'
21
- - else
22
- %li
23
- = link_to "Sign In", new_user_session_path, class: 'nav-link'
24
- %li
25
- = link_to "Sign Up", new_user_registration_path, class: 'nav-link'