From c6054e1e1c6e78938e50af2d9adaa8dfabd8014c Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 21 Apr 2018 11:33:18 -0500 Subject: [PATCH] VRFS-4741 - kill vanilla, bugsnag, olark --- .../app/views/jam_ruby/user_mailer/welcome_message.html.erb | 4 +--- .../app/views/jam_ruby/user_mailer/welcome_message.text.erb | 3 +-- ruby/lib/jam_ruby/models/feedback_observer.rb | 3 ++- ruby/spec/spec_helper.rb | 6 ++++++ web/app/assets/javascripts/everywhere/everywhere.js | 4 ++-- .../react-components/landing/HomePage.js.jsx.coffee | 2 -- web/app/assets/javascripts/wizard/gear/gear_wizard.js | 4 ++-- web/app/views/clients/_footer.html.erb | 2 +- web/app/views/dialogs/_banner.html.slim | 6 +----- web/app/views/layouts/corporate.html.erb | 2 +- web/app/views/users/_user_dropdown.html.erb | 2 -- web/config/application.rb | 4 ++-- web/config/initializers/bugsnag.rb | 2 +- web/config/initializers/recurly.rb | 5 +++++ web/public/maintenance.html | 2 +- websocket-gateway/lib/jam_websockets/server.rb | 4 ++-- 16 files changed, 28 insertions(+), 27 deletions(-) diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb index f2a9e08e1..28fe5f8e6 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb @@ -75,9 +75,7 @@ find knowledge base articles and post questions that have not already been answered. You can - email us at support@jamkazam.com. And if you just want to chat, share tips and war stories, - - and hang out with fellow JamKazam musicians, you can visit our community forum. + email us at support@jamkazam.com.

diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.text.erb index 52dc8ab65..b5f52a69d 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.text.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.text.erb @@ -34,8 +34,7 @@ JamKazam offers a very robust and exciting set of features for playing online an Getting Help ------------ -If you run into trouble and need help, please reach out to us. We will be glad to do everything we can to answer your questions and get you up and running. You can visit our Support Portal at https://jamkazam.desk.com/ to find knowledge base articles and post questions that have not already been answered. You can email us at support@jamkazam.com. And if you just want to chat, share tips and war stories, and hang out with fellow JamKazamers, you can visit our Community Forum at http://forums.jamkazam.com/. - +If you run into trouble and need help, please reach out to us. We will be glad to do everything we can to answer your questions and get you up and running. You can visit our Support Portal at https://jamkazam.desk.com/ to find knowledge base articles and post questions that have not already been answered. You can email us at support@jamkazam.com. Again, welcome to JamKazam, and we look forward to seeing – and hearing – you online soon! Best Regards, diff --git a/ruby/lib/jam_ruby/models/feedback_observer.rb b/ruby/lib/jam_ruby/models/feedback_observer.rb index 8e2746da8..14dcb1803 100644 --- a/ruby/lib/jam_ruby/models/feedback_observer.rb +++ b/ruby/lib/jam_ruby/models/feedback_observer.rb @@ -4,7 +4,8 @@ module JamRuby observe JamRuby::Feedback def after_validation(feedback) - CorpMailer.feedback(feedback).deliver_now unless feedback.errors.any? + # got so much spam coming in :( no email sent now + #CorpMailer.feedback(feedback).deliver_now unless feedback.errors.any? end end end \ No newline at end of file diff --git a/ruby/spec/spec_helper.rb b/ruby/spec/spec_helper.rb index f4ecf15ff..ef4e0a290 100644 --- a/ruby/spec/spec_helper.rb +++ b/ruby/spec/spec_helper.rb @@ -64,6 +64,12 @@ end Stripe.api_key = "sk_test_OkjoIF7FmdjunyNsdVqJD02D" + +Recurly::API.net_http = { + ssl_version: :TLSv1_2, + #... +} + #uncomment the following line to use spork with the debugger #require 'spork/ext/ruby-debug' diff --git a/web/app/assets/javascripts/everywhere/everywhere.js b/web/app/assets/javascripts/everywhere/everywhere.js index 016eec279..0505d9ae5 100644 --- a/web/app/assets/javascripts/everywhere/everywhere.js +++ b/web/app/assets/javascripts/everywhere/everywhere.js @@ -300,10 +300,10 @@ } if (show) { - olark('api.box.show'); + if(window.olark) olark('api.box.show'); } else { - olark('api.box.hide'); + if(window.olark) olark('api.box.hide'); } diff --git a/web/app/assets/javascripts/react-components/landing/HomePage.js.jsx.coffee b/web/app/assets/javascripts/react-components/landing/HomePage.js.jsx.coffee index 76f5d8c57..feafcd47e 100644 --- a/web/app/assets/javascripts/react-components/landing/HomePage.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/landing/HomePage.js.jsx.coffee @@ -375,8 +375,6 @@ context = window rel="external">privacy  |  terms of service  |  community - forum  |  help diff --git a/web/app/assets/javascripts/wizard/gear/gear_wizard.js b/web/app/assets/javascripts/wizard/gear/gear_wizard.js index 51ab80891..5066986d0 100644 --- a/web/app/assets/javascripts/wizard/gear/gear_wizard.js +++ b/web/app/assets/javascripts/wizard/gear/gear_wizard.js @@ -105,11 +105,11 @@ } function afterShow() { - olark('api.box.show'); + if(window.olark) olark('api.box.show'); } function afterHide() { - olark('api.box.hide'); + if(window.olark) olark('api.box.hide'); wizard.onAfterHide(); context.jamClient.FTUESetStatus(true); diff --git a/web/app/views/clients/_footer.html.erb b/web/app/views/clients/_footer.html.erb index 4a3ea841a..cfc63719f 100644 --- a/web/app/views/clients/_footer.html.erb +++ b/web/app/views/clients/_footer.html.erb @@ -5,7 +5,7 @@

