From ccf3b3b5e7149cd218bfb722d46e2e0d19df004e Mon Sep 17 00:00:00 2001 From: Nuwan Date: Sat, 18 Jan 2025 15:26:36 +0530 Subject: [PATCH] force user to go to new jamtracks page (beta) once user clicks the JamTracks tile in client home page --- web/app/assets/javascripts/jamkazam.js | 12 ++++++++++++ web/app/assets/javascripts/layout.js | 12 ++++++++++++ web/app/helpers/client_helper.rb | 1 + 3 files changed, 25 insertions(+) diff --git a/web/app/assets/javascripts/jamkazam.js b/web/app/assets/javascripts/jamkazam.js index c3cbe1f88..c7562cc81 100644 --- a/web/app/assets/javascripts/jamkazam.js +++ b/web/app/assets/javascripts/jamkazam.js @@ -352,6 +352,18 @@ return; } + //force user to new jamtrack page (beta site) + if(hash && hash == '#/jamtrack') { + var urlToOpen = gon.spa_origin + '/jamtracks'; + + if(gon.isNativeClient) { + context.JK.popExternalLink(urlToOpen); + }else{ + context.location.href = urlToOpen; + } + hash = '#/home'; + } + var url = '/client#/' + screen; if (hash) { url = hash; diff --git a/web/app/assets/javascripts/layout.js b/web/app/assets/javascripts/layout.js index bf03c2c41..721b48856 100644 --- a/web/app/assets/javascripts/layout.js +++ b/web/app/assets/javascripts/layout.js @@ -482,6 +482,18 @@ var destination = $(evt.currentTarget).attr('layout-link'); var $destination = $('[layout-id="' + destination + '"]'); + //force user to the new site if they click on the jamtrack tile + if(destination === "jamtrack") { + var urlToOpen = gon.spa_origin + '/jamtracks'; + if(gon.isNativeClient) { + context.JK.popExternalLink(urlToOpen); + return; + }else{ + window.open(urlToOpen, '_blank'); + return; + } + } + var destinationType = $destination.attr("layout"); if (destinationType === "screen") { if(!context.JK.currentUserId && !$destination.is('.no-login-required')) { diff --git a/web/app/helpers/client_helper.rb b/web/app/helpers/client_helper.rb index 18302e153..734aba794 100644 --- a/web/app/helpers/client_helper.rb +++ b/web/app/helpers/client_helper.rb @@ -89,5 +89,6 @@ module ClientHelper gon.use_cached_session_scores = Rails.application.config.use_cached_session_scores gon.allow_both_find_algos = Rails.application.config.allow_both_find_algos gon.stripe_publishable_key = Rails.application.config.stripe[:publishable_key] + gon.spa_origin = Rails.application.config.spa_origin end end