From d2d1b8facc0afa5e7354526dd2ead736fac1b1bc Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Fri, 16 Oct 2015 16:50:08 -0500
Subject: [PATCH] * anonymous check is correct now, as well as video in landing
 page

---
 ruby/lib/jam_ruby/models/user.rb              |  2 +-
 .../JamTrackLandingBottomPage.js.jsx.coffee   | 11 +++
 .../landing/JamTrackLandingPage.js.jsx.coffee |  2 +-
 .../landings/individual_jamtrack.css.scss     | 16 ++++
 .../controllers/api_recordings_controller.rb  |  5 +-
 web/app/controllers/landings_controller.rb    | 12 +++
 web/spec/features/individual_jamtrack_spec.rb | 81 ++++++++++++-------
 7 files changed, 94 insertions(+), 35 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb
index 663f44a9d..c608dc88f 100644
--- a/ruby/lib/jam_ruby/models/user.rb
+++ b/ruby/lib/jam_ruby/models/user.rb
@@ -298,7 +298,7 @@ module JamRuby
     end
 
     def name
-      if first_name == 'Anoymous' && last_name == 'Anonymous'
+      if first_name == 'Anonymous' && last_name == 'Anonymous'
         'Anonymous'
       else
         "#{first_name} #{last_name}"
diff --git a/web/app/assets/javascripts/react-components/landing/JamTrackLandingBottomPage.js.jsx.coffee b/web/app/assets/javascripts/react-components/landing/JamTrackLandingBottomPage.js.jsx.coffee
index 832e6d28d..605822869 100644
--- a/web/app/assets/javascripts/react-components/landing/JamTrackLandingBottomPage.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/landing/JamTrackLandingBottomPage.js.jsx.coffee
@@ -32,7 +32,18 @@ context = window
             <a rel="external" href="https://www.youtube.com/channel/UCvnfBBzEizi1T5unOXNCxdQ"><img src="/assets/landing/Carl Brown - YouTube.png" className="testimonial-youtube" /></a>
             <h4><strong>Carl Brown</strong> of GuitarLessions365</h4>
           </div>
+          <div className="jamtrack-overview-video">
+            <h3>Watch A JamTracks Overview Video</h3>
+            <div className="video-wrapper left">
+              <div className="video-container">
+                <iframe src="//www.youtube.com/embed/07zJC7C2ICA" frameborder="0" allowfullscreen="allowfullscreen" />
+              </div>
+            </div>
+          </div>
         </div>
+
+
+
       </div>
       <div className="row awesome-thing">
         <div className="awesome-item">
diff --git a/web/app/assets/javascripts/react-components/landing/JamTrackLandingPage.js.jsx.coffee b/web/app/assets/javascripts/react-components/landing/JamTrackLandingPage.js.jsx.coffee
index ffdff3e05..96d968f96 100644
--- a/web/app/assets/javascripts/react-components/landing/JamTrackLandingPage.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/landing/JamTrackLandingPage.js.jsx.coffee
@@ -48,7 +48,7 @@ rest = context.JK.Rest()
           {loggedOutPriceAdvisory}
         </form>
 
