hackathon_manager 0.3.3 → 0.4.0

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: 322f708afc42961a451cdc1fb3ca091dce944ce1
4
- data.tar.gz: d0a540c3ceb60e98991a6592446f14732648ad08
3
+ metadata.gz: 96832db5f9a50e511404a589a199df7b0f9bb75a
4
+ data.tar.gz: 53be2d0062aca66911498ba43db1d346e7f8cdf5
5
5
  SHA512:
6
- metadata.gz: 4e95236a8e2eb60b0a0b822f8dbcb5319058cf24ea5619a1ba9a98c0838778e0f8f6cf52e58ae98b852c7659e06a2233fd16e0e4760e6fd5489b08ecab960f24
7
- data.tar.gz: 50e782cefc836ed90994c89669a15c5b336882c0c755acfcbc9833a2aeab10bb64d3b7694cf62787b7195dc8b036f2faab7f4ccefb5eed1e33da505866cbd6ea
6
+ metadata.gz: c51bcc3e382909fc1d4695668a89446529930e18f93a6b26c5d74d6355fd99b287242e6cd66a136c9218122af9902a4a9eafef98b0dfbf5368180cc1fd5ea01e
7
+ data.tar.gz: 20422fcae9c759c67cf402b21975cc988cf4018c5452fb86f3acc078adfaaf849c6e2ae9a4b19a4c116cb3498918301f7c86856e2a5402b825fefe9bd6cdf991
@@ -0,0 +1,15 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <svg width="75px" height="75px" viewBox="0 0 75 75" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
4
+ <title>arrow_down</title>
5
+ <desc>Created with Sketch.</desc>
6
+ <defs></defs>
7
+ <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
8
+ <g id="arrow_down">
9
+ <g id="Layer_1">
10
+ <rect id="Rectangle-path" fill="#FFFFFF" x="0" y="0" width="75" height="75"></rect>
11
+ <polygon id="Shape" fill="#201E1F" points="53.311 27.363 21.689 27.363 37.5 47.637"></polygon>
12
+ </g>
13
+ </g>
14
+ </g>
15
+ </svg>
@@ -0,0 +1,15 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <svg width="75px" height="75px" viewBox="0 0 75 75" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
4
+ <title>arrow_down_hover</title>
5
+ <desc>Created with Sketch.</desc>
6
+ <defs></defs>
7
+ <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
8
+ <g id="arrow_down_hover">
9
+ <g id="Layer_1">
10
+ <rect id="Rectangle-path" fill="#FFFFFF" x="0" y="0" width="75" height="75"></rect>
11
+ <polygon id="Shape" fill="#999999" points="53.311 27.363 21.689 27.363 37.5 47.637"></polygon>
12
+ </g>
13
+ </g>
14
+ </g>
15
+ </svg>
@@ -16,6 +16,3 @@
16
16
  padding-left: 30px
17
17
  padding-right: 30px
18
18
  color: #555
19
-
20
- .fields
21
- font-size: 93%
@@ -40,8 +40,6 @@ hr
40
40
  margin-bottom: 30px
41
41
  .simple_form
42
42
  color: $grey
43
- abbr
44
- // display: none
45
43
  .error
46
44
  background: $red
47
45
  //bottom: 1px
