hackathon_manager 0.5.6 → 0.5.7

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 39b6a7f4c9399988b46718c3e737868c187e0c69
4
- data.tar.gz: c5dfb9e1c160131e7a44e894bc8988a503eff9ce
3
+ metadata.gz: bc6e648015557244ac581d3ac19780801dfb05fc
4
+ data.tar.gz: 4e8514acedf9e573ae863235292cf71e6cbf9cbb
5
5
  SHA512:
6
- metadata.gz: 35e7c387a2df217c2d4af7542d8e019ca143dbcb4ea1b4a6f52f5fddb23cb3ee381c0eb58735066b441b35cb4ac6934d107e5d271e8cfea5a36dbb760de711cb
7
- data.tar.gz: 917e27daf592f494288023a8b0154aeb0f75fceb34b38aed11852eca3d662f7ed8fd46304bd293f89928a360986b63a51ca251ed4770409d74df648b296a0ea1
6
+ metadata.gz: a5a80fdabe39840e91ef912fbe05ab239b5b3606f3f7abb4581557ce64243344b8add6fe03b8fff5b74cc61a9bca11e43972a4077ae2be1f34256cc340c1d2f7
7
+ data.tar.gz: db8bd628b1e79e940cf32aa7d97039abe7318ed7d7b85194d74d9f80a718a9444a1aec64d9b31f31df773ad7edc152cdd882f5c7a0efa89436707febe91530fb
@@ -4,6 +4,7 @@
4
4
  @import general/mixins
5
5
  @import general/base
6
6
  @import general/button
7
+ @import general/flashes
7
8
  @import general/main
8
9
  @import general/header
9
10
  @import general/footer
@@ -0,0 +1,18 @@
1
+ .flashes
2
+ background: $flashes--background
3
+ color: $flashes--text
4
+ padding-top: 20px
5
+ padding-bottom: 20px
6
+ font-weight: 400
7
+
8
+ opacity: 0
9
+ animation: flashesFadeIn 400ms 100ms ease-out forwards
10
+
11
+ .flashes__icon
12
+ margin-right: 0.4em
13
+
14
+ @keyframes flashesFadeIn
15
+ 0%
16
+ opacity: 0
17
+ 100%
18
+ opacity: 1
@@ -9,11 +9,13 @@ body
9
9
  font-weight: $font-light
10
10
  text-align: center
11
11
  margin: 0
12
+ padding: 0
12
13
  body *
13
14
  font-family: 'Open Sans', sans-serif
14
15
 
15
16
  html
16
17
  margin: 0
18
+ padding: 0
17
19
 
18
20
  ul
19
21
  list-style: none
@@ -35,12 +37,20 @@ table
35
37
  #content
36
38
  max-width: 800px
37
39
  width: 100%
38
- margin: 56px auto
40
+ margin: 30px auto
39
41
  background: white
42
+ @media (max-width: 800px)
43
+ margin: 0 auto
40
44
 
41
45
  #main-content
42
46
  background: white
43
- padding: 20px 48px 64px
47
+ padding: 20px 40px 64px
48
+ @media (max-width: 800px)
49
+ padding-left: 35px
50
+ padding-right: 35px
51
+ @media (max-width: 500px)
52
+ padding-left: 20px
53
+ padding-right: 20px
44
54
 
45
55
 
46
56
  .banner
@@ -57,18 +67,17 @@ table
57
67
  .email-footer td span a
58
68
  color: white
59
69
 
60
- h1
61
- line-height: 1.27
62
-
63
70
  h1, h2
71
+ line-height: 1.27
64
72
  font-weight: $font-light
65
73
  text-transform: uppercase
66
- font-size: 36px
74
+ font-size: 30px
67
75
  color: $primary
76
+ margin: 30px 0 30px
68
77
 
69
78
  h3
70
79
  font-weight: 600
71
- font-size: 24px
80
+ font-size: 20px
72
81
  text-transform: uppercase
73
82
  color: #fc401c
74
83
 
@@ -89,6 +98,9 @@ p
89
98
  strong
90
99
  font-weight: 600
91
100
 
101
+ img
102
+ max-width: 100%
103
+
92
104
  div.center
93
105
  margin: 0 auto
94
106
 
@@ -7,7 +7,7 @@
7
7
  .manage
8
8
  padding-left: 20px
9
9
  padding-right: 20px
10
- padding-top: 100px
10
+ padding-top: 50px
11
11
 
12
12
  .container-half, .container-full
13
13
  max-width: none
@@ -27,14 +27,11 @@
27
27
  margin: 0
28
28
 
29
29
  #manageNav
30
- position: absolute
31
30
  z-index: 1