<%= render "clients/recordingManager" %> diff --git a/web/app/views/dialogs/_banner.html.slim b/web/app/views/dialogs/_banner.html.slim index 4d091e331..6c6c47c9d 100644 --- a/web/app/views/dialogs/_banner.html.slim +++ b/web/app/views/dialogs/_banner.html.slim @@ -39,14 +39,10 @@ script type='text/template' id='template-app-in-read-only-volume' script type='text/template' id='template-shutdown-prompt' .shutdown-prompt - | You have two options when shutting down JamKazam: ul li span.definition SHUT DOWN - = '- The application will close immediately.' - li - span.definition SYNC THEN SHUT DOWN - = '- Any pending recordings that you and others have made during sessions will be mastered - i.e. uploaded, mixed on our servers, and downloaded back to your computer - so that you have high quality versions of your recordings available. Once all recording synchronization is done, the application will shut down. This usually takes at most a few minutes.' + = '- Choosing this option will shutdown the application immediately.' script type='text/template' id='template-mixer-mode-change' diff --git a/web/app/views/layouts/corporate.html.erb b/web/app/views/layouts/corporate.html.erb index 1d1f31f41..22ed49ba7 100644 --- a/web/app/views/layouts/corporate.html.erb +++ b/web/app/views/layouts/corporate.html.erb @@ -52,7 +52,7 @@ - +
<%= version %>
diff --git a/web/app/views/users/_user_dropdown.html.erb b/web/app/views/users/_user_dropdown.html.erb index b74fdcf89..e1c259e03 100644 --- a/web/app/views/users/_user_dropdown.html.erb +++ b/web/app/views/users/_user_dropdown.html.erb @@ -64,12 +64,10 @@ <% if @nativeClient %>
  • <%= link_to "Test Network", '#' %>
    • <% end %> -
  • <%= link_to "Community Forum", Rails.application.config.vanilla_url, :rel => "external" %>
  • <%= link_to "Get Help", 'https://jamkazam.desk.com/', :rel => "external" %>
  • <%= link_to "Sign Out", signout_path, method: "delete" %>
    • <% else %>
  • <%= link_to "Download App", downloads_path, :rel => "external" %>
    • -
  • <%= link_to "Community Forum", Rails.application.config.vanilla_url, :rel => "external" %>
  • <%= link_to "Get Help", 'https://jamkazam.desk.com/', :rel => "external" %>
    • <% end %> diff --git a/web/config/application.rb b/web/config/application.rb index 3c015fdc1..439d61c5a 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -196,7 +196,7 @@ if defined?(Bundler) config.allow_force_native_client = true config.bugsnag_key = "4289fc981c8ce3eb0969003c4f498b01" - config.bugsnag_notify_release_stages = ["production"] # add 'development' if you want to test a bugsnag feature locally + config.bugsnag_notify_release_stages = [] # add 'development' if you want to test a bugsnag feature locally config.recurly_webhook_user = 'monkeytoesspeartoss' config.recurly_webhook_pass = 'frizzyfloppymushface' @@ -447,7 +447,7 @@ if defined?(Bundler) config.lesson_join_time_window_minutes = 5 config.lesson_wait_time_window_minutes = 10 config.end_of_wait_window_forgiveness_minutes = 1 - config.olark_enabled = true + config.olark_enabled = false config.jamclass_enabled = false config.musician_count = '75,000+' config.jamblaster_menu = false diff --git a/web/config/initializers/bugsnag.rb b/web/config/initializers/bugsnag.rb index bc28f149d..c171ca4b9 100644 --- a/web/config/initializers/bugsnag.rb +++ b/web/config/initializers/bugsnag.rb @@ -7,5 +7,5 @@ Bugsnag.configure do |config| end EventMachine.error_handler { |e| - Bugsnag.notify(e) + #Bugsnag.notify(e) } diff --git a/web/config/initializers/recurly.rb b/web/config/initializers/recurly.rb index f25a01e38..dd309256e 100644 --- a/web/config/initializers/recurly.rb +++ b/web/config/initializers/recurly.rb @@ -2,3 +2,8 @@ Recurly.api_key = Rails.configuration.recurly_private_api_key Recurly.subdomain = Rails.configuration.recurly_subdomain Recurly.default_currency = 'USD' Recurly.logger = Rails.logger + +Recurly::API.net_http = { + ssl_version: :TLSv1_2, + #... +} diff --git a/web/public/maintenance.html b/web/public/maintenance.html index 2edb104cc..1c69b38d2 100644 --- a/web/public/maintenance.html +++ b/web/public/maintenance.html @@ -282,7 +282,7 @@
    diff --git a/websocket-gateway/lib/jam_websockets/server.rb b/websocket-gateway/lib/jam_websockets/server.rb index 22ecba57b..aae553d1c 100644 --- a/websocket-gateway/lib/jam_websockets/server.rb +++ b/websocket-gateway/lib/jam_websockets/server.rb @@ -41,7 +41,7 @@ module JamWebsockets EventMachine.error_handler{|e| puts "unhandled error #{e}" @log.error "unhandled error #{e}" - Bugsnag.notify(e) + #Bugsnag.notify(e) } EventMachine.run do @@ -141,7 +141,7 @@ module JamWebsockets begin blk.call rescue => e - Bugsnag.notify(e) + #Bugsnag.notify(e) @log.error("unhandled exception in EM Timer #{e}") puts "Error during processing: #{$!}" puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"