happy_seed 0.0.19 → 0.0.21

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 (190) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +4 -69
  3. data/bin/rails +12 -0
  4. data/bin/rspec +16 -0
  5. data/happy_seed.rb +5 -1
  6. data/happy_seed.txt +25 -18
  7. data/lib/generators/happy_seed/admin/admin_generator.rb +40 -5
  8. data/lib/generators/happy_seed/admin/templates/app/admin/campaigns.rb +10 -14
  9. data/lib/generators/happy_seed/admin/templates/app/admin/newsletter.rb +2 -2
  10. data/lib/generators/happy_seed/admin/templates/app/admin/user.rb +4 -1
  11. data/lib/generators/happy_seed/admin/templates/app/controllers/admin/stats_controller.rb +1 -1
  12. data/lib/generators/happy_seed/admin/templates/docs/README.07.admin.rdoc +33 -4
  13. data/lib/generators/happy_seed/angular_view/templates/docs/README.11.angular_view.rdoc +2 -4
  14. data/lib/generators/happy_seed/api/api_generator.rb +38 -39
  15. data/lib/generators/happy_seed/api/templates/app/controllers/api/v1/base_controller.rb +4 -5
  16. data/lib/generators/happy_seed/api/templates/app/controllers/api/v1/model_hash.rb +3 -20
  17. data/lib/generators/happy_seed/api/templates/app/controllers/api/v1/user_tokens_controller.rb +13 -36
  18. data/lib/generators/happy_seed/api/templates/app/controllers/api/v1/users_controller.rb +14 -40
  19. data/lib/generators/happy_seed/api/templates/config/initializers/apitome.rb +1 -1
  20. data/lib/generators/happy_seed/api/templates/docs/README.01.api.rdoc +4 -1
  21. data/lib/generators/happy_seed/api/templates/docs/api.md +2 -2
  22. data/lib/generators/happy_seed/api/templates/spec/acceptance/api/v1/user_tokens_spec.rb +10 -53
  23. data/lib/generators/happy_seed/api/templates/spec/acceptance/api/v1/users_spec.rb +17 -61
  24. data/lib/generators/happy_seed/base/base_generator.rb +47 -19
  25. data/lib/generators/happy_seed/base/templates/app/controllers/setup_controller.rb +1 -1
  26. data/lib/generators/happy_seed/base/templates/app/views/setup/index.html.haml +6 -3
  27. data/lib/generators/happy_seed/base/templates/application_controller.rb +1 -1
  28. data/lib/generators/happy_seed/base/templates/docs/README.00.base.rdoc +3 -3
  29. data/lib/generators/happy_seed/bootstrap/bootstrap_generator.rb +5 -2
  30. data/lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/application.scss +5 -1
  31. data/lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/components/_profile_panels.scss +62 -0
  32. data/lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/components/_slideup_header.scss +51 -0
  33. data/lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/shared/_grid.scss +0 -12
  34. data/lib/generators/happy_seed/bootstrap/templates/app/views/application/_javascripts.html.haml +7 -4
  35. data/lib/generators/happy_seed/bootstrap/templates/docs/README.01.bootstrap.rdoc +3 -0
  36. data/lib/generators/happy_seed/ckeditor/ckeditor_generator.rb +31 -0
  37. data/lib/generators/happy_seed/ckeditor/templates/docs/README.01.ckeditor.rdoc +35 -0
  38. data/lib/generators/happy_seed/devise/devise_generator.rb +12 -19
  39. data/lib/generators/happy_seed/devise/templates/app/views/devise/confirmations/new.html.haml +17 -0
  40. data/lib/generators/happy_seed/devise/templates/app/views/devise/mailer/confirmation_instructions.html.erb +14 -0
  41. data/lib/generators/happy_seed/devise/templates/app/views/devise/mailer/confirmation_instructions.text.rhtml +7 -0
  42. data/lib/generators/happy_seed/devise/templates/app/views/devise/mailer/password_change.html.erb +3 -0
  43. data/lib/generators/happy_seed/devise/templates/app/views/devise/mailer/reset_password_instructions.html.erb +15 -0
  44. data/lib/generators/happy_seed/devise/templates/app/views/devise/mailer/reset_password_instructions.text.erb +11 -0
  45. data/lib/generators/happy_seed/devise/templates/app/views/devise/mailer/unlock_instructions.html.erb +7 -0
  46. data/lib/generators/happy_seed/devise/templates/app/views/devise/passwords/edit.html.haml +14 -13
  47. data/lib/generators/happy_seed/devise/templates/app/views/devise/passwords/new.html.haml +12 -16
  48. data/lib/generators/happy_seed/devise/templates/app/views/devise/registrations/edit.html.haml +28 -40
  49. data/lib/generators/happy_seed/devise/templates/app/views/devise/registrations/new.html.haml +16 -24
  50. data/lib/generators/happy_seed/devise/templates/app/views/devise/sessions/new.html.haml +13 -18
  51. data/lib/generators/happy_seed/devise/templates/app/views/devise/shared/_links.html.erb +25 -0
  52. data/lib/generators/happy_seed/devise/templates/app/views/devise/unlocks/new.html.erb +16 -0
  53. data/lib/generators/happy_seed/devise/templates/docs/README.03.devise.rdoc +2 -2
  54. data/lib/generators/happy_seed/devise/templates/spec/factories/users.rb +5 -4
  55. data/lib/generators/happy_seed/devise/templates/spec/features/registration_spec.rb +149 -0
  56. data/lib/generators/happy_seed/devise/templates/spec/mailers/previews/devise_preview.rb +28 -0
  57. data/lib/generators/happy_seed/devise_confirmable/devise_confirmable_generator.rb +45 -0
  58. data/lib/generators/happy_seed/devise_confirmable/templates/add_confirmable_to_devise.rb +24 -0
  59. data/lib/generators/happy_seed/devise_confirmable/templates/app/controllers/confirmations_controller.rb +10 -0
  60. data/lib/generators/happy_seed/devise_confirmable/templates/app/views/devise/invitations/edit.html.haml +22 -0
  61. data/lib/generators/happy_seed/devise_confirmable/templates/app/views/devise/invitations/new.html.haml +20 -0
  62. data/lib/generators/happy_seed/devise_confirmable/templates/app/views/devise/mailer/invitation_instructions.html.erb +20 -0
  63. data/lib/generators/happy_seed/devise_confirmable/templates/docs/README.03.devise_confirmable.rdoc +23 -0
  64. data/lib/generators/happy_seed/devise_invitable/devise_invitable_generator.rb +3 -1
  65. data/lib/generators/happy_seed/devise_invitable/templates/app/views/devise/invitations/edit.html.haml +3 -2
  66. data/lib/generators/happy_seed/devise_invitable/templates/app/views/devise/invitations/new.html.haml +3 -2
  67. data/lib/generators/happy_seed/devise_invitable/templates/app/views/devise/mailer/invitation_instructions.html.erb +20 -0
  68. data/lib/generators/happy_seed/devise_invitable/templates/spec/features/invitations_spec.rb +61 -0
  69. data/lib/generators/happy_seed/facebook/facebook_generator.rb +2 -0
  70. data/lib/generators/happy_seed/facebook/templates/spec/features/facebook_registration_spec.rb +72 -0
  71. data/lib/generators/happy_seed/googleoauth/googleoauth_generator.rb +1 -1
  72. data/lib/generators/happy_seed/happy_seed_generator.rb +1 -3
  73. data/lib/generators/happy_seed/html_email/html_email_generator.rb +32 -0
  74. data/lib/generators/happy_seed/html_email/templates/app/views/layouts/mailer.html.erb +244 -0
  75. data/lib/generators/happy_seed/html_email/templates/docs/README.01.html_email.rdoc +25 -0
  76. data/lib/generators/happy_seed/omniauth/omniauth_generator.rb +4 -2
  77. data/lib/generators/happy_seed/omniauth/templates/app/controllers/omniauth_callbacks_controller.rb +3 -13
  78. data/lib/generators/happy_seed/omniauth/templates/app/models/identity.rb +13 -9
  79. data/lib/generators/happy_seed/omniauth/templates/docs/README.04.omniauth.rdoc +5 -5
  80. data/lib/generators/happy_seed/omniauth/templates/spec/factories/oauth.rb +6 -1
  81. data/lib/generators/happy_seed/omniauth/templates/spec/features/oauth_registration_spec.rb +80 -0
  82. data/lib/generators/happy_seed/omniauth/templates/spec/models/identity_spec.rb +39 -12
  83. data/lib/generators/happy_seed/omniauth/templates/{app/models/form_user.rb → user.rb} +4 -5
  84. data/lib/generators/happy_seed/plugin/plugin_generator.rb +13 -11
  85. data/lib/generators/happy_seed/react/react_generator.rb +36 -0
  86. data/lib/generators/happy_seed/react/templates/docs/README.10.react.rdoc +20 -0
  87. data/lib/generators/happy_seed/roles/roles_generator.rb +38 -0
  88. data/lib/generators/happy_seed/roles/templates/ability.rb +9 -0
  89. data/lib/generators/happy_seed/roles/templates/docs/README.03.roles.rdoc +23 -0
  90. data/lib/generators/happy_seed/simple_cms/simple_cms_generator.rb +41 -0
  91. data/lib/generators/happy_seed/simple_cms/templates/app/admin/simple_content.rb +42 -0
  92. data/lib/generators/happy_seed/simple_cms/templates/app/controllers/simple_content_controller.rb +7 -0
  93. data/lib/generators/happy_seed/simple_cms/templates/app/models/simple_content.rb +5 -0
  94. data/lib/generators/happy_seed/simple_cms/templates/app/views/splash/faq.html.haml +13 -0
  95. data/lib/generators/happy_seed/simple_cms/templates/app/views/splash/index.html.haml +79 -0
  96. data/lib/generators/happy_seed/simple_cms/templates/application_helper.rb +18 -0
  97. data/lib/generators/happy_seed/simple_cms/templates/create_simple_contents.rb +14 -0
  98. data/lib/generators/happy_seed/simple_cms/templates/docs/README.04.simple_cms.rdoc +32 -0
  99. data/lib/generators/happy_seed/simple_cms/templates/spec/factories/oauth.rb +10 -0
  100. data/lib/generators/happy_seed/simple_cms/templates/spec/features/oauth_registration_spec.rb +80 -0
  101. data/lib/generators/happy_seed/simple_cms/templates/spec/models/identity_spec.rb +49 -0
  102. data/lib/generators/happy_seed/splash/templates/app/assets/stylesheets/splash.css.scss +119 -84
  103. data/lib/generators/happy_seed/splash/templates/app/controllers/splash_controller.rb +1 -1
  104. data/lib/generators/happy_seed/splash/templates/app/views/layouts/splash.html.haml +15 -18
  105. data/lib/generators/happy_seed/splash/templates/app/views/splash/index.html.haml +54 -92
  106. data/lib/generators/happy_seed/splash/templates/docs/README.02.splash.rdoc +2 -2
  107. data/lib/generators/happy_seed/splash/templates/spec/controllers/splash_controller_spec.rb +11 -3
  108. data/lib/generators/happy_seed/static/templates/source/stylesheets/application.css.scss +1 -1
  109. data/lib/generators/happy_seed/static_blog/templates/Gemfile.lock +45 -49
  110. data/lib/generators/happy_seed/twitter/templates/spec/features/twitter_oauth_registration_spec.rb +57 -0
  111. data/lib/generators/happy_seed/twitter/twitter_generator.rb +2 -1
  112. data/lib/happy_seed/cli.rb +1 -1
  113. data/lib/happy_seed/engine.rb +12 -0
  114. data/lib/happy_seed/version.rb +1 -1
  115. data/lib/tasks/seed.rake +56 -0
  116. data/{test → spec}/dummy/Rakefile +0 -0
  117. data/spec/dummy/app/assets/config/manifest.js +5 -0
  118. data/{test → spec}/dummy/app/assets/javascripts/application.js +3 -3
  119. data/spec/dummy/app/assets/javascripts/cable.coffee +11 -0
  120. data/{test → spec}/dummy/app/assets/stylesheets/application.css +4 -4
  121. data/spec/dummy/app/channels/application_cable/channel.rb +5 -0
  122. data/spec/dummy/app/channels/application_cable/connection.rb +5 -0
  123. data/{test → spec}/dummy/app/controllers/application_controller.rb +0 -0
  124. data/{test → spec}/dummy/app/helpers/application_helper.rb +0 -0
  125. data/spec/dummy/app/jobs/application_job.rb +2 -0
  126. data/spec/dummy/app/mailers/application_mailer.rb +4 -0
  127. data/spec/dummy/app/models/application_record.rb +3 -0
  128. data/spec/dummy/app/views/layouts/application.html.erb +15 -0
  129. data/spec/dummy/app/views/layouts/mailer.html.erb +13 -0
  130. data/spec/dummy/app/views/layouts/mailer.text.erb +1 -0
  131. data/{test → spec}/dummy/bin/bundle +0 -0
  132. data/{test → spec}/dummy/bin/rails +1 -1
  133. data/{test → spec}/dummy/bin/rake +0 -0
  134. data/spec/dummy/bin/setup +34 -0
  135. data/spec/dummy/bin/update +29 -0
  136. data/spec/dummy/config.ru +8 -0
  137. data/spec/dummy/config/application.rb +21 -0
  138. data/{test → spec}/dummy/config/boot.rb +0 -0
  139. data/spec/dummy/config/cable.yml +10 -0
  140. data/{test → spec}/dummy/config/database.yml +0 -0
  141. data/{test → spec}/dummy/config/environment.rb +0 -0
  142. data/{test → spec}/dummy/config/environments/development.rb +28 -3
  143. data/{test → spec}/dummy/config/environments/production.rb +29 -24
  144. data/{test → spec}/dummy/config/environments/test.rb +6 -3
  145. data/spec/dummy/config/initializers/active_record_belongs_to_required_by_default.rb +6 -0
  146. data/spec/dummy/config/initializers/application_controller_renderer.rb +6 -0
  147. data/{test → spec}/dummy/config/initializers/assets.rb +3 -0
  148. data/{test → spec}/dummy/config/initializers/backtrace_silencers.rb +0 -0
  149. data/spec/dummy/config/initializers/callback_terminator.rb +6 -0
  150. data/{test → spec}/dummy/config/initializers/cookies_serializer.rb +3 -1
  151. data/{test → spec}/dummy/config/initializers/filter_parameter_logging.rb +0 -0
  152. data/{test → spec}/dummy/config/initializers/inflections.rb +0 -0
  153. data/{test → spec}/dummy/config/initializers/mime_types.rb +0 -0
  154. data/spec/dummy/config/initializers/per_form_csrf_tokens.rb +4 -0
  155. data/spec/dummy/config/initializers/request_forgery_protection.rb +4 -0
  156. data/{test → spec}/dummy/config/initializers/session_store.rb +0 -0
  157. data/{test → spec}/dummy/config/initializers/wrap_parameters.rb +2 -2
  158. data/{test → spec}/dummy/config/locales/en.yml +0 -0
  159. data/spec/dummy/config/puma.rb +47 -0
  160. data/spec/dummy/config/routes.rb +3 -0
  161. data/{test → spec}/dummy/config/secrets.yml +3 -3
  162. data/spec/dummy/db/schema.rb +16 -0
  163. data/{test → spec}/dummy/public/404.html +0 -0
  164. data/{test → spec}/dummy/public/422.html +0 -0
  165. data/{test → spec}/dummy/public/500.html +0 -0
  166. data/{test/dummy/public/favicon.ico → spec/dummy/public/apple-touch-icon-precomposed.png} +0 -0
  167. data/spec/dummy/public/apple-touch-icon.png +0 -0
  168. data/spec/dummy/public/favicon.ico +0 -0
  169. data/spec/rails_helper.rb +58 -0
  170. data/spec/spec_helper.rb +91 -0
  171. metadata +195 -89
  172. data/lib/generators/happy_seed/api/templates/app/controllers/api/v1/configurations_controller.rb +0 -11
  173. data/lib/generators/happy_seed/api/templates/spec/acceptance/api/v1/configurations_spec.rb +0 -21
  174. data/lib/generators/happy_seed/base/templates/config/puma.rb +0 -15
  175. data/lib/generators/happy_seed/base/templates/spec/support/controller_helpers.rb +0 -12
  176. data/lib/generators/happy_seed/bootstrap/templates/app/assets/stylesheets/sections/_profile_page.scss +0 -9
  177. data/lib/generators/happy_seed/bootstrap/templates/lib/templates/haml/scaffold/_form.html.haml +0 -5
  178. data/lib/generators/happy_seed/devise/templates/spec/features/forgot_password_spec.rb +0 -54
  179. data/lib/generators/happy_seed/devise/templates/test/mailers/previews/devise_preview.rb +0 -13
  180. data/lib/generators/happy_seed/omniauth/templates/spec/features/registration_spec.rb +0 -81
  181. data/lib/generators/happy_seed/static/templates/Gemfile.lock +0 -158
  182. data/lib/tasks/seed_tasks.rake +0 -4
  183. data/test/dummy/README.rdoc +0 -28
  184. data/test/dummy/app/views/layouts/application.html.erb +0 -14
  185. data/test/dummy/config.ru +0 -4
  186. data/test/dummy/config/application.rb +0 -23
  187. data/test/dummy/config/initializers/jazz_hands.rb +0 -5
  188. data/test/dummy/config/routes.rb +0 -56
  189. data/test/seed_test.rb +0 -7
  190. data/test/test_helper.rb +0 -15