32
31
  width: 100%
33
32
  background: $black
34
33
  color: $white
35
34
  padding: 16px 20px 6px
36
- @media(max-width: 840px)
37
- padding-left: 70px
38
35
  p, a
39
36
  margin: 0 5px 10px
40
37
  p
@@ -115,6 +115,12 @@ $alert--background--error: $red !default
115
115
  $alert--border--error: $red !default
116
116
  $alert--text--error: $white_pure !default
117
117
 
118
+ /*
119
+ * Flashes
120
+ */
121
+ $flashes--background: hsl(51, 87%, 94%) !default
122
+ $flashes--text: hsl(40, 68%, 20%) !default
123
+
118
124
  /*
119
125
  * Account header
120
126
  */
@@ -0,0 +1,12 @@
1
+ class Manage::ConfigsController < Manage::ApplicationController
2
+ before_action :limit_access_admin
3
+
4
+ def show
5
+ end
6
+
7
+ private
8
+
9
+ def limit_access_admin
10
+ redirect_to manage_root_path if current_user.admin_limited_access
11
+ end
12
+ end
@@ -0,0 +1,6 @@
1
+ - if flash[:notice].present?
2
+ .flashes
3
+ .container
4
+ .form-container
5
+ %span.fa.fa-info-circle.flashes__icon
6
+ = flash[:notice]
@@ -10,6 +10,7 @@
10
10
  %body
11
11
  = render "layouts/hackathon_manager/header"
12
12
  = render "layouts/hackathon_manager/account_nav"
13
+ = render "layouts/hackathon_manager/flashes"
13
14
  #main
14
15
  %section.section
15
16
  .container
@@ -20,7 +20,9 @@
20
20
  = link_to "Stats", manage_stats_path
21
21
  - unless current_user.admin_limited_access?
22
22
  \|
23
+ = link_to "Config", manage_config_path
23
24
  = link_to "Sidekiq", sidekiq_web_path
24
25
  = link_to "Blazer", blazer_path
26
+ = render "layouts/hackathon_manager/flashes"
25
27
  = yield
26
28
  = render "layouts/hackathon_manager/shared_footer"
@@ -0,0 +1,29 @@
1
+ %section.section.manage
2
+ %h1.section-title= title "Hackathon Configuration"
3
+
4
+ %fieldset
5
+ %legend Environment Variables
6
+ %p
7
+ %em
8
+ Environment variables are configured on the production server.
9
+ %p
10
+ %b Carpool Link:
11
+ %pre= ENV['CARPOOL_LINK'] || '[No value]'
12
+ %p
13
+ %b Slack Sign Up URL:
14
+ %pre= ENV['SLACK_SIGNUP_URL'] || '[No value]'
15
+ %p
16
+ %b AWS S3 Bucket for Resumes:
17
+ %pre= ENV['AWS_BUCKET'] || '[No value]'
18
+
19
+ %fieldset
20
+ %legend Hackathon Manager Config
21
+ %p
22
+ %em
23
+ Hackathon Manager configuration can be changed in the source code at
24
+ %code config/hackathon.yml
25
+ \.
26
+ - Rails.configuration.hackathon.keys.each do |key|
27
+ %p
28
+ %b #{key}:
29
+ %pre= Rails.configuration.hackathon[key]
@@ -12,9 +12,6 @@
12
12
  %section.section.manage
13
13
  %h1.section-title= title "Dashboard"
14
14
 
15
- - if flash[:notice]
16
- #disclaimer= flash[:notice]
17
-
18
15
  .container.container-full
19
16
  #map
20
17
  :javascript
@@ -4,10 +4,6 @@
4
4
  - if f.error_notification.present?
5
5
  = f.error_notification
6
6
 
7
- - if flash[:notice]
8
- #disclaimer
9
- %p= flash[:notice]
10
-
11
7
  .form-inputs
12
8
  %fieldset
13
9
  - if @questionnaire&.user&.provider == 'mlh'
@@ -7,9 +7,6 @@
7
7
  %span.fa.fa-warning.icon-space-r
8
8
  Slack invites will be sent upon acceptance.
9
9
 
10
- - if flash[:notice]
11
- #disclaimer= flash[:notice]
12
-
13
10
  %table.questionnaires.datatable.row-border.stripe.hover.order-column{ "data-source" => datatable_manage_questionnaires_path(format: :json) }
14
11
  %thead
15
12
  %tr
@@ -10,9 +10,6 @@
10
10
  - if f.error_notification.present?
11
11
  #disclaimer
12
12
  = f.error_notification
13
- - if flash[:notice]
14
- #disclaimer
15
- = flash[:notice]
16
13
 
