* VRFS-3031 - jamtrackBrowse is new URL

2015-04-14 15:16:37 -05:00 · 2015-04-14 15:16:37 -05:00 · ab1fadaea4
parent 06c964a151
commit ab1fadaea4
21 changed files with 32 additions and 32 deletions
--- a/web/app/assets/javascripts/dialog/gettingStartedDialog.js
+++ b/web/app/assets/javascripts/dialog/gettingStartedDialog.js
@ -50,7 +50,7 @@

      $browserJamTrackBtn.click(function() {
        app.layout.closeDialog('getting-started')
-        window.location = '/client#/jamtrack'
+        window.location = '/client#/jamtrackBrowse'
        return false;
      })

--- a/web/app/assets/javascripts/jam_track_screen.js.coffee
+++ b/web/app/assets/javascripts/jam_track_screen.js.coffee
@ -50,7 +50,7 @@ context.JK.JamTrackScreen=class JamTrackScreen
      @instrument.val(parms.instrument)
    if(parms.availability?)
      @availability.val(parms.availability)
-    window.history.replaceState({}, "", "/client#/jamtrack")
+    window.history.replaceState({}, "", "/client#/jamtrackBrowse")
    
  getParams:() =>
    params = {}      
@ -242,7 +242,7 @@ context.JK.JamTrackScreen=class JamTrackScreen
    screenBindings =
      'beforeShow': this.beforeShow
      'afterShow': this.afterShow
-    @app.bindScreen 'jamtrack', screenBindings
+    @app.bindScreen 'jamtrackBrowse', screenBindings
    @screen = $('#jamtrack-find-form')
    @scroller = @screen.find('.content-body-scroller')
    @content = @screen.find('.jamtrack-content')
--- a/web/app/assets/javascripts/jamtrack_landing.js.coffee
+++ b/web/app/assets/javascripts/jamtrack_landing.js.coffee
@ -38,7 +38,7 @@ context.JK.JamTrackLanding = class JamTrackLanding

    # client#/jamtrack
    for jamtrack in jamtracks
-      artistLink = "<a href='client?artist=#{encodeURIComponent(jamtrack.original_artist)}#/jamtrack' class='artist-link' artist='#{jamtrack.original_artist}'>#{jamtrack.original_artist}</a>"
+      artistLink = "<a href='client?artist=#{encodeURIComponent(jamtrack.original_artist)}#/jamtrackBrowse' class='artist-link' artist='#{jamtrack.original_artist}'>#{jamtrack.original_artist}</a>"
      $("#band_list").append("<li>#{artistLink}</li>")

  # We don't want to do a full page load if this is clicked on here:
@ -46,7 +46,7 @@ context.JK.JamTrackLanding = class JamTrackLanding
    band_list=$("ul#band_list")
    that=this
    band_list.on "click", "a.artist-link", (event)->       
-      context.location="client#/jamtrack"
+      context.location="client#/jamtrackBrowse"
      window.history.replaceState({}, "", this.href)
      event.preventDefault()
      
--- a/web/app/assets/javascripts/web/individual_jamtrack.js
+++ b/web/app/assets/javascripts/web/individual_jamtrack.js
@ -26,7 +26,7 @@
            else {
              $individualizedHeader.removeClass('hidden')
              $jamtrack_name.text(jam_track.name);
-              $jamTracksButton.attr('href', '/client?artist=' + jam_track.original_artist + '#/jamtrack')
+              $jamTracksButton.attr('href', '/client?artist=' + jam_track.original_artist + '#/jamtrackBrowse')
            }
          }

--- a/web/app/assets/javascripts/web/individual_jamtrack_band.js
+++ b/web/app/assets/javascripts/web/individual_jamtrack_band.js
@ -21,7 +21,7 @@
          logger.debug("jam_track", jam_track)

          $jamTrackBandInfo.text(jam_track.band_jam_track_count + ' ' + jam_track.original_artist);
