happy_seed 0.0.19 → 0.0.21

data/lib/generators/happy_seed/splash/templates/app/controllers/splash_controller.rb

@@ -1,5 +1,5 @@
 class SplashController < ApplicationController
-  skip_before_filter :authenticate
+  skip_before_action :authenticate
 
   def index
   end

data/lib/generators/happy_seed/splash/templates/app/views/layouts/splash.html.haml

@@ -17,24 +17,19 @@
 
     = csrf_meta_tag
 
-  %body{ "data-spy" => "scroll", "data-target" => "#about"}
+  %body.splash#top{ data: { spy: "scroll", target: "#navbar"} }
     = render 'chromeframe'
     = render 'flashes'
 
-    %header#top.navbar-default.navbar-fixed-top{:role=>:banner}
-      .navbar-header
-        %button.navbar-toggle{:type=>:button, 'data-toggle'=>:collapse, 'data-target'=>'.navbar-collapse'}
-          %span.sr-only Toggle navigations
-          %span.icon-bar
-          %span.icon-bar
-          %span.icon-bar
-        = link_to '#', :class=>'logo' do
-          =image_tag 'https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/sw_logo.png', alt: "spork wrangler", class: "img-responsive logo"
-      %nav.pull-right.collapse.navbar-collapse{:role=>:navigation}
-        %ul.nav.navbar-nav
-          %li= link_to 'about', '#about'
-          %li= link_to 'team', '#team'
-          %li= link_to 'contact', '#contact'
+    %header.slideup.affix-top{ data: { spy: "affix", "offset-top": 10 } }
+      = navbar id: "navbar", fluid: true, position: :top, padding: 0 do
+        = vertical do
+          = link_to "Home", "#top"
+        = horizontal do
+          = nav class: 'navbar-right' do
+            = link_to "About", "#about"
+            = link_to "Features", "#features"
+            = link_to "Contact", "#contact"
 
     = yield
 