17
14
  %p
18
15
  You are going to merge
@@ -1,9 +1,6 @@
1
1
  %section.section.manage
2
2
  %h1.section-title= title "Statistics & Info"
3
3
 
4
- - if flash[:notice]
5
- #disclaimer= flash[:notice]
6
-
7
4
  .container.container-full
8
5
  %h4.dashboard-container-title Dietary Restrictions & Special Needs
9
6
  %table.stats.datatable.row-border.stripe.hover.order-column{ "data-source" => dietary_special_needs_manage_stats_path(format: :json) }
@@ -4,10 +4,6 @@
4
4
  - if f.error_notification.present?
5
5
  = f.error_notification
6
6
 
7
- - if flash[:notice]
8
- #disclaimer
9
- %p= flash[:notice]
10
-
11
7
  .wizard-stage.wizard-current
12
8
  - if Rails.configuration.hackathon['disclaimer']
13
9
  #disclaimer
@@ -1,9 +1,5 @@
1
1
  - title "Application"
2
2
  .form-container
3
- - if flash[:notice]
4
- #disclaimer
5
- %p#notice= flash[:notice]
6
-
7
3
  #disclaimer
8
4
  %h1.section-title
9
5
  Application
@@ -23,10 +23,6 @@
23
23
 
24
24
  %hr
25
25
 
26
- - if flash[:notice]
27
- .alert
28
- = flash[:notice]
29
-
30
26
  = simple_form_for @questionnaire, url: url_for(controller: "rsvps", action: "update"), html: { "data-validate" => "form" } do |f|
31
27
  .form-inputs
32
28
  = f.input :acc_status, as: :radio_buttons, collection: { " Attending!" => "rsvp_confirmed", " Not Attending." => "rsvp_denied" }, label: "Attendance:", required: true
data/config/routes.rb CHANGED
@@ -68,6 +68,8 @@ Rails.application.routes.draw do
68
68
  post :alt_travel, on: :collection
69
69
  post :mlh_info, on: :collection
70
70
  end
71
+ resource :config do
72
+ end
71
73
  end
72
74
 
73
75
  resource :bus_list
@@ -1,3 +1,3 @@
1
1
  module HackathonManager
2
- VERSION = '0.5.6'.freeze
2
+ VERSION = '0.5.7'.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.5.6
4
+ version: 0.5.7
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-23 00:00:00.000000000 Z
11
+ date: 2018-01-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -474,6 +474,7 @@ files:
474
474
  - app/assets/stylesheets/hackathon_manager/forms/_forms.sass
475
475
  - app/assets/stylesheets/hackathon_manager/general/_base.sass
476
476
  - app/assets/stylesheets/hackathon_manager/general/_button.sass
477
+ - app/assets/stylesheets/hackathon_manager/general/_flashes.sass
477
478
  - app/assets/stylesheets/hackathon_manager/general/_footer.sass
478
479
  - app/assets/stylesheets/hackathon_manager/general/_header.sass
479
480
  - app/assets/stylesheets/hackathon_manager/general/_main.sass
@@ -490,6 +491,7 @@ files:
490
491
  - app/controllers/manage/admins_controller.rb
491
492
  - app/controllers/manage/application_controller.rb
492
493
  - app/controllers/manage/bus_lists_controller.rb
494
+ - app/controllers/manage/configs_controller.rb
493
495
  - app/controllers/manage/dashboard_controller.rb
494
496
  - app/controllers/manage/messages_controller.rb
495
497
  - app/controllers/manage/questionnaires_controller.rb
@@ -532,6 +534,7 @@ files:
532
534
  - app/views/devise/sessions/_form.html.haml
533
535
  - app/views/devise/sessions/new.html.haml
534
536
  - app/views/layouts/hackathon_manager/_account_nav.html.haml
537
+ - app/views/layouts/hackathon_manager/_flashes.html.haml
535
538
  - app/views/layouts/hackathon_manager/_footer.html.haml
536
539
  - app/views/layouts/hackathon_manager/_header.html.haml
537
540
  - app/views/layouts/hackathon_manager/_shared_footer.html.haml
@@ -558,6 +561,7 @@ files:
558
561
  - app/views/manage/bus_lists/index.html.haml
559
562
  - app/views/manage/bus_lists/new.html.haml
560
563
  - app/views/manage/bus_lists/show.html.haml
564
+ - app/views/manage/configs/show.html.haml
561
565
  - app/views/manage/dashboard/index.html.haml
562
566
  - app/views/manage/dashboard/map_data.tsv.erb
563
567
  - app/views/manage/messages/_form.html.haml