@@ -1,5 +1,5 @@
1
1
  class SplashController < ApplicationController
2
- skip_before_filter :authenticate
2
+ skip_before_action :authenticate
3
3
 
4
4
  def index
5
5
  end
@@ -17,24 +17,19 @@
17
17
 
18
18
  = csrf_meta_tag
19
19
 
20
- %body{ "data-spy" => "scroll", "data-target" => "#about"}
20
+ %body.splash#top{ data: { spy: "scroll", target: "#navbar"} }
21
21
  = render 'chromeframe'
22
22
  = render 'flashes'
23
23
 
24
- %header#top.navbar-default.navbar-fixed-top{:role=>:banner}
25
- .navbar-header
26
- %button.navbar-toggle{:type=>:button, 'data-toggle'=>:collapse, 'data-target'=>'.navbar-collapse'}
27
- %span.sr-only Toggle navigations
28
- %span.icon-bar
29
- %span.icon-bar
30
- %span.icon-bar
31
- = link_to '#', :class=>'logo' do
32
- =image_tag 'https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/sw_logo.png', alt: "spork wrangler", class: "img-responsive logo"
33
- %nav.pull-right.collapse.navbar-collapse{:role=>:navigation}
34
- %ul.nav.navbar-nav
35
- %li= link_to 'about', '#about'
36
- %li= link_to 'team', '#team'
37
- %li= link_to 'contact', '#contact'
24
+ %header.slideup.affix-top{ data: { spy: "affix", "offset-top": 10 } }
25
+ = navbar id: "navbar", fluid: true, position: :top, padding: 0 do
26
+ = vertical do
27
+ = link_to "Home", "#top"
28
+ = horizontal do
29
+ = nav class: 'navbar-right' do
30
+ = link_to "About", "#about"
31
+ = link_to "Features", "#features"
32
+ = link_to "Contact", "#contact"
38
33
 