@@ -45,16 +40,18 @@
     :javascript
         $(function() { 
           window.scrollReveal = new scrollReveal();
-          $("#top ul li a[href^='#']").on('click', function(e) {
+          $("#top a[href^='#']").on('click', function(e) {
             e.preventDefault();
 
             // store hash
             var hash = this.hash;
 
+            var nav_height = $("nav").height();
+
             // animate
             $('html, body').animate({
-              scrollTop: $(this.hash).offset().top - 95  // 75 is navbar height
-            }, 300, function(){
+              scrollTop: $(this.hash).offset().top - nav_height
+            }, 500, function(){
               // when done, add hash to url
               // (default click behaviour)
               window.location.hash = hash;

data/lib/generators/happy_seed/splash/templates/app/views/splash/index.html.haml

@@ -1,105 +1,67 @@
-%section.masthead.jumbotron
+%section.lightimage
   .container
-    .row.text-center.bottom-border
-      %h1 SPORK WRANGLER
-      %h4 Magic phone technology for texting witches and warlocks.
-      .col-sm-6.col-sm-offset-3
-        =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/phones.png", class: "hero img-responsive"
+    .row
+      .inner-column
+        %h1 Big Fat Title
 
-%section#about
-  .container
-    .row.text-center
-      .col-sm-offset-1.col-sm-10
-        .row
-          %h2 GLUTEN FREE
-          .col-sm-4.text-left
-            =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic1.jpg", class: "img-responsive"
-            %h4 SPROUTS
-            %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.
-          .col-sm-4.text-left
-            =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic2.jpg", class: "img-responsive"
-            %h4 COUNTER CULTURE
-            %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.
-          .col-sm-4.text-left
-            =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic3.jpg", class: "img-responsive"
-            %h4 BIKE SANDWICH
-            %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.
+        %p.info Great descriptive content
 
-%section.divider
-  .container
-    .row.text-center
-      .col-sm-offset-3.col-sm-6
-        %hr
- 
-%section
+        = link_to "Call to Action", root_url, class: "btn btn-primary btn-lg"
+
+%section.colored.primary#about
   .container
-    .row.text-center
-      .col-sm-offset-1.col-sm-10
-        .row
-          %h2 HOW IT WORKS
-          .col-sm-offset-1.col-sm-10.clearfix
-            #carousel-example-generic.carousel.slide{ data: { ride: "carousel"} }
-              %ol.carousel-indicators
-                %li.active{ data: {target: "#carousel-example-generic", "slide-to" => "0" }}
-                %li{ data: {target: "#carousel-example-generic", "slide-to" => "1" }}
-                %li{ data: {target: "#carousel-example-generic", "slide-to" => "2" }}
+    .row
+      .inner-column
+        %h2 Question I'm about to answer?
 
-              .carousel-inner{ role: "listbox" }
-                .item.active
-                  =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/venn.png"
-                .item
-                  =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/venn.png"
-                .item
-                  =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/venn.png"
+        %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.
 
-%section.divider
-  .container
-    .row.text-center
-      .col-sm-offset-3.col-sm-6
-        %hr
+        = link_to "Another call to action", root_url, class: "btn btn-primary-inverted btn-lg"
 
-%section#team
+%section.features#features
   .container
-    .row.text-center
-      .col-sm-offset-1.col-sm-10
-        .row
-          %h2 THE TEAM
-          .col-sm-offset-1.col-sm-10
-            .row
-              .col-md-6.text-left.clearfix
-                =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/avatar1.png", class: "avatar pull-left"
-                %h4 Captain Wiggles
-                %p Entrepreneur, self described genius, too many resources not enough ideas.
-              .col-md-6.text-left.clearfix
-                =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/avatar2.png", class: "avatar pull-left"
-                %h4 Panda Eyepatch
-                %p Marketing. What’s it gonna take to get you into spork wrangler today? I mean today.
-              .col-md-6.text-left.clearfix
-                =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/avatar3.png", class: "avatar pull-left"
-                %h4 Apple Shirt
-                %p Partnerships and product manufacturing. Engineering degree based on forks.
-              .col-md-6.text-left
-                =image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/avatar4.png", class: "avatar pull-left"
-                %h4 Pixel Face
-                %p Developer, shut in, grumpy but lovable. Technical backbone and anime lover.
+    .row
+      .inner-block
+        = image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic1.jpg", class: "img-responsive"
+        %h4 SPROUTS
+        %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.
 
-%section.divider
-  .container
-    .row.text-center
-      .col-sm-offset-3.col-sm-6
-        %hr
+      .inner-block
+        = image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic2.jpg", class: "img-responsive"
+        %h4 COUNTER CULTURE
+        %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.
+
+      .inner-block
+        = image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic3.jpg", class: "img-responsive"
+        %h4 BIKE SANDWICH
+        %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. 
+
+      .inner-block
+        = image_tag "https://s3.amazonaws.com/assets.happyfuncorp.com/splash-assets/pic2.jpg", class: "img-responsive"
+        %h4 COUNTER CULTURE
+        %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.
+
+%section.images
+  .quarter-block
+    = image_tag "https://scontent-lga3-1.cdninstagram.com/t51.2885-15/e35/12237401_1672681199644836_991083135_n.jpg"
+
+  .quarter-block
+    = image_tag "https://scontent-lga3-1.cdninstagram.com/t51.2885-15/e35/12716797_1679687052302598_977732638_n.jpg"
+  .quarter-block
+    = image_tag "https://scontent-lga3-1.cdninstagram.com/t51.2885-15/e35/12107643_1510048632656460_2102141939_n.jpg"
+  .quarter-block
+    = image_tag "https://scontent-lga3-1.cdninstagram.com/t51.2885-15/e35/12237446_1702630963356665_284108057_n.jpg"
 
             
-%section#contact
+%section.contact#contact
   .container
     .row
-      .col-sm-8.col-sm-offset-2
-        .row.text-center
-          .col-sm-10.col-sm-offset-1
-            %h1 Stay connected for announcements and releases.
-            = form_tag splash_signup_path, role: :form, :class=>'form-inline', :remote=>true do
-              .form-group#signup
-                = text_field_tag :signup_email, '',  :class=>'form-control', :placeholder=>'E-mail'
-                %span.btn
-                  = submit_tag 'Sign up', :class=>'btn btn-primary'
-                %small#signup-message
+      .inner-column
+        %h1 Stay connected for announcements and releases.
+        = form_tag splash_signup_path, role: :form, remote: true do
+          .form-group
+            .input-group
+              = text_field_tag :signup_email, "", class: "form-control", placeholder: 'E-Mail', type: "email"
+              %span.input-group-btn
+                = submit_tag 'Sign up', class: 'btn btn-primary'
+          %small#signup-message

data/lib/generators/happy_seed/splash/templates/docs/README.02.splash.rdoc

@@ -38,5 +38,5 @@ Style the page by editing assets/stylesheets/slash.css.scss, views/splash/index.
 1. Signup for mailchimp: https://login.mailchimp.com/signup
 2. Activate your account
 3. Create a mailing list: List -> Create List
-4. Get list ID (Settings -> List name and defaults) for MAILCHIMP_SPLASH_SIGNUP_LIST_ID
-5. Get MAILCHIMP_API_KEY (Your name -> Account -> Extras -> API Keys)
+4. Get list ID (Settings -> List name and defaults) for `MAILCHIMP_SPLASH_SIGNUP_LIST_ID`
+5. Get `MAILCHIMP_API_KEY` (Your name -> Account -> Extras -> API Keys)

data/lib/generators/happy_seed/splash/templates/spec/controllers/splash_controller_spec.rb

@@ -1,6 +1,14 @@
 require 'rails_helper'
 
 RSpec.describe SplashController, :type => :controller do
+  before :each do
+    begin
+      Devise
+      sign_out :user
+    rescue NameError
+    end
+  end
+
   after do
     ENV['HTTP_AUTH_USERNAME'] = nil
     ENV['HTTP_AUTH_PASSWORD'] = nil
@@ -28,7 +36,7 @@ RSpec.describe SplashController, :type => :controller do
       ENV['GOOGLE_ANALYTICS_SITE_ID'] = '123456'
 
       get :index
-      expect( response.body ).to include( "['_setAccount','123456']" )
+      expect( response.body ).to include( "ga('create', '123456'" );
 
       ENV['GOOGLE_ANALYTICS_SITE_ID'] = nil
     end
@@ -39,7 +47,7 @@ RSpec.describe SplashController, :type => :controller do
       ENV["MAILCHIMP_SPLASH_SIGNUP_LIST_ID"] = nil
       ENV["MAILCHIMP_API_KEY"] = nil
 
-      xhr :post, :signup
+      post :signup, xhr: true
 
       expect( assigns( :message) ).to include( "environment variables need to be set" )
     end
@@ -54,7 +62,7 @@ RSpec.describe SplashController, :type => :controller do
         to_return(:status => 200, :body => "", :headers => {})
 
       
-      xhr :post, :signup, { :email => "wschenk@gmail.com" }
+      post :signup, xhr: true, params: { email: "wschenk@gmail.com" }
 
       expect( assigns( :message) ).not_to include( "environment variables need to be set" )
 

data/lib/generators/happy_seed/static/templates/source/stylesheets/application.css.scss

@@ -1,6 +1,6 @@
 @import "bootstrap";
 
-$sticky_footer_height: 60px;
+$sticky_footer_height: 3em;;
 
 body {
   padding-top: $navbar-height + 20;

data/lib/generators/happy_seed/static_blog/templates/Gemfile.lock

@@ -1,37 +1,33 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.10)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
-    autoprefixer-rails (5.2.0)
-      execjs
-      json
-    bootstrap-navbar (2.2.4)
+    addressable (2.3.6)
+    bootstrap-navbar (2.2.2)
       gem_config (~> 0.3)
-    bootstrap-sass (3.3.4.1)
-      autoprefixer-rails (>= 5.0.0.1)
-      sass (>= 3.2.19)
+    bootstrap-sass (3.3.1.0)
+      sass (~> 3.2)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    chunky_png (1.3.4)
-    coffee-script (2.4.1)
+    chunky_png (1.3.3)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
-    compass (1.0.3)
+    coffee-script-source (1.8.0)
+    compass (1.0.1)
       chunky_png (~> 1.2)
-      compass-core (~> 1.0.2)
+      compass-core (~> 1.0.1)
       compass-import-once (~> 1.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       sass (>= 3.3.13, < 3.5)
-    compass-core (1.0.3)
+    compass-core (1.0.1)
       multi_json (~> 1.0)
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
@@ -40,38 +36,38 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (1.0.7)
-    execjs (2.5.2)
-    ffi (1.9.8)
+    eventmachine (1.0.3)
+    execjs (2.2.2)
+    ffi (1.9.6)
     gem_config (0.3.1)
-    haml (4.0.6)
+    haml (4.0.5)
       tilt
     hike (1.2.3)
     hitimes (1.2.2)
     hooks (0.4.0)
       uber (~> 0.0.4)
     http_parser.rb (0.6.0)
-    i18n (0.7.0)
+    i18n (0.6.11)
     jquery-middleman (3.0.4)
       thor (>= 0.14, < 2.0)
-    json (1.8.2)
-    kramdown (1.7.0)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
+    json (1.8.1)
+    kramdown (1.5.0)
+    listen (2.8.2)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    middleman (3.3.12)
+    middleman (3.3.7)
       coffee-script (~> 2.2)
       compass (>= 1.0.0, < 2.0.0)
       compass-import-once (= 1.0.5)
       execjs (~> 2.0)
       haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.3.12)
+      middleman-core (= 3.3.7)
       middleman-sprockets (>= 3.1.2)
       sass (>= 3.4.0, < 4.0)
       uglifier (~> 2.5)
-    middleman-autometatags (0.0.2)
+    middleman-autometatags (0.0.1)
       middleman-core (>= 3.0.0)
     middleman-blog (3.5.3)
       addressable (~> 2.3.5)
@@ -83,12 +79,12 @@ GEM
     middleman-bootstrap-navbar (2.0.0)
       bootstrap-navbar (~> 2.0)
       middleman-core (>= 3.0)
-    middleman-core (3.3.12)
+    middleman-core (3.3.7)
       activesupport (~> 4.1.0)
       bundler (~> 1.1)
       erubis
       hooks (~> 0.3)
-      i18n (~> 0.7.0)
+      i18n (~> 0.6.9)
       listen (>= 2.7.9, < 3.0)
       padrino-helpers (~> 0.12.3)
       rack (>= 1.4.5, < 2.0)
@@ -104,32 +100,32 @@ GEM
       middleman-core (>= 3.0.2)
       multi_json (~> 1.0)
       rack-livereload
-    middleman-sprockets (3.4.2)
-      middleman-core (>= 3.3)
+    middleman-sprockets (3.3.10)
+      middleman-core (~> 3.3)
       sprockets (~> 2.12.1)
       sprockets-helpers (~> 1.1.0)
-      sprockets-sass (~> 1.3.0)
-    minitest (5.7.0)
-    multi_json (1.11.0)
+      sprockets-sass (~> 1.2.0)
+    minitest (5.4.3)
+    multi_json (1.10.1)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    padrino-helpers (0.12.5)
+    net-ssh (2.9.1)
+    padrino-helpers (0.12.4)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.5)
+      padrino-support (= 0.12.4)
       tilt (~> 1.4.1)
-    padrino-support (0.12.5)
+    padrino-support (0.12.4)
       activesupport (>= 3.1)
-    ptools (1.3.2)
-    rack (1.6.1)
+    ptools (1.2.6)
+    rack (1.5.2)
     rack-livereload (0.3.15)
       rack
-    rack-test (0.6.3)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rb-fsevent (0.9.5)
+    rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    sass (3.4.14)
+    sass (3.4.9)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -137,18 +133,18 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.3.1)
+    sprockets-sass (1.2.0)
       sprockets (~> 2.0)
       tilt (~> 1.1)
     thor (0.19.1)
-    thread_safe (0.3.5)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uber (0.0.13)
-    uglifier (2.7.1)
+    uber (0.0.11)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
@@ -159,9 +155,9 @@ DEPENDENCIES
   bootstrap-sass
   builder (~> 3.0)
   jquery-middleman
-  middleman (~> 3.3)
+  middleman (~> 3.3.7)
   middleman-autometatags
-  middleman-blog (~> 3.5)
+  middleman-blog (~> 3.5.3)
   middleman-blog-drafts
   middleman-bootstrap-navbar
   middleman-deploy