-        <a className="browse-all" href="/client#/jamtrack">or browse our catalog of 3,700+ songs</a>
+        <a className="browse-all" href="/client?search=#/jamtrack/search">or browse our catalog of 3,700+ songs</a>
       </div>`
 
 
diff --git a/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss b/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss
index 4536d9eb6..c54f8bd2f 100644
--- a/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss
+++ b/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss
@@ -236,6 +236,22 @@ body.web.individual_jamtrack {
     @include border_box_sizing;
     z-index:1;
 
+    .jamtrack-overview-video {
+
+      h3 {
+        font-size:21px;
+        width:400px;
+      }
+      .video-wrapper {
+
+        .video-container {
+          width: 400px;
+          padding-bottom: 53.33%;
+
+        }
+      }
+    }
+
     h3 {
       color:$copy-color-on-white;
       text-align:center;
diff --git a/web/app/controllers/api_recordings_controller.rb b/web/app/controllers/api_recordings_controller.rb
index 9ce09c645..47f5e73d3 100644
--- a/web/app/controllers/api_recordings_controller.rb
+++ b/web/app/controllers/api_recordings_controller.rb
@@ -396,8 +396,9 @@ class ApiRecordingsController < ApiController
     body << "User: " + current_user.admin_url + "\n\n"
     body << "Recording Landing: #{recording_detail_url(@recording.id)}\n"
 
-    AdminMailer.alerts({
-                           subject:"Video Uploaded by #{current_user.name}",
+    private_public = @recording.is_public ? 'Public' : 'Private'
+    AdminMailer.social({
+                           subject:"#{private_public } Video Uploaded by #{current_user.name}",
                            body:body
                        }).deliver
 
diff --git a/web/app/controllers/landings_controller.rb b/web/app/controllers/landings_controller.rb
index 9fab9e341..fa13b018f 100644
--- a/web/app/controllers/landings_controller.rb
+++ b/web/app/controllers/landings_controller.rb
@@ -85,6 +85,12 @@ class LandingsController < ApplicationController
     end
     @jam_track = JamTrack.find_by_slug(params[:plan_code])
     @jam_track = JamTrack.find_by_plan_code("jamtrack-" + params[:plan_code]) unless @jam_track
+
+    if @jam_track.nil?
+      redirect_to '/client/#jamtrack'
+      return
+    end
+
     band_jam_track_count = @jam_track.band_jam_track_count
     jam_track_count = JamTrack.count
     @title = individual_jamtrack_title(false, params[:generic], @jam_track)
@@ -104,6 +110,12 @@ class LandingsController < ApplicationController
     @show_after_black_bar_border = true
     @jam_track = JamTrack.find_by_slug(params[:plan_code])
     @jam_track = JamTrack.find_by_plan_code("jamtrack-" + params[:plan_code]) unless @jam_track
+
+    if @jam_track.nil?
+      redirect_to '/client/#jamtrack'
+      return
+    end
+
     band_jam_track_count = @jam_track.band_jam_track_count
     jam_track_count = JamTrack.count
     @title = individual_jamtrack_title(true, params[:generic], @jam_track)
diff --git a/web/spec/features/individual_jamtrack_spec.rb b/web/spec/features/individual_jamtrack_spec.rb
index 15029acec..0aea10088 100644
--- a/web/spec/features/individual_jamtrack_spec.rb
+++ b/web/spec/features/individual_jamtrack_spec.rb
@@ -42,60 +42,77 @@ describe "Individual JamTrack", :js => true, :type => :feature, :capybara_featur
     it "logged out" do
       visit "/landing/jamtracks/#{@jamtrack_acdc_backinblack.slug}"
 
-      find('h1', "#{jamtrack_acdc_backinblack.name} Backing Track by #{jamtrack_acdc_backinblack.original_artist}")
+      find('h1', jamtrack_acdc_backinblack.name.upper)
+      find('h2', "by " + jamtrack_acdc_backinblack.original_artist.upper)
       jamtrack_acdc_backinblack.jam_track_tracks.each do |track|
         if track.master?
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="other"]')
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:'Master Mix')
+          find('.tracks.previews[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="other"]')
+          find('.tracks.previews[data-id="' + track.id + '"] .instrument-name', text:'Master Mix')
         else
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="' + track.instrument.id + '"]')
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
+          find('.tracks.previews[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="' + track.instrument.id + '"]')
+          find('.tracks.previews[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
         end
       end
       find('.browse-band a')['href'].should eq("/client?artist=#{jamtrack_acdc_backinblack.original_artist}#/jamtrack/search")
-      find('.browse-all a')['href'].should eq("/client?search=#/jamtrack/search")
-      find('a.cta-free-jamtrack')['href'].should eq("/client#/jamtrack/search")
-      find('a.cta-free-jamtrack').trigger(:click)
-      find('h1', text: 'check out')
-      find('h3', text: 'OR SIGN UP USING YOUR EMAIL')
+      find('a.browse-all')['href'].should eq("/client?search=#/jamtrack/search")
+      find('a.cta-button').trigger(:click)
+
+      # should fail because we haven't filled out email/password/terms
+      find('.browse-jamtracks', text: 'search jamtracks')
+      find('.register-area .errors', text: "Email can't be blank")
+
+      fill_in "email",    with: 'testuser_123@jamkazam.com'
+      fill_in "password",    with: 'jam123'
+      find('.register-area ins').trigger(:click)
+      find('a.cta-button').trigger(:click)
 
       # now go back, and then try to click checkout again
-      visit "/landing/jamtracks/acdc-backinblack"
+      visit "/landing/jamtracks/#{@jamtrack_acdc_backinblack.slug}"
+      find('.price-advisory', text:"$1.99")
       find('a.cta-free-jamtrack').trigger(:click)
       find('h1', text: 'check out')
-      find('h3', text: 'OR SIGN UP USING YOUR EMAIL')
+      find('.no-free-jamtrack')
+      # make sure we can find the webplayer link
+      find('.purchased-jam-tracks .play-jamtrack')
+
 
 
     end
 
     it "logged in" do
-      fast_signin(user, "/landing/jamtracks/acdc-backinblack")
+      fast_signin(user, "/landing/jamtracks/#{@jamtrack_acdc_backinblack.slug}")
 
-      find('h1', "#{jamtrack_acdc_backinblack.name} Backing Track by #{jamtrack_acdc_backinblack.original_artist}")
+      find('h1', jamtrack_acdc_backinblack.name.upper)
+      find('h2', "by " + jamtrack_acdc_backinblack.original_artist.upper)
       jamtrack_acdc_backinblack.jam_track_tracks.each do |track|
         if track.master?
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="other"]')
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:'Master Mix')
+          find('.tracks.previews[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="other"]')
+          find('.tracks.previews[data-id="' + track.id + '"] .instrument-name', text:'Master Mix')
         else
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="' + track.instrument.id + '"]')
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
+          find('.tracks.previews[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="' + track.instrument.id + '"]')
+          find('.tracks.previews[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
         end
       end
       find('a.cta-free-jamtrack').trigger(:click)
-      find('p', text:'Thank you for joining our community, and congratulations on getting your first JamTrack!')
+      find('.browse-band a')['href'].should eq("/client?artist=#{jamtrack_acdc_backinblack.original_artist}#/jamtrack/search")
+      find('a.browse-all')['href'].should eq("/client?search=#/jamtrack/search")
+      find('a.cta-button').trigger(:click)
+      find('.browse-jamtracks', text: 'search jamtracks')
+
     end
 
     it "generic version" do
+      pending "no generic version at the moment"
       visit "/landing/jamtracks/acdc-backinblack?generic=true"
 
       find('h1', "Backing Tracks + Free Amazing App = Unmatched Experience")
       jamtrack_acdc_backinblack.jam_track_tracks.each do |track|
         if track.master?
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="other"]')
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:'Master Mix')
+          find('.tracks.previews[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="other"]')
+          find('.tracks.previews[data-id="' + track.id + '"] .instrument-name', text:'Master Mix')
         else
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="' + track.instrument.id + '"]')
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
+          find('.tracks.previews[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="' + track.instrument.id + '"]')
+          find('.tracks.previews[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
         end
       end
       find('a.cta-free-jamtrack').trigger(:click)
@@ -104,16 +121,17 @@ describe "Individual JamTrack", :js => true, :type => :feature, :capybara_featur
     end
 
     it "band version" do
+      pending "no band version at the moment"
       visit "/landing/jamtracks/band/acdc-backinblack"
 
       find('h1', "#{jamtrack_acdc_backinblack.original_artist} Backing Tracks - Complete Multitracks")
       jamtrack_acdc_backinblack.jam_track_tracks.each do |track|
         if track.master?
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="other"]')
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:'Master Mix')
+          find('.tracks.previews[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="other"]')
+          find('.tracks.previews[data-id="' + track.id + '"] .instrument-name', text:'Master Mix')
         else
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="' + track.instrument.id + '"]')
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
+          find('.tracks.previews[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="' + track.instrument.id + '"]')
+          find('.tracks.previews[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
         end
       end
       find('a.cta-free-jamtrack').trigger(:click)
@@ -122,16 +140,17 @@ describe "Individual JamTrack", :js => true, :type => :feature, :capybara_featur
     end
 
     it "instrument version" do
+      pending "no instrument version at the moment"
       visit "/landing/jamtracks/electric%20guitar/acdc-backinblack"
 
       find('h1', "We Have 1 JamTracks With Electric Guitar Parts - Play Along With Your Favorites!")
       jamtrack_acdc_backinblack.jam_track_tracks.each do |track|
         if track.master?
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="other"]')
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:'Master Mix')
+          find('.tracks.previews[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="other"]')
+          find('.tracks.previews[data-id="' + track.id + '"] .instrument-name', text:'Master Mix')
         else
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="' + track.instrument.id + '"]')
-          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
+          find('.tracks.previews[data-id="' + track.id + '"] img.instrument-icon[data-instrument-id="' + track.instrument.id + '"]')
+          find('.tracks.previews[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
         end
       end
       find('a.cta-free-jamtrack').trigger(:click)