39
34
  = yield
40
35
 
@@ -45,16 +40,18 @@
45
40
  :javascript
46
41
  $(function() {
47
42
  window.scrollReveal = new scrollReveal();
48
- $("#top ul li a[href^='#']").on('click', function(e) {
43
+ $("#top a[href^='#']").on('click', function(e) {
49
44
  e.preventDefault();
50
45
 
51
46
  // store hash
52
47
  var hash = this.hash;
53
48
 
49
+ var nav_height = $("nav").height();
50
+
54
51
  // animate
55
52
  $('html, body').animate({
56
- scrollTop: $(this.hash).offset().top - 95 // 75 is navbar height
57
- }, 300, function(){
53
+ scrollTop: $(this.hash).offset().top - nav_height
54
+ }, 500, function(){
58
55
  // when done, add hash to url
59
56
  // (default click behaviour)
60
57
  window.location.hash = hash;
@@ -1,105 +1,67 @@
1
- %section.masthead.jumbotron
1
+ %section.lightimage
2
2
  .container
3
- .row.text-center.bottom-border
4
- %h1 SPORK WRANGLER
5
- %h4 Magic phone technology for texting witches and warlocks.
6
- .col-sm-6.col-sm-offset-3
7
- =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/phones.png", class: "hero img-responsive"
3
+ .row
4
+ .inner-column
5
+ %h1 Big Fat Title
8
6
 
9
- %section#about
10
- .container
11
- .row.text-center
12
- .col-sm-offset-1.col-sm-10
13
- .row
14
- %h2 GLUTEN FREE
15
- .col-sm-4.text-left
16
- =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic1.jpg", class: "img-responsive"
17
- %h4 SPROUTS
18
- %p It was a humorously perilous business for both of us. For, before we proceed further, it must be said that the monkey-rope was fast at both ends; fast to Queequeg's broad canvas belt, and fast to my narrow leather one. So that for better or for worse, we two, for the time, were wedded; and should poor Queequeg sink to rise no more.
19
- .col-sm-4.text-left
20
- =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic2.jpg", class: "img-responsive"
21
- %h4 COUNTER CULTURE
22
- %p It was a humorously perilous business for both of us. For, before we proceed further, it must be said that the monkey-rope was fast at both ends; fast to Queequeg's broad canvas belt, and fast to my narrow leather one.
23
- .col-sm-4.text-left
24
- =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic3.jpg", class: "img-responsive"
25
- %h4 BIKE SANDWICH
26
- %p It was a humorously perilous business for both of us. For, before we proceed further, it must be said that the monkey-rope was fast at both ends; fast to Queequeg's broad canvas belt, and fast to my narrow leather one. So that for better or for worse, we two, for the time, were wedded; and should poor Queequeg sink to rise no more. Don't ya think? Kinda crazy if you ask me. But that's none of my business.
7
+ %p.info Great descriptive content
27
8
 
28
- %section.divider
29
- .container
30
- .row.text-center
31
- .col-sm-offset-3.col-sm-6
32
- %hr
33
-
34
- %section
9
+ = link_to "Call to Action", root_url, class: "btn btn-primary btn-lg"
10
+
11
+ %section.colored.primary#about
35
12
  .container
36
- .row.text-center
37
- .col-sm-offset-1.col-sm-10
38
- .row
39
- %h2 HOW IT WORKS
40
- .col-sm-offset-1.col-sm-10.clearfix
41
- #carousel-example-generic.carousel.slide{ data: { ride: "carousel"} }
42
- %ol.carousel-indicators
43
- %li.active{ data: {target: "#carousel-example-generic", "slide-to" => "0" }}
44
- %li{ data: {target: "#carousel-example-generic", "slide-to" => "1" }}
45
- %li{ data: {target: "#carousel-example-generic", "slide-to" => "2" }}
13
+ .row
14
+ .inner-column
15
+ %h2 Question I'm about to answer?
46
16
 
47
- .carousel-inner{ role: "listbox" }
48
- .item.active
49
- =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/venn.png"
50
- .item
51
- =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/venn.png"
52
- .item
53
- =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/venn.png"
17
+ %p Why yes, this is the answer. And it goes on for a bit. And it goes on for a bit. And it goes on for a bit. And it goes on for a bit. And it goes on for a bit. And it goes on for a bit. And it goes on for a bit. And it goes on for a bit. And it goes on for a bit. And it goes on for a bit. And it goes on for a bit. And it goes on for a bit. And it goes on for a bit. And it goes on for a bit.
54
18
 
55
- %section.divider
56
- .container
57
- .row.text-center
58
- .col-sm-offset-3.col-sm-6
59
- %hr
19
+ = link_to "Another call to action", root_url, class: "btn btn-primary-inverted btn-lg"
60
20
 
61
- %section#team
21
+ %section.features#features
62
22
  .container
63
- .row.text-center
64
- .col-sm-offset-1.col-sm-10
65
- .row
66
- %h2 THE TEAM
67
- .col-sm-offset-1.col-sm-10
68
- .row
69
- .col-md-6.text-left.clearfix
70
- =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/avatar1.png", class: "avatar pull-left"
71
- %h4 Captain Wiggles
72
- %p Entrepreneur, self described genius, too many resources not enough ideas.
73
- .col-md-6.text-left.clearfix
74
- =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/avatar2.png", class: "avatar pull-left"
75
- %h4 Panda Eyepatch
76
- %p Marketing. What’s it gonna take to get you into spork wrangler today? I mean today.
77
- .col-md-6.text-left.clearfix
78
- =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/avatar3.png", class: "avatar pull-left"
79
- %h4 Apple Shirt
80
- %p Partnerships and product manufacturing. Engineering degree based on forks.
81
- .col-md-6.text-left
82
- =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/avatar4.png", class: "avatar pull-left"
83
- %h4 Pixel Face
84
- %p Developer, shut in, grumpy but lovable. Technical backbone and anime lover.
23
+ .row
24
+ .inner-block
25
+ = image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic1.jpg", class: "img-responsive"
26
+ %h4 SPROUTS
27
+ %p It was a humorously perilous business for both of us. For, before we proceed further, it must be said that the monkey-rope was fast at both ends; fast to Queequeg's broad canvas belt, and fast to my narrow leather one.
85
28
 
86
- %section.divider
87
- .container
88
- .row.text-center
89
- .col-sm-offset-3.col-sm-6
90
- %hr
29
+ .inner-block
30
+ = image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic2.jpg", class: "img-responsive"
31
+ %h4 COUNTER CULTURE
32
+ %p It was a humorously perilous business for both of us. For, before we proceed further, it must be said that the monkey-rope was fast at both ends; fast to Queequeg's broad canvas belt, and fast to my narrow leather one.
33
+
34
+ .inner-block
35
+ = image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic3.jpg", class: "img-responsive"
36
+ %h4 BIKE SANDWICH
37
+ %p It was a humorously perilous business for both of us. For, before we proceed further, it must be said that the monkey-rope was fast at both ends; fast to Queequeg's broad canvas belt, and fast to my narrow leather one.
38
+
39
+ .inner-block
40
+ = image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic2.jpg", class: "img-responsive"
41
+ %h4 COUNTER CULTURE
42
+ %p It was a humorously perilous business for both of us. For, before we proceed further, it must be said that the monkey-rope was fast at both ends; fast to Queequeg's broad canvas belt, and fast to my narrow leather one.
43
+
44
+ %section.images
45
+ .quarter-block
46
+ = image_tag "https://scontent-lga3-1.cdninstagram.com/t51.2885-15/e35/12237401_1672681199644836_991083135_n.jpg"
47
+
48
+ .quarter-block
49
+ = image_tag "https://scontent-lga3-1.cdninstagram.com/t51.2885-15/e35/12716797_1679687052302598_977732638_n.jpg"
50
+ .quarter-block
51
+ = image_tag "https://scontent-lga3-1.cdninstagram.com/t51.2885-15/e35/12107643_1510048632656460_2102141939_n.jpg"
52
+ .quarter-block
53
+ = image_tag "https://scontent-lga3-1.cdninstagram.com/t51.2885-15/e35/12237446_1702630963356665_284108057_n.jpg"
91
54
 
92
55
 
93
- %section#contact
56
+ %section.contact#contact
94
57
  .container
95
58
  .row
96
- .col-sm-8.col-sm-offset-2
97
- .row.text-center
98
- .col-sm-10.col-sm-offset-1
99
- %h1 Stay connected for announcements and releases.
100
- = form_tag splash_signup_path, role: :form, :class=>'form-inline', :remote=>true do
101
- .form-group#signup
102
- = text_field_tag :signup_email, '', :class=>'form-control', :placeholder=>'E-mail'
103
- %span.btn
104
- = submit_tag 'Sign up', :class=>'btn btn-primary'
105
- %small#signup-message
59
+ .inner-column
60
+ %h1 Stay connected for announcements and releases.
61
+ = form_tag splash_signup_path, role: :form, remote: true do
62
+ .form-group
63
+ .input-group
64
+ = text_field_tag :signup_email, "", class: "form-control", placeholder: 'E-Mail', type: "email"
65
+ %span.input-group-btn
66
+ = submit_tag 'Sign up', class: 'btn btn-primary'
67
+ %small#signup-message
@@ -38,5 +38,5 @@ Style the page by editing assets/stylesheets/slash.css.scss, views/splash/index.
38
38
  1. Signup for mailchimp: https://login.mailchimp.com/signup
39
39
  2. Activate your account
40
40
  3. Create a mailing list: List -> Create List
41
- 4. Get list ID (Settings -> List name and defaults) for MAILCHIMP_SPLASH_SIGNUP_LIST_ID
42
- 5. Get MAILCHIMP_API_KEY (Your name -> Account -> Extras -> API Keys)
41
+ 4. Get list ID (Settings -> List name and defaults) for `MAILCHIMP_SPLASH_SIGNUP_LIST_ID`
42
+ 5. Get `MAILCHIMP_API_KEY` (Your name -> Account -> Extras -> API Keys)
@@ -1,6 +1,14 @@
1
1
  require 'rails_helper'
2
2
 
3
3
  RSpec.describe SplashController, :type => :controller do
4
+ before :each do
5
+ begin
6
+ Devise
7
+ sign_out :user
8
+ rescue NameError
9
+ end
10
+ end
11
+
4
12
  after do
5
13
  ENV['HTTP_AUTH_USERNAME'] = nil
6
14
  ENV['HTTP_AUTH_PASSWORD'] = nil
@@ -28,7 +36,7 @@ RSpec.describe SplashController, :type => :controller do
28
36
  ENV['GOOGLE_ANALYTICS_SITE_ID'] = '123456'
29
37
 
30
38
  get :index
31
- expect( response.body ).to include( "['_setAccount','123456']" )
39
+ expect( response.body ).to include( "ga('create', '123456'" );
32
40
 
33
41
  ENV['GOOGLE_ANALYTICS_SITE_ID'] = nil
34
42
  end
@@ -39,7 +47,7 @@ RSpec.describe SplashController, :type => :controller do
39
47
  ENV["MAILCHIMP_SPLASH_SIGNUP_LIST_ID"] = nil
40
48
  ENV["MAILCHIMP_API_KEY"] = nil
41
49
 
42
- xhr :post, :signup
50
+ post :signup, xhr: true
43
51
 
44
52
  expect( assigns( :message) ).to include( "environment variables need to be set" )
45
53
  end
@@ -54,7 +62,7 @@ RSpec.describe SplashController, :type => :controller do
54
62
  to_return(:status => 200, :body => "", :headers => {})
55
63
 
56
64
 
57
- xhr :post, :signup, { :email => "wschenk@gmail.com" }
65
+ post :signup, xhr: true, params: { email: "wschenk@gmail.com" }
58
66
 
59
67
  expect( assigns( :message) ).not_to include( "environment variables need to be set" )
60
68
 
@@ -1,6 +1,6 @@
1
1
  @import "bootstrap";
2
2
 
3
- $sticky_footer_height: 60px;
3
+ $sticky_footer_height: 3em;;
4
4
 
5
5
  body {
6
6
  padding-top: $navbar-height + 20;
@@ -1,37 +1,33 @@
1
1
  GEM
2
2
  remote: https://rubygems.org/
3
3
  specs:
4
- activesupport (4.1.10)
4
+ activesupport (4.1.8)
5
5
  i18n (~> 0.6, >= 0.6.9)
6
6
  json (~> 1.7, >= 1.7.7)
7
7
  minitest (~> 5.1)
8
8
  thread_safe (~> 0.1)
9
9
  tzinfo (~> 1.1)
10
- addressable (2.3.8)
11
- autoprefixer-rails (5.2.0)
12
- execjs
13
- json
14
- bootstrap-navbar (2.2.4)
10
+ addressable (2.3.6)
11
+ bootstrap-navbar (2.2.2)
15
12
  gem_config (~> 0.3)
16
- bootstrap-sass (3.3.4.1)
17
- autoprefixer-rails (>= 5.0.0.1)
18
- sass (>= 3.2.19)
13
+ bootstrap-sass (3.3.1.0)
14
+ sass (~> 3.2)
19
15
  builder (3.2.2)
20
16
  celluloid (0.16.0)
21
17
  timers (~> 4.0.0)
22
- chunky_png (1.3.4)
23
- coffee-script (2.4.1)
18
+ chunky_png (1.3.3)
19
+ coffee-script (2.3.0)
24
20
  coffee-script-source
25
21
  execjs
26
- coffee-script-source (1.9.1.1)
27
- compass (1.0.3)
22
+ coffee-script-source (1.8.0)
23
+ compass (1.0.1)
28
24
  chunky_png (~> 1.2)
29
- compass-core (~> 1.0.2)
25
+ compass-core (~> 1.0.1)
30
26
  compass-import-once (~> 1.0.5)
31
27
  rb-fsevent (>= 0.9.3)
32
28
  rb-inotify (>= 0.9)
33
29
  sass (>= 3.3.13, < 3.5)
34
- compass-core (1.0.3)
30
+ compass-core (1.0.1)
35
31
  multi_json (~> 1.0)
36
32
  sass (>= 3.3.0, < 3.5)
37
33
  compass-import-once (1.0.5)
@@ -40,38 +36,38 @@ GEM
40
36
  eventmachine (>= 0.12.9)
41
37
  http_parser.rb (~> 0.6.0)
42
38
  erubis (2.7.0)
43
- eventmachine (1.0.7)
44
- execjs (2.5.2)
45
- ffi (1.9.8)
39
+ eventmachine (1.0.3)
40
+ execjs (2.2.2)
41
+ ffi (1.9.6)
46
42
  gem_config (0.3.1)
47
- haml (4.0.6)
43
+ haml (4.0.5)
48
44
  tilt
49
45
  hike (1.2.3)
50
46
  hitimes (1.2.2)
51
47
  hooks (0.4.0)
52
48
  uber (~> 0.0.4)
53
49
  http_parser.rb (0.6.0)
54
- i18n (0.7.0)
50
+ i18n (0.6.11)
55
51
  jquery-middleman (3.0.4)
56
52
  thor (>= 0.14, < 2.0)
57
- json (1.8.2)
58
- kramdown (1.7.0)
59
- listen (2.10.0)
60
- celluloid (~> 0.16.0)
53
+ json (1.8.1)
54
+ kramdown (1.5.0)
55
+ listen (2.8.2)
56
+ celluloid (>= 0.15.2)
61
57
  rb-fsevent (>= 0.9.3)
62
58
  rb-inotify (>= 0.9)
63
- middleman (3.3.12)
59
+ middleman (3.3.7)
64
60
  coffee-script (~> 2.2)
65
61
  compass (>= 1.0.0, < 2.0.0)
66
62
  compass-import-once (= 1.0.5)
67
63
  execjs (~> 2.0)
68
64
  haml (>= 4.0.5)
69
65
  kramdown (~> 1.2)
70
- middleman-core (= 3.3.12)
66
+ middleman-core (= 3.3.7)
71
67
  middleman-sprockets (>= 3.1.2)
72
68
  sass (>= 3.4.0, < 4.0)
73
69
  uglifier (~> 2.5)
74
- middleman-autometatags (0.0.2)
70
+ middleman-autometatags (0.0.1)
75
71
  middleman-core (>= 3.0.0)
76
72
  middleman-blog (3.5.3)
77
73
  addressable (~> 2.3.5)
@@ -83,12 +79,12 @@ GEM
83
79
  middleman-bootstrap-navbar (2.0.0)
84
80
  bootstrap-navbar (~> 2.0)
85
81
  middleman-core (>= 3.0)
86
- middleman-core (3.3.12)
82
+ middleman-core (3.3.7)
87
83
  activesupport (~> 4.1.0)
88
84
  bundler (~> 1.1)
89
85
  erubis
90
86
  hooks (~> 0.3)
91
- i18n (~> 0.7.0)
87
+ i18n (~> 0.6.9)
92
88
  listen (>= 2.7.9, < 3.0)
93
89
  padrino-helpers (~> 0.12.3)
94
90
  rack (>= 1.4.5, < 2.0)
@@ -104,32 +100,32 @@ GEM
104
100
  middleman-core (>= 3.0.2)
105
101
  multi_json (~> 1.0)
106
102
  rack-livereload
107
- middleman-sprockets (3.4.2)
108
- middleman-core (>= 3.3)
103
+ middleman-sprockets (3.3.10)
104
+ middleman-core (~> 3.3)
109
105
  sprockets (~> 2.12.1)
110
106
  sprockets-helpers (~> 1.1.0)
111
- sprockets-sass (~> 1.3.0)
112
- minitest (5.7.0)
113
- multi_json (1.11.0)
107
+ sprockets-sass (~> 1.2.0)
108
+ minitest (5.4.3)
109
+ multi_json (1.10.1)
114
110
  net-sftp (2.1.2)
115
111
  net-ssh (>= 2.6.5)
116
- net-ssh (2.9.2)
117
- padrino-helpers (0.12.5)
112
+ net-ssh (2.9.1)
113
+ padrino-helpers (0.12.4)
118
114
  i18n (~> 0.6, >= 0.6.7)
119
- padrino-support (= 0.12.5)
115
+ padrino-support (= 0.12.4)
120
116
  tilt (~> 1.4.1)
121
- padrino-support (0.12.5)
117
+ padrino-support (0.12.4)
122
118
  activesupport (>= 3.1)
123
- ptools (1.3.2)
124
- rack (1.6.1)
119
+ ptools (1.2.6)
120
+ rack (1.5.2)
125
121
  rack-livereload (0.3.15)
126
122
  rack
127
- rack-test (0.6.3)
123
+ rack-test (0.6.2)
128
124
  rack (>= 1.0)
129
- rb-fsevent (0.9.5)
125
+ rb-fsevent (0.9.4)
130
126
  rb-inotify (0.9.5)
131
127
  ffi (>= 0.5.0)
132
- sass (3.4.14)
128
+ sass (3.4.9)
133
129
  sprockets (2.12.3)
134
130
  hike (~> 1.2)
135
131
  multi_json (~> 1.0)
@@ -137,18 +133,18 @@ GEM
137
133
  tilt (~> 1.1, != 1.3.0)
138
134
  sprockets-helpers (1.1.0)
139
135
  sprockets (~> 2.0)
140
- sprockets-sass (1.3.1)
136
+ sprockets-sass (1.2.0)
141
137
  sprockets (~> 2.0)
142
138
  tilt (~> 1.1)
143
139
  thor (0.19.1)
144
- thread_safe (0.3.5)
140
+ thread_safe (0.3.4)
145
141
  tilt (1.4.1)
146
142
  timers (4.0.1)
147
143
  hitimes
148
144
  tzinfo (1.2.2)
149
145
  thread_safe (~> 0.1)
150
- uber (0.0.13)
151
- uglifier (2.7.1)
146
+ uber (0.0.11)
147
+ uglifier (2.5.3)
152
148
  execjs (>= 0.3.0)
153
149
  json (>= 1.8.0)
154
150
 
@@ -159,9 +155,9 @@ DEPENDENCIES
159
155
  bootstrap-sass
160
156
  builder (~> 3.0)
161
157
  jquery-middleman
162
- middleman (~> 3.3)
158
+ middleman (~> 3.3.7)
163
159
  middleman-autometatags
164
- middleman-blog (~> 3.5)
160
+ middleman-blog (~> 3.5.3)
165
161
  middleman-blog-drafts
166
162
  middleman-bootstrap-navbar
167
163
  middleman-deploy