Skip to content

Taxonomy email alert signup pages #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
malcolmbaig merged 15 commits into from
Mar 28, 2017
Merged

Taxonomy email alert signup pages #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1f7225e
Upgrade RSpec from 3.2 to 3.5
Mar 24, 2017
1c7c665
Clean up cucumber test setup
Mar 23, 2017
674af22
Mock out email-alert-api in features with a verifying double
Mar 24, 2017
37ecea4
Use mock email-alert-api in email alert feature, also test redirects
Mar 24, 2017
7e9934e
Upgrade ruby version from 2.3.0 to 2.3.1
Mar 22, 2017
ddd8af9
Add email signup flow and associated cucumber feature
Mar 23, 2017
0a13d1f
Update frontend toolkit and add elements
Mar 23, 2017
c4eef7d
Add markup, copy tweaks and styling
Mar 23, 2017
e678a52
Add show/hide content
Mar 23, 2017
e5d9bad
Remaining frontend work to implement design from prototype
Mar 24, 2017
5a36406
Amend taxon key used when creating subscription
Mar 25, 2017
ce64de0
Add slimmer to rspec setup
Mar 25, 2017
1db8521
Make naming of signup query param more consistent
Mar 25, 2017
a9b2a45
Add some additional testing of TaxonomySignupsController
Mar 25, 2017
9d04d85
Frontend tweaks to taxonomy email signup pages
Mar 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.0
2.3.1
6 changes: 4 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ source 'https://rubygems.org'
gem 'rails', '4.2.5.2'
gem 'slimmer', '10.0.0'

gem 'govuk_frontend_toolkit', '~> 3.1.0'
gem 'govuk_elements_rails', '~> 3.0.1'
Copy link
Contributor

@NickColley NickColley Mar 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're currently not using GOV.UK Elements on any GOV.UK Publishing frontend applications.

Seems as though the kind of UI you're implementing it makes sense to make use of Elements, just Elements is technically built in a different way to the rest of GOV.UK Publishing frontend.

Maybe let's have a chat through it offline

Copy link

@carolinegreen carolinegreen Mar 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I know you don't have or hardly have anything like this on GOV.UK. Looks like you had a chat about it though, so that's good.

gem 'govuk_frontend_toolkit', '~> 5.1.2'

gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 2.7.2'
Expand All @@ -15,6 +16,7 @@ gem 'airbrake', '~> 4.1.0'
gem 'decent_exposure', '~> 2.3.2'

gem 'gds-api-adapters', '~> 40.1'
gem 'govuk_navigation_helpers', '~> 4.0'

group :development, :test do
gem 'pry-byebug'
Expand All @@ -23,7 +25,7 @@ group :development, :test do
end