@@ -95,7 +93,7 @@ input[type=text], input[type=email], input[type=tel], input[type=date], input[ty
95
93
  // just selects
96
94
  select
97
95
  @include appearance (none)
98
- background: url(image_path("/assets/arrow_down.svg")), $white_pure
96
+ background: asset-url("hackathon_manager/arrow_down.svg"), $white_pure
99
97
  background-repeat: no-repeat
100
98
  background-position: right
101
99
  background-size: auto 100%
@@ -110,13 +108,13 @@ select
110
108
  &:last-child
111
109
  margin-right: 0
112
110
  &:hover
113
- background: url(image_path("/assets/arrow_down_hover.svg")), $white_pure
111
+ background: asset-url("hackathon_manager/arrow_down_hover.svg"), $white_pure
114
112
  background-repeat: no-repeat
115
113
  background-position: right
116
114
  background-size: auto 100%
117
115
  &:focus
118
116
  border-color: lighten($black, 10%)
119
- background: url(image_path("/assets/arrow_down_hover.svg")), $white_pure
117
+ background: asset-url("hackathon_manager/arrow_down_hover.svg"), $white_pure
120
118
  background-repeat: no-repeat
121
119
  background-position: right
122
120
  background-size: auto 100%
@@ -175,7 +173,8 @@ input[type=submit]
175
173
  padding: 0
176
174
 
177
175
  .form-container
178
- padding: 0 25px
176
+ padding: 0 5px
177
+
179
178
  div.input
180
179
  display: block
181
180
 
@@ -12,18 +12,14 @@ $red : #fc401c !default
12
12
  // site colors
13
13
  $primary : $orange !default
14
14
  $secondary : $blue !default
15
+
15
16
  // general colors
16
17
  $white_pure : #FFFFFF !default
17
18
  $grey-light : #E4E4E4 !default
18
19
  $grey-med : #888888 !default
19
20
  $grey-dark : #343434 !default
20
- $grey-blue : #3B4C57 !default
21
- // logo colors
22
- $orange-light : #F98728 !default
23
- $orange-med : #F36321 !default
24
- $orange-dark : #CE5F15 !default
25
- $blue-light : #22619E !default
26
21
  $offwhite : #FCF7F2 !default
22
+
27
23
  // fonts
28
24
  $font-body-family : 'Open Sans', sans-serif !default
29
25
  $font-headlines-family : 'Open Sans', sans-serif !default
@@ -71,7 +71,7 @@ class QuestionnairesController < ApplicationController
71
71
  current_user.questionnaire = @questionnaire
72
72
  @questionnaire.update_attribute(:acc_status, default_acc_status)
73
73
  Mailer.delay.application_confirmation_email(@questionnaire.id)
74
- format.html { redirect_to questionnaires_path, notice: 'Application was successfully created.' }
74
+ format.html { redirect_to questionnaires_path }
75
75
  format.json { render json: @questionnaire, status: :created, location: @questionnaire }
76
76
  else
77
77
  format.html { render action: "new" }
@@ -3,14 +3,13 @@
3
3
  .form-container.signup
4
4
  %h1.section-title Sign Up
5
5
 
6
- #disclaimer
7
- - unless Rails.configuration.hackathon['registration_is_open']
8
- .center
9
- %strong Registration is now closed. Thanks to everyone who applied!
10
- %br
11
- %ul
12
- %li Applicants must be 18 years of age by February 11th
13
- %li RIT students must still apply
14
- %li International applicants are welcome
6
+ - if Rails.configuration.hackathon['registration_is_open'] || Rails.configuration.hackathon['disclaimer']
7
+ #disclaimer
8
+ - unless Rails.configuration.hackathon['registration_is_open']
9
+ .center
10
+ %strong Registration is now closed. Thanks to everyone who applied!
11
+ %br
12
+ - if Rails.configuration.hackathon['disclaimer']
13
+ = markdown(Rails.configuration.hackathon['disclaimer'])
15
14
 
16
15
  = render 'form'
@@ -6,17 +6,20 @@
6
6
  #logo-cta
7
7
  = link_to root_path do
8
8
  = image_tag Rails.configuration.hackathon['logo_asset'], id: 'logo', alt: "#{Rails.configuration.hackathon['name']} logo", title: Rails.configuration.hackathon['name']
9
- - if user_signed_in?
10
- %div
11
- - if current_user.admin?
12
- = btn_link_to "Manage", manage_root_path
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'
13
21
  - else
14
- = btn_link_to "Review", new_questionnaires_path
15
- - else
16
- %div
17
- = btn_link_to "Sign In", new_user_session_path
18
- %div
19
- = btn_link_to "Sign Up", new_user_registration_path
20
- - if user_signed_in?
21
- %div
22
- = btn_link_to "Sign Out", destroy_user_session_path, method: :delete
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'
@@ -2,6 +2,8 @@
2
2
  %html
3
3
  %head
4
4
  %title= yield(:title) || Rails.configuration.hackathon['default_page_title']
5
+ %meta{ charset: "utf-8" }
6
+ %meta{ name:"viewport", content: "width=device-width, initial-scale=1" }
5
7
  = stylesheet_link_tag "hackathon_manager/manage", media: "all"
6
8
  = csrf_meta_tags
7
9
 
@@ -18,32 +18,6 @@
18
18
  <div id="main-content">
19
19
  <%= yield %>
20
20
  </div>
21
-
22
- <!--footer-->
23
- <div class="email-footer">
24
- <table border="0" >
25
- <tr>
26
- <td>
27
- <span>
28
- <%= link_to Rails.configuration.hackathon['name'], 'https://brickhack.io' %>
29
- </span>
30
- <span>
31
- <%= link_to 'Facebook', 'https://www.facebook.com/brickhackrit' %>
32
- </span>
33
- <span>
34
- <%= link_to 'Twitter', 'https://twitter.com/brickhackrit' %>
35
- </span>
36
- </td>
37
- <td>
38
- <span>
39
- <%= link_to 'http://coderit.org', class: 'nodecor' do %>
40
- Student run by <img class="coderit-logo" src="<%= image_url('coderit_logo.png') %>" />
41
- <% end %>
42
- </span>
43
- </td>
44
- </tr>
45
- </table>
46
- </div>
47
21
  </div>
48
22
 
49
23
  </body>
@@ -9,11 +9,9 @@
9
9
  %p= flash[:notice]
10
10
 
11
11
  .wizard-stage.wizard-current
12
- #disclaimer
13
- %ul
14
- %li Applicants must be 18 years of age by February 11th
15
- %li RIT students must still apply
16
- %li International applicants are welcome
12
+ - if Rails.configuration.hackathon['disclaimer']
13
+ #disclaimer
14
+ = markdown(Rails.configuration.hackathon['disclaimer'])
17
15
 
18
16
  .form-inputs
19
17
  = f.input :first_name, placeholder: "Joe", input_html: { "data-validate" => "presence" }, autofocus: true
@@ -68,8 +66,10 @@
68
66
  = f.input :code_of_conduct_accepted, as: :formatted_boolean, label: "I accept the MLH Code of Conduct", input_html: { "data-validate" => "presence" }
69
67
  %p
70
68
  %small
71
- 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.
72
- = f.input :data_sharing_accepted, as: :formatted_boolean, label: "I accept the MLH data sharing notice", input_html: { "data-validate" => "presence" }
69
+ I agree to the terms of both the
70
+ <a href="https://github.com/MLH/mlh-policies/tree/master/prize-terms-and-conditions" target="_blank">MLH Contest Terms</a> and Conditions and the
71
+ <a href="https://mlh.io/privacy" target="_blank">MLH Privacy Policy</a>. 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.
72
+ = f.input :data_sharing_accepted, as: :formatted_boolean, label: "I accept the MLH policies", input_html: { "data-validate" => "presence" }
73
73
 
74
74
  .center
75
75
  %button.button{ type: "button", "data-wizard" => "previous" } Previous
@@ -15,7 +15,10 @@
15
15
  = link_to "RSVP NOW &raquo;".html_safe, rsvp_path
16
16
  - else
17
17
  - if Rails.configuration.hackathon['registration_is_open']
18
- %p Thanks for applying! You will be notified of your acceptance via email.
18
+ - if Rails.configuration.hackathon['thanks_for_applying']
19
+ = markdown(Rails.configuration.hackathon['thanks_for_applying'])
20
+ - else
21
+ %p Thanks for applying! You will be notified of your acceptance via email.
19
22
  - else
20
23
  %p Thanks for applying!
21
24
 
@@ -1,3 +1,3 @@
1
1
  module HackathonManager
2
- VERSION = '0.3.3'.freeze
2
+ VERSION = '0.4.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.3.3
4
+ version: 0.4.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-11-21 00:00:00.000000000 Z
11
+ date: 2017-12-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -441,6 +441,8 @@ files:
441
441
  - README.md
442
442
  - Rakefile
443
443
  - app/assets/config/hackathon_manager_manifest.js
444
+ - app/assets/images/hackathon_manager/arrow_down.svg
445
+ - app/assets/images/hackathon_manager/arrow_down_hover.svg
444
446
  - app/assets/javascripts/hackathon_manager/application.js
445
447
  - app/assets/javascripts/hackathon_manager/jquery.transit.min.js
446
448
  - app/assets/javascripts/hackathon_manager/main.js