diff --git a/web/app/assets/javascripts/web/individual_jamtrack_band.js b/web/app/assets/javascripts/web/individual_jamtrack_band_v1.js similarity index 100% rename from web/app/assets/javascripts/web/individual_jamtrack_band.js rename to web/app/assets/javascripts/web/individual_jamtrack_band_v1.js diff --git a/web/app/assets/javascripts/web/individual_jamtrack.js b/web/app/assets/javascripts/web/individual_jamtrack_v1.js similarity index 100% rename from web/app/assets/javascripts/web/individual_jamtrack.js rename to web/app/assets/javascripts/web/individual_jamtrack_v1.js diff --git a/web/app/assets/javascripts/web/web.js b/web/app/assets/javascripts/web/web.js index 89f49d6fe..fda0f16c1 100644 --- a/web/app/assets/javascripts/web/web.js +++ b/web/app/assets/javascripts/web/web.js @@ -65,8 +65,8 @@ //= require web/recordings //= require web/home //= require web/tracking -//= require web/individual_jamtrack -//= require web/individual_jamtrack_band +//= require web/individual_jamtrack_v1 +//= require web/individual_jamtrack_band_v1 //= require web/affiliate_program //= require web/affiliate_links //= require fakeJamClient diff --git a/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss b/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss index 773f12be1..5999b06cb 100644 --- a/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss +++ b/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss @@ -1,4 +1,4 @@ -body.web.landing_jamtrack.individual_jamtrack { +body.web.landing_jamtrack.individual_jamtrack_v1 { .previews { margin-top:10px; diff --git a/web/app/assets/stylesheets/landings/individual_jamtrack_band_v1.css.scss b/web/app/assets/stylesheets/landings/individual_jamtrack_band_v1.css.scss new file mode 100644 index 000000000..d0290cda1 --- /dev/null +++ b/web/app/assets/stylesheets/landings/individual_jamtrack_band_v1.css.scss @@ -0,0 +1,35 @@ +body.web.landing_jamtrack.individual_jamtrack_band_v1 { + + .previews { + margin-top:10px; + } + .jamtrack-reasons { + margin: 10px 0 0 20px; + } + + .white-bordered-button { + margin-top: 20px; + } + + .browse-jamtracks-wrapper { + text-align:center; + width:90%; + } + + .prompt { + margin-top:10px; + } + + .jam-track-preview-holder { + + margin-bottom: 7px; + + &[data-track-type="Master"] { + width: 100%; + } + + &[data-track-type="Track"] { + width: 100%; + } + } +} \ No newline at end of file diff --git a/web/app/assets/stylesheets/landings/individual_jamtrack_band.css.scss b/web/app/assets/stylesheets/landings/individual_jamtrack_v1.css.scss similarity index 89% rename from web/app/assets/stylesheets/landings/individual_jamtrack_band.css.scss rename to web/app/assets/stylesheets/landings/individual_jamtrack_v1.css.scss index 56c4fc1ae..5999b06cb 100644 --- a/web/app/assets/stylesheets/landings/individual_jamtrack_band.css.scss +++ b/web/app/assets/stylesheets/landings/individual_jamtrack_v1.css.scss @@ -1,4 +1,4 @@ -body.web.landing_jamtrack.individual_jamtrack_band { +body.web.landing_jamtrack.individual_jamtrack_v1 { .previews { margin-top:10px; diff --git a/web/app/controllers/landings_controller.rb b/web/app/controllers/landings_controller.rb index ef23ba7d8..6a9eba4db 100644 --- a/web/app/controllers/landings_controller.rb +++ b/web/app/controllers/landings_controller.rb @@ -84,6 +84,24 @@ class LandingsController < ApplicationController render 'individual_jamtrack_band', layout: 'web' end + def individual_jamtrack_v1 + @no_landing_tag = true + @show_cta_free_jamtrack = true + @jam_track = JamTrack.find_by_plan_code("jamtrack-" + params[:plan_code]) + gon.jam_track_plan_code = params[:plan_code] ? "jamtrack-" + params[:plan_code] : nil + gon.generic = params[:generic] + render 'individual_jamtrack_v1', layout: 'web' + end + + def individual_jamtrack_band_v1 + @no_landing_tag = true + @show_cta_free_jamtrack = true + @jam_track = JamTrack.find_by_plan_code("jamtrack-" + params[:plan_code]) + gon.jam_track_plan_code = params[:plan_code] ? "jamtrack-" + params[:plan_code] : nil + + render 'individual_jamtrack_band_v1', layout: 'web' + end + def product_jamblaster render 'product_jamblaster', layout: 'web' end diff --git a/web/app/views/landings/individual_jamtrack.html.slim b/web/app/views/landings/individual_jamtrack.html.slim index cb1cfc771..545f20585 100644 --- a/web/app/views/landings/individual_jamtrack.html.slim +++ b/web/app/views/landings/individual_jamtrack.html.slim @@ -3,6 +3,8 @@ - provide(:title, @jam_track.nil? ? nil : "Preview JamTrack: #{@jam_track.name} by #{@jam_track.original_artist}") .one_by_two + .row + h1 .row .column h1.hidden.individualized diff --git a/web/app/views/landings/individual_jamtrack_band.html.slim b/web/app/views/landings/individual_jamtrack_band_v1.html.slim similarity index 97% rename from web/app/views/landings/individual_jamtrack_band.html.slim rename to web/app/views/landings/individual_jamtrack_band_v1.html.slim index 9b2b72b19..1ac0f10c5 100644 --- a/web/app/views/landings/individual_jamtrack_band.html.slim +++ b/web/app/views/landings/individual_jamtrack_band_v1.html.slim @@ -1,4 +1,4 @@ -- provide(:page_name, 'landing_page full landing_jamtrack individual_jamtrack_band') +- provide(:page_name, 'landing_page full landing_jamtrack individual_jamtrack_band_v1') - provide(:description, @jam_track.nil? ? nil : "Preview multi-track JamTrack recording: #{@jam_track.name} by #{@jam_track.original_artist}. Way better than a backing track.") - provide(:title, @jam_track.nil? ? nil : "Preview JamTrack: #{@jam_track.name} by #{@jam_track.original_artist}") diff --git a/web/app/views/landings/individual_jamtrack_v1.html.slim b/web/app/views/landings/individual_jamtrack_v1.html.slim new file mode 100644 index 000000000..856c69ec6 --- /dev/null +++ b/web/app/views/landings/individual_jamtrack_v1.html.slim @@ -0,0 +1,34 @@ +- provide(:page_name, 'landing_page full landing_jamtrack individual_jamtrack_v1') +- provide(:description, @jam_track.nil? ? nil : "Preview multi-track JamTrack recording: #{@jam_track.name} by #{@jam_track.original_artist}. Way better than a backing track.") +- provide(:title, @jam_track.nil? ? nil : "Preview JamTrack: #{@jam_track.name} by #{@jam_track.original_artist}") + +.one_by_two + .row + .column + h1.hidden.individualized + | Preview  + strong.jamtrack_name + br + | JamTrack by  + span.jamtrack_band + + h1.hidden.generic + | Preview One of Our JamTracks + p.prompt Click play buttons to preview tracks. Every JamTrack includes fully isolated tracks for each part of the song! + .previews + a.browse-jamtracks.hidden + .column + h1 See What You Can Do With JamTracks + .video-wrapper + .video-container + iframe src="//www.youtube.com/embed/askHvcCoNfw" frameborder="0" allowfullscreen="allowfullscreen" + br clear="all" + br clear="all" + +javascript: + + + $(document).on('JAMKAZAM_READY', function(e, data) { + var song = new JK.IndividualJamTrack(data.app); + song.initialize(); + }) diff --git a/web/config/routes.rb b/web/config/routes.rb index 90c6547f5..3fec0d1e3 100644 --- a/web/config/routes.rb +++ b/web/config/routes.rb @@ -32,6 +32,10 @@ SampleApp::Application.routes.draw do match '/landing/kick4', to: 'landings#watch_overview_kick4', via: :get, as: 'landing_kick4' match '/landing/jamtracks/:plan_code', to: 'landings#individual_jamtrack', via: :get, as: 'individual_jamtrack' match '/landing/jamtracks/band/:plan_code', to: 'landings#individual_jamtrack_band', via: :get, as: 'individual_jamtrack_band' + # these are the older versions of the landing pages + match '/landing/jamtracks/v1/:plan_code', to: 'landings#individual_jamtrack_v1', via: :get, as: 'individual_jamtrack_v1' + match '/landing/jamtracks/v1/band/:plan_code', to: 'landings#individual_jamtrack_band_v1', via: :get, as: 'individual_jamtrack_band_v1' + match '/affiliateProgram', to: 'landings#affiliate_program', via: :get, as: 'affiliate_program' match '/affiliate/links/:id', to: 'affiliates#links', via: :get, as: 'affilate_links'