-          $jamTracksButton.attr('href', '/client?artist=' + jam_track.original_artist + '#/jamtrack')
+          $jamTracksButton.attr('href', '/client?artist=' + jam_track.original_artist + '#/jamtrackBrowse')

          if(jam_track.band_jam_track_count == 1) {
            $jamTrackNoun.text('JamTrack')
--- a/web/app/views/clients/_account_jamtracks.html.slim
+++ b/web/app/views/clients/_account_jamtracks.html.slim
@ -25,9 +25,9 @@
              tr.no-jamtracks-found.hidden
                td colspan="3"
                  | You don't currently own any JamTracks.  
-                  a.orange href="/client#/jamtracks" Browse JamTracks Now
+                  a.orange href="/client#/jamtrackBrowse" Browse JamTracks Now
        .right
-          a.button-orange href="/client#/jamtracks" JAMTRACKS
+          a.button-orange href="/client#/jamtrackBrowse" JAMTRACKS
          a.button-grey href="javascript:history.go(-1)"  BACK
          
 script#template-account-jamtrack type='text/template'
--- a/web/app/views/clients/_checkout_order.html.slim
+++ b/web/app/views/clients/_checkout_order.html.slim
@ -14,7 +14,7 @@ div layout="screen" layout-id="checkoutOrder" id="checkoutOrderScreen" class="sc
                | Please review your order, and if everything looks correct, click the PLACE YOUR ORDER button. Thank you!
              p.empty-cart-prompt.hidden
                | You have nothing in your cart.  You can go browse for JamTracks&nbsp;
-                a href="/client#/jamtrack" here
+                a href="/client#/jamtrackBrowse" here
                | .
              p.no-account-info-prompt.hidden
                | You have no billing info.  Please go back to the&nbsp;
--- a/web/app/views/clients/_jamtrack.html.slim
+++ b/web/app/views/clients/_jamtrack.html.slim
@ -1,4 +1,4 @@
-#jamtrackScreen.screen.secondary.no-login-required layout='screen' layout-id='jamtrack'
+#jamtrackScreen.screen.secondary.no-login-required layout='screen' layout-id='jamtrackBrowse'
  .content
    .content-head
      .content-icon=image_tag("content/icon_jamtracks.png", height:19,  width:19 )
--- a/web/app/views/clients/_jamtrack_landing.html.slim
+++ b/web/app/views/clients/_jamtrack_landing.html.slim
@ -22,13 +22,13 @@
          .howto 
            .details
              span="To play with your JamTracks, open a JamTrack while in a session in the JamKazam app.  Or "
-              a href="client#/jamtrack" visit the JamTracks Section of your account.
+              a href="client#/jamtrackBrowse" visit the JamTracks Section of your account.
            .free-jamtrack.orange-fill.details
              | For a limited time, get one JamTrack free.  Browse JamTracks below, add one to your shopping cart, and we'll make it free during the checkout process.
          h2 browse jamtracks
          .browse-header
            | browse by band &nbsp;&nbsp;
-            a href="client#/jamtrack" or browse all jamtracks
+            a href="client#/jamtrackBrowse" or browse all jamtracks
          .band-browse.two-column-list-container
            ul#band_list
              li#no_bands_found.hidden No bands found
--- a/web/app/views/clients/_shopping_cart.html.haml
+++ b/web/app/views/clients/_shopping_cart.html.haml
@ -50,6 +50,6 @@
  .clearall
  .right
    %a.button-grey{href: "#"} HELP
-    %a.button-orange{href: "/client#/jamtrack"} CONTINUE SHOPPING
+    %a.button-orange{href: "/client#/jamtrackBrowse"} CONTINUE SHOPPING
    %a.button-orange.proceed-checkout{href: "#"} PROCEED TO CHECKOUT
  .clearall
--- a/web/app/views/dialogs/_loginRequiredDialog.html.slim
+++ b/web/app/views/dialogs/_loginRequiredDialog.html.slim
@ -11,7 +11,7 @@
      | &nbsp;to access most functionality on this page.
    p
      | However, you can browse for&nbsp;
-      a class="go-to-jamtracks" href='/client#/jamtrack' JamTracks
+      a class="go-to-jamtracks" href='/client#/jamtrackBrowse' JamTracks
      | &nbsp;without logging in.
    br
    .clearall
--- a/web/app/views/dialogs/_openJamTrackDialog.html.slim
+++ b/web/app/views/dialogs/_openJamTrackDialog.html.slim
@ -28,7 +28,7 @@
    .help-links
      a.what-are-jamtracks href='#'
        | What are JamTracks?
-      a href='/client#/jamtrack' rel="external"
+      a href='/client#/jamtrackBrowse' rel="external"
        | Shop for JamTracks
    .right
      a href="#" class="button-grey" layout-action="cancel"
--- a/web/app/views/landings/individual_jamtrack.html.slim
+++ b/web/app/views/landings/individual_jamtrack.html.slim
@ -23,7 +23,7 @@
        | Get Your First JamTrack Free Now!
      p Click the GET A JAMTRACK FREE button below. Browse to find the one you want. Click Add to cart, and we'll apply a credit during checkout to make this first one free! We're confident you'll be back for more.
      .browse-jamtracks-wrapper
-        a.white-bordered-button href="/client#/jamtrack" GET A JAMTRACK FREE!
+        a.white-bordered-button href="/client#/jamtrackBrowse" GET A JAMTRACK FREE!
    .column
      h1 Why Are JamTracks Different & Better?
      p
--- a/web/app/views/landings/individual_jamtrack_band.html.slim
+++ b/web/app/views/landings/individual_jamtrack_band.html.slim
@ -23,7 +23,7 @@
        | Get Your First JamTrack Free Now!
      p Click the GET A JAMTRACK FREE button below. Browse to find the one you want. Click Add to cart, and we'll apply a credit during checkout to make this first one free! We're confident you'll be back for more.
      .browse-jamtracks-wrapper
-        a.white-bordered-button href="/client#/jamtrack" GET A JAMTRACK FREE!
+        a.white-bordered-button href="/client#/jamtrackBrowse" GET A JAMTRACK FREE!
    .column
      h1 Why Are JamTracks Different & Better?
      p
--- a/web/app/views/landings/product_jamtracks.html.slim
+++ b/web/app/views/landings/product_jamtracks.html.slim
@ -21,7 +21,7 @@
      p Click the GET A JAMTRACK FREE button below. Browse to find the one you want, click the Add to cart, and we'll apply a credit during checkout to make the first one free!  We're confident you'll be back for more.

      .cta-big-button
-        a.white-bordered-button href="/client#/jamtrack" GET A JAMTRACK FREE!
+        a.white-bordered-button href="/client#/jamtrackBrowse" GET A JAMTRACK FREE!
    .column
      h1 Why are JamTracks Better than Backing Tracks?
      p
--- a/web/app/views/users/_downloads.html.slim
+++ b/web/app/views/users/_downloads.html.slim
@ -50,7 +50,7 @@
        .video-container
          iframe src="//www.youtube.com/embed/gAJAIHMyois" frameborder="0" allowfullscreen

-        a.go-jamtrack-shopping href="/client#/jamtrack" rel="external"
+        a.go-jamtrack-shopping href="/client#/jamtrackBrowse" rel="external"
          | Shop for free
          br
          | JamTrack now!
--- a/web/app/views/users/home.html.slim
+++ b/web/app/views/users/home.html.slim
@ -8,7 +8,7 @@
    strong JamTracks
    | &nbsp;are the best way to play with your favorite music. Unlike traditional backing tracks, JamTracks are complete multitrack recordings, with fully isolated tracks for each part.

-  = link_to image_tag("web/button_cta_jamtrack.png", width: 234, height:57), '/client#/jamtrack', class: 'cta-button jamtracks'
+  = link_to image_tag("web/button_cta_jamtrack.png", width: 234, height:57), '/client#/jamtrackBrowse', class: 'cta-button jamtracks'
  br clear="all"
  .extra-links
    .learn-more
--- a/web/spec/features/checkout_spec.rb
+++ b/web/spec/features/checkout_spec.rb
@ -602,7 +602,7 @@ describe "Checkout", :js => true, :type => :feature, :capybara_feature => true d

  describe "Complete Checkout Flow" do
    it "for anonymous user" do
-      visit "/client#/jamtrack"
+      visit "/client#/jamtrackBrowse"
      find('h1', text: 'jamtracks')
      #find('a', text: 'What is a JamTrack?')

@ -679,7 +679,7 @@ describe "Checkout", :js => true, :type => :feature, :capybara_feature => true d

      # now, go back to checkout flow again, and make sure we are told there are no free jam tracks

-      visit "/client#/jamtrack"
+      visit "/client#/jamtrackBrowse"

      find("a.jamtrack-add-cart[data-jamtrack-id=\"#{jamtrack_pearljam_evenflow.id}\"]").trigger(:click)
      find('h1', text: 'shopping cart')
@ -730,7 +730,7 @@ describe "Checkout", :js => true, :type => :feature, :capybara_feature => true d
    end

    it "for existing user" do
-      fast_signin(user, "/client#/jamtrack")
+      fast_signin(user, "/client#/jamtrackBrowse")
      find('h1', text: 'jamtracks')
      #find('a', text: 'What is a JamTrack?')

--- a/web/spec/features/individual_jamtrack_band_spec.rb
+++ b/web/spec/features/individual_jamtrack_band_spec.rb
@ -78,7 +78,7 @@ describe "Individual JamTrack Band", :js => true, :type => :feature, :capybara_f
          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
        end
      end
-      find('a.white-bordered-button')['href'].should eq("/client?artist=#{jamtrack_acdc_backinblack.original_artist}#/jamtrack")
+      find('a.white-bordered-button')['href'].should eq("/client?artist=#{jamtrack_acdc_backinblack.original_artist}#/jamtrackBrowse")

      find('a.white-bordered-button').trigger(:click)
      find('h1', text: 'jamtracks')
@ -97,7 +97,7 @@ describe "Individual JamTrack Band", :js => true, :type => :feature, :capybara_f
          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
        end
      end
-      find('a.white-bordered-button')['href'].should eq("/client?artist=#{jamtrack_acdc_backinblack.original_artist}#/jamtrack")
+      find('a.white-bordered-button')['href'].should eq("/client?artist=#{jamtrack_acdc_backinblack.original_artist}#/jamtrackBrowse")

      find('a.white-bordered-button').trigger(:click)
      find('h1', text: 'jamtracks')
--- a/web/spec/features/individual_jamtrack_spec.rb
+++ b/web/spec/features/individual_jamtrack_spec.rb
@ -78,7 +78,7 @@ describe "Individual JamTrack", :js => true, :type => :feature, :capybara_featur
          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
        end
      end
-      find('a.white-bordered-button')['href'].should eq("/client?artist=#{jamtrack_acdc_backinblack.original_artist}#/jamtrack")
+      find('a.white-bordered-button')['href'].should eq("/client?artist=#{jamtrack_acdc_backinblack.original_artist}#/jamtrackBrowse")

      find('a.white-bordered-button').trigger(:click)
      find('h1', text: 'jamtracks')
@ -97,7 +97,7 @@ describe "Individual JamTrack", :js => true, :type => :feature, :capybara_featur
          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
        end
      end
-      find('a.white-bordered-button')['href'].should eq("/client?artist=#{jamtrack_acdc_backinblack.original_artist}#/jamtrack")
+      find('a.white-bordered-button')['href'].should eq("/client?artist=#{jamtrack_acdc_backinblack.original_artist}#/jamtrackBrowse")

      find('a.white-bordered-button').trigger(:click)
      find('h1', text: 'jamtracks')
@ -116,7 +116,7 @@ describe "Individual JamTrack", :js => true, :type => :feature, :capybara_featur
          find('.jam-track-preview-holder[data-id="' + track.id + '"] .instrument-name', text:track.instrument.description)
        end
      end
-      find('a.white-bordered-button')['href'].should eq("/client#/jamtrack")
+      find('a.white-bordered-button')['href'].should eq("/client#/jamtrackBrowse")

      find('a.white-bordered-button').trigger(:click)
      find('h1', text: 'jamtracks')
--- a/web/spec/features/jamtrack_shopping_spec.rb
+++ b/web/spec/features/jamtrack_shopping_spec.rb
@ -64,7 +64,7 @@ describe "JamTrack Shopping", :js => true, :type => :feature, :capybara_feature
  describe "Shopping" do

    before(:each) do
-      visit "/client#/jamtrack"
+      visit "/client#/jamtrackBrowse"
      find('h1', text: 'jamtracks')      

      jk_select('Any', '#jamtrack-find-form #jamtrack_availability')
@ -102,7 +102,7 @@ describe "JamTrack Shopping", :js => true, :type => :feature, :capybara_feature

  it "sets artist filter" do
    pending "The item is clearly present, so not currently sure why capybar can't find it"
-    visit "/client?artist=foobar#/jamtrack"      
+    visit "/client?artist=foobar#/jamtrackBrowse"
    art = find('#jamtrack_artist')
    puts "art: #{art}"
  end
@ -110,7 +110,7 @@ describe "JamTrack Shopping", :js => true, :type => :feature, :capybara_feature
  describe "Shopping Carts" do

    before(:each) do
-      visit "/client#/jamtrack"
+      visit "/client#/jamtrackBrowse"
      find('h1', text: 'jamtracks')      

      jk_select('Any', '#jamtrack-find-form #jamtrack_availability')