group :test do
gem 'rspec-rails', '~> 3.2.1'
gem 'rspec-rails', '~> 3.2'
gem 'cucumber-rails', '~> 1.4.2', require: false
gem 'launchy'
gem 'webmock', '~> 1.20.4'
Expand Down
157 changes: 84 additions & 73 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,95 +41,106 @@ GEM
airbrake (4.1.0)
builder
multi_json
arel (6.0.3)
arel (6.0.4)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (5.0.0)
columnize (= 0.9.0)
capybara (2.4.4)
builder (3.2.3)
byebug (9.0.6)
capybara (2.13.0)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
coderay (1.1.0)
columnize (0.9.0)
concurrent-ruby (1.0.1)
crack (0.4.2)
coderay (1.1.1)
concurrent-ruby (1.0.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
cucumber (1.3.20)
cucumber (2.4.0)
builder (>= 2.1.2)
cucumber-core (~> 1.5.0)
cucumber-wire (~> 0.0.1)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
gherkin (~> 4.0)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.2)
cucumber-rails (1.4.2)
cucumber-core (1.5.0)
gherkin (~> 4.0)
cucumber-rails (1.4.5)
capybara (>= 1.1.2, < 3)
cucumber (>= 1.3.8, < 2)
mime-types (>= 1.16, < 3)
cucumber (>= 1.3.8, < 4)
mime-types (>= 1.16, < 4)
nokogiri (~> 1.5)
rails (>= 3, < 5)
railties (>= 3, < 5.1)
cucumber-wire (0.0.1)
debug_inspector (0.0.2)
decent_exposure (2.3.2)
diff-lcs (1.2.5)
decent_exposure (2.3.3)
diff-lcs (1.3)
domain_name (0.5.20170223)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
execjs (2.6.0)
execjs (2.7.0)
gds-api-adapters (40.5.0)
link_header
lrucache (~> 0.1.1)
null_logger
plek (>= 1.9.0)
rack-cache
rest-client (~> 2.0)
gherkin (2.12.2)
multi_json (~> 1.3)
globalid (0.3.6)
gherkin (4.1.1)
globalid (0.3.7)
activesupport (>= 4.1.0)
govuk-content-schema-test-helpers (1.0.2)
json-schema (~> 2.5.1)
govuk_frontend_toolkit (3.1.0)
govuk_elements_rails (3.0.1)
govuk_frontend_toolkit (>= 5.0.2)
rails (>= 4.1.0)
sass (>= 3.2.0)
govuk_frontend_toolkit (5.1.3)
rails (>= 3.1.0)
sass (>= 3.2.0)
govuk_navigation_helpers (4.0.0)
gds-api-adapters (~> 40.1)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.7.0)
json (1.8.3)
json-schema (2.5.1)
addressable (~> 2.3.7)
kgio (2.9.3)
i18n (0.8.1)
json (1.8.6)
json-schema (2.5.2)
addressable (~> 2.3.8)
kgio (2.11.0)
launchy (2.4.3)
addressable (~> 2.3)
link_header (0.0.8)
loofah (2.0.3)
nokogiri (>= 1.5.9)
lrucache (0.1.4)
PriorityQueue (~> 0.1.2)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mail (2.6.4)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (2.99.3)
mini_portile2 (2.0.0)
minitest (5.8.4)
multi_json (1.11.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.10.1)
multi_json (1.12.1)
multi_test (0.1.2)
netrc (0.11.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
null_logger (0.0.1)
plek (1.11.0)
pry (0.10.3)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.2.0)
byebug (~> 5.0)
pry-byebug (3.4.2)
byebug (~> 9.0)
pry (~> 0.10)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
Expand All @@ -151,9 +162,9 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
Expand All @@ -162,37 +173,37 @@ GEM
activesupport (= 4.2.5.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.15.0)
rake (10.5.0)
raindrops (0.18.0)
rake (12.0.0)
rest-client (2.0.1)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rspec-core (3.2.3)
rspec-support (~> 3.2.0)
rspec-expectations (3.2.1)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-mocks (3.2.1)
rspec-support (~> 3.5.0)
rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-rails (3.2.3)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-support (~> 3.2.0)
rspec-support (3.2.2)
rspec-support (~> 3.5.0)
rspec-rails (3.5.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
safe_yaml (1.0.4)
sass (3.4.16)
sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0)
sass (3.4.23)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
tilt (>= 1.1, < 3)
slimmer (10.0.0)
activesupport
json
Expand All @@ -202,28 +213,26 @@ GEM
rack
rest-client
slop (3.6.0)
sprockets (3.5.2)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.3)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.7)
timecop (0.7.4)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
uglifier (3.1.9)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
unicorn (4.9.0)
unicorn (5.2.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
webmock (1.20.4)
addressable (>= 2.3.6)
Expand All @@ -242,13 +251,15 @@ DEPENDENCIES
decent_exposure (~> 2.3.2)
gds-api-adapters (~> 40.1)
govuk-content-schema-test-helpers (~> 1.0.2)
govuk_frontend_toolkit (~> 3.1.0)
govuk_elements_rails (~> 3.0.1)
govuk_frontend_toolkit (~> 5.1.2)
govuk_navigation_helpers (~> 4.0)
launchy
plek (~> 1.11.0)
pry-byebug
quiet_assets (~> 1.1.0)
rails (= 4.2.5.2)
rspec-rails (~> 3.2.1)
rspec-rails (~> 3.2)
sass-rails (~> 5.0)
slimmer (= 10.0.0)
timecop (~> 0.7.1)
Expand Down
9 changes: 9 additions & 0 deletions app/assets/javascripts/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//= require show-hide-content.js
;(function () {
$('.js-hidden-submit').removeClass('js-hidden-submit')
$('.no-js-panel').removeClass('no-js-panel')
$('.no-js-hidden-submit').addClass('js-hidden-submit')
$('.js-hidden-submit').attr('aria-hidden', 'false')
var showHideContent = new GOVUK.ShowHideContent()
showHideContent.init()
})()
Loading