diff --git a/Gemfile b/Gemfile index feec10f..a8f368c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,9 @@ source 'https://rubygems.org' -gem 'autoprefixer-rails', github: 'ajb/autoprefixer-rails', branch: 'bundle-process' +gem 'autoprefixer-rails' gem 'dvl-core', github: 'dobtco/dvl-core' -gem 'html-proofer', '~>2.3.0' +gem 'html-proofer' gem 'jekyll' gem 'jekyll-assets' +gem 'rake' gem 'uglifier' diff --git a/Gemfile.lock b/Gemfile.lock index 3569ebc..97d70d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,15 +1,6 @@ -GIT - remote: git://github.com/ajb/autoprefixer-rails.git - revision: 2d172c1e88b1c3941c43feb394ebe300e55ecc41 - branch: bundle-process - specs: - autoprefixer-rails (6.3.1) - execjs - json - GIT remote: git://github.com/dobtco/dvl-core.git - revision: d38500b207468a1ef6f422dcffe3a77850125a39 + revision: 5773e7579a3e93899f49d78a742a070803406f3a specs: dvl-core (0.1.0) activesupport @@ -19,27 +10,33 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (4.2.6) + activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.8) + addressable (2.4.0) + autoprefixer-rails (6.4.1) + execjs coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.10.0) - colorator (0.1) + colorator (1.1.0) colored (1.2) - concurrent-ruby (1.0.1) - ethon (0.8.1) + concurrent-ruby (1.0.2) + ethon (0.9.0) ffi (>= 1.3.0) - execjs (2.6.0) - fastimage (1.9.0) - addressable (~> 2.3.5) - ffi (1.9.10) - html-proofer (2.3.0) + execjs (2.7.0) + extras (0.1.0) + forwardable-extended (~> 2.5) + fastimage (2.0.0) + addressable (~> 2) + ffi (1.9.14) + forwardable-extended (2.6.0) + html-proofer (3.0.6) + activesupport (~> 4.2) addressable (~> 2.3) colored (~> 1.2) mercenary (~> 0.3.2) @@ -48,69 +45,73 @@ GEM typhoeus (~> 0.7) yell (~> 2.0) i18n (0.7.0) - jekyll (3.1.2) - colorator (~> 0.1) + jekyll (3.2.1) + colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) liquid (~> 3.0) mercenary (~> 0.3.3) + pathutil (~> 0.9) rouge (~> 1.7) safe_yaml (~> 1.0) - jekyll-assets (2.1.2) - fastimage (~> 1.8) - jekyll (~> 3.0) - sprockets (~> 3.3) - sprockets-helpers (~> 1.2) - tilt (~> 2.0) + jekyll-assets (2.2.8) + extras (~> 0.1) + fastimage (~> 2.0, >= 1.8) + jekyll (~> 3.1, >= 3.0) + pathutil (>= 0.8) + rack (> 1, < 2) + sprockets (~> 3.3, < 3.7) jekyll-sass-converter (1.4.0) sass (~> 3.4) - jekyll-watch (1.3.1) - listen (~> 3.0) + jekyll-watch (1.5.0) + listen (~> 3.0, < 3.1) json (1.8.3) - kramdown (1.10.0) + kramdown (1.12.0) liquid (3.0.6) - listen (3.0.6) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) - mercenary (0.3.5) - mini_portile2 (2.0.0) - minitest (5.8.4) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - parallel (1.6.2) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + mercenary (0.3.6) + mini_portile2 (2.1.0) + minitest (5.9.0) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + parallel (1.9.0) + pathutil (0.14.0) + forwardable-extended (~> 2.6) + pkg-config (1.1.7) rack (1.6.4) + rake (11.1.2) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) - rouge (1.10.1) + rouge (1.11.1) safe_yaml (1.0.4) - sass (3.4.21) - sprockets (3.5.2) + sass (3.4.22) + sprockets (3.6.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-helpers (1.2.1) - sprockets (>= 2.2) thread_safe (0.3.5) - tilt (2.0.2) typhoeus (0.8.0) ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - yell (2.0.5) + uglifier (3.0.2) + execjs (>= 0.3.0, < 3) + yell (2.0.6) PLATFORMS ruby DEPENDENCIES - autoprefixer-rails! + autoprefixer-rails dvl-core! - html-proofer (~> 2.3.0) + html-proofer jekyll jekyll-assets + rake uglifier BUNDLED WITH diff --git a/Rakefile b/Rakefile index 2aacdc4..a278a1e 100644 --- a/Rakefile +++ b/Rakefile @@ -1,11 +1,11 @@ -require 'html/proofer' +require 'html-proofer' task :test do sh 'bundle exec jekyll build' - HTML::Proofer.new( + HTMLProofer.check_directory( './_site', disable_external: true, - checks_to_ignore: %w(ImageCheck), - check_html: true + check_html: true, + allow_hash_href: true ).run end diff --git a/_assets/javascripts/application/main.coffee b/_assets/javascripts/application/main.coffee.liquid similarity index 87% rename from _assets/javascripts/application/main.coffee rename to _assets/javascripts/application/main.coffee.liquid index 35ba22c..08cdc21 100644 --- a/_assets/javascripts/application/main.coffee +++ b/_assets/javascripts/application/main.coffee.liquid @@ -1,10 +1,10 @@ -projectId = "rg2W2SIZvZ7nL5fr" +projectId = "{{ site.screendoor_project_id }}" fieldIds = - email: 29506 - score: 29507 - comments: 29508 - cohort: 29519 + email: {{ site.screendoor_response_field_ids.email }} + score: {{ site.screendoor_response_field_ids.score }} + comments: {{ site.screendoor_response_field_ids.comments }} + cohort: {{ site.screendoor_response_field_ids.cohort }} storePrefix = "#{getUrlParameter('cohort')}-nps-" diff --git a/_config.yml b/_config.yml index ae7aac3..2f40db5 100644 --- a/_config.yml +++ b/_config.yml @@ -19,3 +19,11 @@ assets: - _assets/fonts - _assets/javascripts - _assets/stylesheets + +screendoor_project_id: rg2W2SIZvZ7nL5fr + +screendoor_response_field_ids: + email: 29506 + score: 29507 + comments: 29508 + cohort: 29519 diff --git a/index.html b/index.html index bbfa064..46cf776 100644 --- a/index.html +++ b/index.html @@ -31,7 +31,7 @@