seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

rebase rails5 with develop

This commit is contained in:
Seth Call 2021-05-18 16:29:09 -05:00 committed by Nuwan
parent 3b5b79b0da
commit dfe44f647e
85 changed files with 454 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/app/admin/score_history.rb
View File

@ -37,7 +37,7 @@ ActiveAdmin.register JamRuby::ScoreHistory, :as => 'Score History' do
filter :to_latitude
filter :to_longitude
before_filter only: :index do
before_action only: :index do
@per_page = 1_000_000 if request.format == 'text/csv'
end

2
admin/app/controllers/application_controller.rb
View File

@ -3,7 +3,7 @@ class ApplicationController < ActionController::Base
protect_from_forgery
before_filter :prepare_gon
before_action :prepare_gon
def prepare_gon
@olark_enabled = false

4
admin/app/uploaders/image_uploader.rb
View File

@ -2,8 +2,8 @@
class ImageUploader < CarrierWave::Uploader::Base
include CarrierWaveDirect::Uploader
include CarrierWave::MimeTypes
process :set_content_type
#include CarrierWave::MimeTypes
#process :set_content_type
def initialize(*)

1
admin/config/environments/development.rb
View File

@ -28,6 +28,7 @@ JamAdmin::Application.configure do
# Raise exception on mass assignment protection for Active Record models
config.active_record.mass_assignment_sanitizer = :strict
config.assets.quiet = true
# Do not compress assets
config.assets.compress = false

2
admin/config/initializers/active_admin.rb
View File

@ -137,7 +137,7 @@ ActiveAdmin.setup do |config|
# You can add before, after and around filters to all of your
# Active Admin resources and pages from here.
#
# config.before_filter :do_something_awesome
# config.before_action :do_something_awesome
# == Register Stylesheets & Javascripts

2
ruby/Gemfile
View File

@ -63,7 +63,7 @@ gem 'kickbox'
gem 'will_paginate'
gem 'sendgrid', '1.2.0'
gem 'aws-sdk', '~> 1'
gem 'carrierwave', '0.9.0'
gem 'carrierwave'#, '0.9.0'
gem 'aasm'
gem 'devise' #'3.3.0' # 3.4.0 causes: uninitialized constant ActionController::Metal (NameError)
gem 'postgres-copy'

33
ruby/Gemfile.lock
View File

@ -13,7 +13,7 @@ GEM
remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/
specs:
CFPropertyList (2.3.6)
aasm (5.1.1)
aasm (5.2.0)
concurrent-ruby (~> 1.0)
actioncable (5.1.7)
actionpack (= 5.1.7)
@ -79,10 +79,14 @@ GEM
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
builder (3.2.4)
carrierwave (0.9.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
carrierwave (2.2.1)
activemodel (>= 5.0.0)
activesupport (>= 5.0.0)
addressable (~> 2.6)
image_processing (~> 1.1)
marcel (~> 1.0.0)
mini_mime (>= 0.1.3)
ssrf_filter (~> 1.0)
coderay (1.1.3)
concurrent-ruby (1.1.8)
crack (0.4.5)
@ -91,11 +95,11 @@ GEM
dante (0.2.0)
database_cleaner (2.0.1)
database_cleaner-active_record (~> 2.0.0)
database_cleaner-active_record (2.0.0)
database_cleaner-active_record (2.0.1)
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
devise (4.7.3)
devise (4.8.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
@ -118,13 +122,14 @@ GEM
et-orbi (1.2.4)
tzinfo
eventmachine (1.0.4)
excon (0.80.1)
excon (0.81.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
faker (1.3.0)
i18n (~> 0.5)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.15.0)
fission (0.5.0)
CFPropertyList (~> 2.2)
fog (1.41.0)
@ -294,6 +299,9 @@ GEM
i18n (0.9.5)
concurrent-ruby (~> 1.0)
icalendar (2.4.0)
image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
inflecto (0.0.2)
ipaddress (0.8.3)
iso-639 (0.3.5)
@ -309,10 +317,12 @@ GEM
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (1.0.1)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225)
mini_magick (4.11.0)
mini_mime (1.1.0)
mini_portile2 (2.4.0)
minitest (5.14.4)
@ -430,6 +440,8 @@ GEM
ruby-prof
ruby-prof (0.15.9)
ruby-protocol-buffers (1.2.2)
ruby-vips (2.1.2)
ffi (~> 1.12)
ruby2_keywords (0.0.4)
rubyzip (1.2.0)
rufus-scheduler (3.7.0)
@ -461,6 +473,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
ssrf_filter (1.0.7)
stripe (5.32.1)
stripe-ruby-mock (3.0.1)
dante (>= 0.2.0)
@ -482,7 +495,7 @@ GEM
rack (>= 1.0.0)
warden (1.2.9)
rack (>= 2.0.9)
webmock (3.12.2)
webmock (3.13.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
@ -510,7 +523,7 @@ DEPENDENCIES
bcrypt (= 3.1.15)
bcrypt-ruby
builder
carrierwave (= 0.9.0)
carrierwave
database_cleaner
devise
elasticsearch

4
ruby/lib/jam_ruby/app/uploaders/jam_track_right_uploader.rb
View File

@ -1,8 +1,8 @@
class JamTrackRightUploader < CarrierWave::Uploader::Base
# include CarrierWaveDirect::Uploader
include CarrierWave::MimeTypes
#include CarrierWave::MimeTypes
process :set_content_type
#process :set_content_type
def initialize(*)
super

4
ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb
View File

@ -1,8 +1,8 @@
class JamTrackTrackUploader < CarrierWave::Uploader::Base
# include CarrierWaveDirect::Uploader
include CarrierWave::MimeTypes
#include CarrierWave::MimeTypes
process :set_content_type
#process :set_content_type
def initialize(*)
super

4
ruby/lib/jam_ruby/app/uploaders/jam_track_uploader.rb
View File

@ -1,8 +1,8 @@
class JamTrackUploader < CarrierWave::Uploader::Base
# include CarrierWaveDirect::Uploader
include CarrierWave::MimeTypes
#include CarrierWave::MimeTypes
process :set_content_type
#process :set_content_type
def initialize(*)
super

4
ruby/lib/jam_ruby/app/uploaders/max_mind_release_uploader.rb
View File

@ -1,7 +1,7 @@
class MaxMindReleaseUploader < CarrierWave::Uploader::Base
# include CarrierWaveDirect::Uploader
include CarrierWave::MimeTypes
process :set_content_type
#include CarrierWave::MimeTypes
#process :set_content_type
after :store, :update_extras

4
ruby/lib/jam_ruby/app/uploaders/mix_uploader.rb
View File

@ -1,8 +1,8 @@
class MixUploader < CarrierWave::Uploader::Base
# include CarrierWaveDirect::Uploader
include CarrierWave::MimeTypes
#include CarrierWave::MimeTypes
process :set_content_type
#process :set_content_type
process :add_metadata
version :mp3_url do

4
ruby/lib/jam_ruby/app/uploaders/recorded_track_uploader.rb
View File

@ -1,8 +1,8 @@
class RecordedTrackUploader < CarrierWave::Uploader::Base
# include CarrierWaveDirect::Uploader
include CarrierWave::MimeTypes
# include CarrierWave::MimeTypes
process :set_content_type
#process :set_content_type
process :add_metadata
def initialize(*)

22
ruby/lib/jam_ruby/tasks/db/migrate.rake
View File

@ -4,12 +4,11 @@ require "jam_ruby/rake_util"
namespace :db do
namespace :jam_ruby do
raise 'Set RAILS_ENV environment variable' if ENV['RAILS_ENV'].blank?
db_config = YAML::load(File.open('config/database.yml'))[ENV['RAILS_ENV']]
db_config_admin = db_config.merge({'database' => 'postgres', 'schema_search_path' => 'public'})
desc "Create the database"
task :create do
raise 'Set RAILS_ENV environment variable' if ENV['RAILS_ENV'].blank?
db_config = YAML::load(File.open('config/database.yml'))[ENV['RAILS_ENV']]
db_config_admin = db_config.merge({'database' => 'postgres', 'schema_search_path' => 'public'})
ActiveRecord::Base.establish_connection(db_config_admin)
ActiveRecord::Base.connection.create_database(db_config["database"])
puts "#{ENV['RAILS_ENV']} database created."
@ -17,6 +16,9 @@ namespace :db do
desc "Migrate the database"
task :migrate do
raise 'Set RAILS_ENV environment variable' if ENV['RAILS_ENV'].blank?
db_config = YAML::load(File.open('config/database.yml'))[ENV['RAILS_ENV']]
db_config_admin = db_config.merge({'database' => 'postgres', 'schema_search_path' => 'public'})
version = nil
if ENV['RAILS_ENV'] != "test"
version = ARGV[1]
@ -38,6 +40,9 @@ namespace :db do
desc "Rollback the database"
task :rollback do
raise 'Set RAILS_ENV environment variable' if ENV['RAILS_ENV'].blank?
db_config = YAML::load(File.open('config/database.yml'))[ENV['RAILS_ENV']]
db_config_admin = db_config.merge({'database' => 'postgres', 'schema_search_path' => 'public'})
steps = (ARGV[1] || "1").to_i
ActiveRecord::Base.establish_connection(db_config)
migrate_dir = JamRuby::RakeUtil.migrations_path
@ -52,7 +57,10 @@ namespace :db do
desc "Drop the database"
task :drop do
raise 'Set RAILS_ENV environment variable' if ENV['RAILS_ENV'].blank?
raise "can not drop production database" if ENV['RAILS_ENV'] == 'production'
db_config = YAML::load(File.open('config/database.yml'))[ENV['RAILS_ENV']]
db_config_admin = db_config.merge({'database' => 'postgres', 'schema_search_path' => 'public'})
ActiveRecord::Base.establish_connection(db_config_admin)
ActiveRecord::Base.connection.drop_database(db_config["database"])
puts "#{ENV['RAILS_ENV']} database deleted."
@ -63,6 +71,9 @@ namespace :db do
desc 'Create a db/schema.rb file that is portable against any DB supported by AR'
task :schema do
raise 'Set RAILS_ENV environment variable' if ENV['RAILS_ENV'].blank?
db_config = YAML::load(File.open('config/database.yml'))[ENV['RAILS_ENV']]
db_config_admin = db_config.merge({'database' => 'postgres', 'schema_search_path' => 'public'})
ActiveRecord::Base.establish_connection(db_config)
require 'active_record/schema_dumper'
filename = "db/schema.rb"
@ -76,6 +87,9 @@ namespace :db do
namespace :g do
desc "Generate migration"
task :migration do
raise 'Set RAILS_ENV environment variable' if ENV['RAILS_ENV'].blank?
db_config = YAML::load(File.open('config/database.yml'))[ENV['RAILS_ENV']]
db_config_admin = db_config.merge({'database' => 'postgres', 'schema_search_path' => 'public'})
name = ARGV[1] || raise("Specify name: rake db:g:migration your_migration")
timestamp = Time.now.strftime("%Y%m%d%H%M%S")
path = File.expand_path("../../../../../db/migrate/#{timestamp}_#{name}.rb", __FILE__)

5
ruby/spec/support/maxmind.rb
View File

@ -214,7 +214,8 @@ def create_geoip(locid)
#jamisp = JamIsp.find_by_beginip(geoipblock.beginip)
jamisp = nil
coid = 0 #jamisp.coid
{jamisp: jamisp, geoiplocation: geoiplocation, geoipblock: geoipblock, locidispid: Score.compute_locidispid(geoiplocation.locid, coid)}
locid = geoiplocation.nil? ? 0: geoiplocation.locid
{jamisp: jamisp, geoiplocation: geoiplocation, geoipblock: geoipblock, locidispid: Score.compute_locidispid(locid, coid)}
end
# gets related models for an IP in the 1st block from the scores_better_test_data.sql
def austin_geoip
@ -256,4 +257,4 @@ def locidispid_from_ip(ip_address)
else
nil
end
end
end

9
web/.gitignore vendored
View File

@ -44,4 +44,11 @@ public/uploads
BUILD_NUMBER
.byebug_history
.ruby-version
.rails5-gems
.rails5-gems
/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity

54
web/Gemfile
View File

@ -22,10 +22,11 @@ else
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
end
end
gem 'rails', '= 4.2.8'
gem 'railties', '= 4.2.8'
gem 'rails', '= 5.1.7'
#gem 'railties', '= 5.1.7'
gem 'auto_strip_attributes', '2.6.0'
gem 'protected_attributes'
#gem 'protected_attributes'
gem 'protected_attributes_continued'
gem 'rails-observers'
# PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously
@ -48,7 +49,7 @@ gem 'sass-rails', '5.0.7' # compiler mismatch issue between build and www
gem 'sass', '3.5.5 '# compiler mismatch issue between build and www
#1######
gem 'responders', '~> 2.0'
gem 'responders'#, '~> 2.0'
#gem 'sprockets', '3.2.0'
gem 'sprockets-es6', require: 'sprockets/es6'
gem 'sprockets-rails', '2.3.2'
@ -60,8 +61,8 @@ gem 'paypal-sdk-merchant-jk', '1.118.1'
gem 'kickbox'
#gem 'oj' # '2.10.2'
gem 'builder'
gem 'jquery-rails'
gem 'jquery-ui-rails', '4.2.1'
gem 'jquery-rails', '4.4.0'
gem 'jquery-ui-rails' #, '4.2.1'
#gem 'bootstrap-sass', '2.0.4'
#gem 'bcrypt-ruby', '3.1.14'
gem 'faker', '1.3.0'
@ -70,13 +71,7 @@ gem 'bootstrap-will_paginate', '0.0.6'
gem 'em-websocket', '>=0.4.0' #, :path => '/Users/seth/workspace/em-websocket'
gem 'uuidtools', '2.1.2'
gem 'ruby-protocol-buffers', '1.2.2'
if ENV["MODERN_OS"] == "1"
gem 'pg', '0.21.0'
else
gem 'pg', '0.17.1'
end
gem 'pg' # , '0.17.1'
#gem 'compass-rails' #, '1.1.3' # 1.1.4 throws an exception on startup about !initialize on nil
#gem "compass-rails", github: "Compass/compass-rails", branch: "master"
gem 'rabl', '0.13.1' # 0.14.3 has error on jenkins build server in ubuntu 12
@ -93,33 +88,33 @@ gem 'omniauth'
gem 'omniauth-facebook'
#>>>>>>> develop
gem 'omniauth-twitter'
gem 'omniauth-google-oauth2'
gem 'omniauth-google-oauth2', '0.8.2' # this is held back becuase stripe-connect needs omnniauth 1.x
gem 'omniauth-stripe-connect'
gem 'google-api-client' #, '0.7.1'
gem 'retriable', '3.0.1' # this is necessary because 3.0.2 has a bug when used by google-api-client
#gem 'google-api-omniauth' #, '0.1.1'
gem 'signet', '0.5.0'
gem 'twitter'
gem 'fb_graph', '2.5.9'
#gem 'fb_graph', '2.5.9'
gem 'sendgrid', '1.2.0'
gem 'filepicker-rails', '0.1.0'
#gem 'filepicker-rails' # , '0.1.0' # removed in migrating to 2.5
gem 'aws-sdk', '~> 1'
gem 'aasm' #, '3.0.16'
gem 'carmen'
gem 'carrierwave', '0.11.2' #, '0.9.0'
gem 'carrierwave' #, '0.11.2' #, '0.9.0'
gem 'carrierwave_direct'
gem 'fog'
#gem 'jquery-payment-rails', github: 'sethcall/jquery-payment-rails'
gem 'haml-rails', '0.9.0' # pinned because upgrading lets u not do = "{% if(data.feed_item['has_mount?']) { %}" . ? is bad
gem 'unf' #optional fog dependency
gem 'devise', '3.3.0' #3.4.0 causes uninitialized constant ActionController::Metal (NameError)
gem 'devise'# , '3.3.0' #3.4.0 causes uninitialized constant ActionController::Metal (NameError)
gem 'postgres-copy'
gem 'prawn-table'
#group :libv8 do
# gem 'libv8', "~> 3.11.8"
#end
gem 'geokit-rails'
gem 'postgres_ext'
#gem 'postgres_ext'
gem 'resque'
gem 'resque-scheduler', '4.3.0' # a bug in 4.4.0 stops resque schedule from starting. 4.3.0 is very old compared to 4.4.0 though
gem 'resque-retry'
@ -128,7 +123,7 @@ gem 'resque-dynamic-queues'
gem 'resque-lonely_job', '~> 1.0.0'
gem 'resque_mailer'
gem 'netaddr', '1.5.1'
gem 'quiet_assets', :group => :development
#gem 'quiet_assets', :group => :development
gem 'bugsnag', '5.3.2'
gem 'multi_json' #, '1.9.0'
gem 'rest-client'
@ -146,7 +141,7 @@ gem 'influxdb', '0.3.14'
gem 'influxdb-rails', '0.1.12'
gem 'sitemap_generator'
gem 'bower-rails', "~> 0.9.2"
gem 'react-rails', '1.3.3' #'~> 1.0'
gem 'react-rails'# , '1.3.3' #'~> 1.0'
gem 'sendgrid_toolkit', '>= 1.1.1'
gem 'stripe'
gem 'zip-codes'
@ -157,8 +152,12 @@ gem 'elasticsearch'
gem 'logging', '1.7.2'
<<<<<<< HEAD
gem 'rack-cors', '~> 1.0', '>= 1.0.6'
=======
gem 'webpacker', '4.3.0' # unpin when on Ralis 5.2
>>>>>>> 010c68037 (pause)
if ENV['FASTER_PATH'] == '1'
# https://github.com/danielpclark/faster_path
@ -166,8 +165,10 @@ if ENV['FASTER_PATH'] == '1'
#gem 'faster_path', '~> 0.1.0', :group => :development
end
=begin
source 'https://rails-assets.org' do
gem 'rails-assets-reflux', '0.3.0'
gem 'rails-assets-reflux'#, '0.3.0'
gem 'rails-assets-classnames'
#<<<<<<< HEAD
# gem 'rails-assets-react-select'
@ -177,6 +178,7 @@ source 'https://rails-assets.org' do
gem 'rails-assets-react-select', '0.6.7'
#>>>>>>> develop
end
=end
#group :development, :production do
# gem 'rack-timeout'
@ -185,13 +187,13 @@ end
group :development, :test do
gem 'rspec-rails' #, require: "rspec/rails" #, '2.14.2'
gem 'rspec-collection_matchers'
gem "activerecord-import", "~> 0.4.1"
#gem "activerecord-import", "~> 0.4.1"
# gem 'guard-rspec', '0.5.5'
# gem 'jasmine', '1.3.1'
gem 'pry'
gem 'execjs', '2.6.0 ' #, '1.4.0'
gem 'factory_girl_rails' # , '4.1.0' # in dev because in use by rake task
gem 'database_cleaner', '1.3.0' #in dev because in use by rake task
gem 'database_cleaner' #, '1.3.0' #in dev because in use by rake task
gem 'test-unit'
# gem 'teaspoon'
# gem 'teaspoon-jasmine'
@ -211,7 +213,7 @@ gem 'coffee-script-source', '1.12.2'
group :test, :cucumber do
gem 'simplecov', '~> 0.7.1'
gem 'simplecov-rcov'
gem 'capybara'
gem 'capybara', '3.32.2' # last version before ruby 2.5 required
#gem 'rails-assets-sinon', source: 'https://rails-assets.org'
#gem 'sinon-rails'
#if ENV['JAMWEB_QT5'] == '1'
@ -220,7 +222,7 @@ group :test, :cucumber do
#else
# gem "capybara-webkit"
#end
gem 'capybara-screenshot', '1.0.25' #, '0.3.22' # 1.0.0 broke compat with rspec. maybe we need newer rspec
gem 'capybara-screenshot' #, '1.0.25' #, '0.3.22' # 1.0.0 broke compat with rspec. maybe we need newer rspec
gem 'selenium-webdriver'
gem 'webdrivers', '~> 4.0', require: false
gem "show_me_the_cookies"

355
web/Gemfile.lock
View File

@ -15,50 +15,49 @@ PATH
GEM
remote: http://rubygems.org/
remote: https://rails-assets.org/
specs:
CFPropertyList (2.3.6)
aasm (5.1.1)
aasm (5.2.0)
concurrent-ruby (~> 1.0)
actionmailer (4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
actioncable (5.1.7)
actionpack (= 5.1.7)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.7)
actionpack (= 5.1.7)
actionview (= 5.1.7)
activejob (= 5.1.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-dom-testing (~> 2.0)
actionpack (5.1.7)
actionview (= 5.1.7)
activesupport (= 5.1.7)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.8)
activesupport (= 4.2.8)
actionview (5.1.7)
activesupport (= 5.1.7)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.8)
activesupport (= 4.2.8)
globalid (>= 0.3.0)
activemodel (4.2.8)
activesupport (= 4.2.8)
builder (~> 3.1)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
arel (~> 6.0)
activerecord-import (0.4.1)
activerecord (>= 3.0)
activesupport (4.2.8)
i18n (~> 0.7)
activejob (5.1.7)
activesupport (= 5.1.7)
globalid (>= 0.3.6)
activemodel (5.1.7)
activesupport (= 5.1.7)
activerecord (5.1.7)
activemodel (= 5.1.7)
activesupport (= 5.1.7)
arel (~> 8.0)
activesupport (5.1.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
aes_key_wrap (1.1.0)
aliyun-sdk (0.8.0)
nokogiri (~> 1.6)
rest-client (~> 2.0)
@ -70,10 +69,9 @@ GEM
amq-client (~> 0.9.5)
amq-protocol (>= 0.9.4)
eventmachine
arel (6.0.4)
arel (8.0.0)
arr-pm (0.0.10)
cabin (> 0)
attr_required (1.0.1)
auto_strip_attributes (2.6.0)
activerecord (>= 4.0)
autoparse (0.3.3)
@ -89,38 +87,39 @@ GEM
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
backports (3.20.2)
backports (3.21.0)
bcrypt (3.1.13)
bindata (2.4.8)
bootstrap-will_paginate (0.0.6)
will_paginate
bower-rails (0.9.2)
buftok (0.2.0)
bugsnag (5.3.2)
builder (3.2.4)
byebug (11.0.1)
byebug (11.1.3)
cabin (0.9.0)
capybara (3.15.1)
capybara (3.32.2)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.2)
regexp_parser (~> 1.5)
xpath (~> 3.2)
capybara-screenshot (1.0.25)
capybara (>= 1.0, < 4)
launchy
carmen (1.1.3)
activesupport (>= 3.0.0)
carrierwave (0.11.2)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
mime-types (>= 1.16)
mimemagic (>= 0.3.0)
carrierwave_direct (1.0.0)
carrierwave (~> 0.11)
carrierwave (2.2.1)
activemodel (>= 5.0.0)
activesupport (>= 5.0.0)
addressable (~> 2.6)
image_processing (~> 1.1)
marcel (~> 1.0.0)
mini_mime (>= 0.1.3)
ssrf_filter (~> 1.0)
carrierwave_direct (2.1.0)
carrierwave (>= 1.0.0)
fog-aws
cause (0.1)
childprocess (0.9.0)
@ -135,16 +134,19 @@ GEM
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.8)
connection_pool (2.2.3)
crack (0.4.5)
rexml
connection_pool (2.2.5)
crass (1.0.6)
database_cleaner (1.3.0)
devise (3.3.0)
database_cleaner (2.0.1)
database_cleaner-active_record (~> 2.0.0)
database_cleaner-active_record (2.0.1)
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
devise (4.8.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
diff-lcs (1.4.4)
domain_name (0.5.20190701)
@ -164,11 +166,12 @@ GEM
email_validator (1.6.0)
activemodel
equalizer (0.0.11)
erubi (1.10.0)
erubis (2.7.0)
et-orbi (1.2.4)
tzinfo
eventmachine (1.2.3)
excon (0.79.0)
excon (0.81.0)
execjs (2.6.0)
extlib (0.9.16)
factory_girl (4.9.0)
@ -180,18 +183,10 @@ GEM
i18n (~> 0.5)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
fb_graph (2.5.9)
httpclient (>= 2.2.0.2)
json
rack-oauth2 (>= 0.14.4)
tzinfo
ffi (1.12.2)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
filepicker-rails (0.1)
multi_json (~> 1.6)
railties (>= 3.1.0, < 5.0)
fission (0.5.0)
CFPropertyList (~> 2.2)
fog (1.41.0)
@ -354,7 +349,7 @@ GEM
pleaserun (~> 0.0.29)
ruby-xz (~> 0.2.3)
stud
fugit (1.4.2)
fugit (1.4.5)
et-orbi (~> 1.1, >= 1.1.8)
raabro (~> 1.4)
geokit (1.13.1)
@ -411,10 +406,12 @@ GEM
httparty (0.18.1)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
icalendar (2.4.0)
image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
inflecto (0.0.2)
influxdb (0.3.14)
cause
@ -430,14 +427,10 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.2.1)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
json (1.8.6)
json-jwt (1.12.0)
activesupport (>= 4.2)
aes_key_wrap
bindata
jwt (2.2.2)
jwt (2.2.3)
kgio (2.11.3)
kickbox (2.0.4)
faraday (~> 0.9)
@ -448,39 +441,42 @@ GEM
little-plugger (1.1.4)
logging (1.7.2)
little-plugger (>= 1.1.3)
loofah (2.9.0)
loofah (2.9.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (1.0.1)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0212)
mimemagic (0.3.5)
mini_mime (1.0.2)
mime-types-data (3.2021.0225)
mini_magick (4.11.0)
mini_mime (1.1.0)
mini_portile2 (2.4.0)
minitest (5.14.3)
mono_logger (1.1.0)
minitest (5.14.4)
mono_logger (1.1.1)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.1.1)
mustache (0.99.8)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
naught (1.1.0)
netaddr (1.5.1)
netrc (0.11.0)
newrelic_rpm (6.15.0)
nio4r (2.5.2)
newrelic_rpm (7.0.0)
nio4r (2.5.7)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogumbo (2.0.4)
nokogumbo (2.0.5)
nokogiri (~> 1.8, >= 1.8.4)
non-stupid-digest-assets (1.0.9)
sprockets (>= 2.0)
oauth (0.5.5)
oauth2 (1.4.4)
oauth (0.5.6)
oauth2 (1.4.7)
faraday (>= 0.8, < 2.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
@ -492,10 +488,10 @@ GEM
rack (>= 1.6.2, < 3)
omniauth-facebook (8.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-google-oauth2 (0.8.1)
omniauth-google-oauth2 (0.8.2)
jwt (>= 2.0)
oauth2 (~> 1.1)
omniauth (>= 1.1.1)
omniauth (~> 1.1)
omniauth-oauth2 (>= 1.6)
omniauth-oauth (1.2.0)
oauth
@ -517,89 +513,70 @@ GEM
paypal-sdk-merchant-jk (1.118.1)
paypal-sdk-core (~> 0.3.0)
pdf-core (0.7.0)
pg (0.17.1)
pg_array_parser (0.0.9)
pleaserun (0.0.31)
pg (1.2.3)
pleaserun (0.0.32)
cabin (> 0)
clamp
dotenv
insist
mustache (= 0.99.8)
stud
postgres-copy (1.2.0)
activerecord (>= 4.0, < 5.1)
postgres-copy (1.5.0)
activerecord (>= 5.1)
pg (>= 0.17)
responders
postgres_ext (3.0.1)
activerecord (~> 4.0)
arel (>= 4.0.1)
pg_array_parser (~> 0.0.9)
power_assert (2.0.0)
prawn (2.2.2)
pdf-core (~> 0.7.0)
ttfunk (~> 1.5)
prawn-table (0.2.2)
prawn (>= 1.3.0, < 3.0.0)
protected_attributes (1.1.4)
activemodel (>= 4.0.1, < 5.0)
pry (0.13.1)
protected_attributes_continued (1.8.1)
activemodel (>= 5.0)
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.6)
puma (5.2.0)
puma (5.3.1)
nio4r (~> 2.0)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
raabro (1.4.0)
rabl (0.13.1)
activesupport (>= 2.3.14)
rack (1.6.13)
rack-oauth2 (1.12.0)
activesupport
attr_required
httpclient
json-jwt (>= 1.11.0)
rack (< 2.1)
rack-protection (1.5.5)
rack (2.2.3)
rack-protection (2.1.0)
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.8)
actionmailer (= 4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
activemodel (= 4.2.8)
activerecord (= 4.2.8)
activesupport (= 4.2.8)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.8)
sprockets-rails
rails-assets-bluebird (3.5.4)
rails-assets-classnames (1.2.2)
rails-assets-react-input-autosize (0.4.5)
rails-assets-react-select (0.6.7)
rails-assets-classnames (>= 1.2.2, < 2)
rails-assets-react-input-autosize (>= 0.4.3, < 0.5)
rails-assets-reflux (0.3.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rack-proxy (0.6.5)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.1.7)
actioncable (= 5.1.7)
actionmailer (= 5.1.7)
actionpack (= 5.1.7)
actionview (= 5.1.7)
activejob (= 5.1.7)
activemodel (= 5.1.7)
activerecord (= 5.1.7)
activesupport (= 5.1.7)
bundler (>= 1.3.0)
railties (= 5.1.7)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails-observers (0.1.5)
activemodel (>= 4.0)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
railties (5.1.7)
actionpack (= 5.1.7)
activesupport (= 5.1.7)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.19.1)
rake (13.0.3)
rb-fsevent (0.10.4)
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
rbvmomi (2.4.1)
@ -608,21 +585,20 @@ GEM
nokogiri (~> 1.5)
optimist (~> 3.0)
rchardet (1.8.0)
react-rails (1.3.3)
react-rails (2.6.1)
babel-transpiler (>= 0.7.0)
coffee-script-source (~> 1.8)
connection_pool
execjs
rails (>= 3.2)
railties (>= 3.2)
tilt
recurly (2.18.16)
redis (3.3.3)
redis-namespace (1.5.3)
redis (~> 3.0, >= 3.0.4)
regexp_parser (1.8.2)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
resque (1.27.4)
mono_logger (~> 1.0)
multi_json (~> 1.0)
@ -667,7 +643,7 @@ GEM
rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-rails (4.0.2)
rspec-rails (4.1.2)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
@ -678,11 +654,14 @@ GEM
rspec-support (3.10.2)
ruby-prof (0.15.9)
ruby-protocol-buffers (1.2.2)
ruby-vips (2.1.2)
ffi (~> 1.12)
ruby-xz (0.2.3)
ffi (~> 1.9)
io-like (~> 0.3)
ruby_parser (3.15.1)
sexp_processor (~> 4.9)
ruby2_keywords (0.0.4)
ruby_parser (3.16.0)
sexp_processor (~> 4.15, >= 4.15.1)
rubyzip (1.2.1)
rufus-scheduler (3.7.0)
fugit (~> 1.1, >= 1.1.6)
@ -708,7 +687,7 @@ GEM
json
sendgrid_toolkit (1.4.0)
httparty (>= 0.7.6)
sexp_processor (4.15.2)
sexp_processor (4.15.3)
show_me_the_cookies (5.0.1)
capybara (>= 2, < 4)
signet (0.5.0)
@ -723,10 +702,11 @@ GEM
simplecov-html (0.7.1)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sinatra (2.1.0)
mustermann (~> 1.0)
rack (~> 2.2)
rack-protection (= 2.1.0)
tilt (~> 2.0)
sitemap_generator (6.1.2)
builder (~> 3.0)
slim (4.1.0)
@ -744,16 +724,17 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
stripe (5.29.0)
ssrf_filter (1.0.7)
stripe (5.32.1)
stud (0.0.23)
temple (0.8.2)
test-unit (3.4.0)
test-unit (3.4.1)
power_assert
thor (1.1.0)
thread_safe (0.3.6)
tilt (2.0.10)
timecop (0.9.2)
ttfunk (1.5.1)
timecop (0.9.4)
ttfunk (1.6.2.1)
twitter (7.0.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
@ -772,25 +753,37 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unicorn (5.8.0)
unicorn (6.0.0)
kgio (~> 2.6)
raindrops (~> 0.7)
uuidtools (2.1.2)
vegas (0.1.11)
rack (>= 1.0.0)
warden (1.2.7)
rack (>= 1.0)
warden (1.2.9)
rack (>= 2.0.9)
webdrivers (4.1.2)
nokogiri (~> 1.6)
rubyzip (~> 1.0)
selenium-webdriver (>= 3.0, < 4.0)
<<<<<<< HEAD
webmock (3.12.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
=======
webpacker (4.3.0)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
webrick (1.7.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
>>>>>>> 010c68037 (pause)
will_paginate (3.3.0)
xml-simple (1.1.8)
xmlrpc (0.3.1)
xmlrpc (0.3.2)
webrick
xpath (3.2.0)
nokogiri (~> 1.8)
zip-codes (0.2.1)
@ -800,7 +793,6 @@ PLATFORMS
DEPENDENCIES
aasm
activerecord-import (~> 0.4.1)
amqp (= 0.9.8)
auto_strip_attributes (= 2.6.0)
aws-sdk (~> 1)
@ -810,16 +802,16 @@ DEPENDENCIES
bugsnag (= 5.3.2)
builder
byebug
capybara
capybara-screenshot (= 1.0.25)
capybara (= 3.32.2)
capybara-screenshot
carmen
carrierwave (= 0.11.2)
carrierwave
carrierwave_direct
cause
coffee-rails
coffee-script-source (= 1.12.2)
database_cleaner (= 1.3.0)
devise (= 3.3.0)
database_cleaner
devise
elasticsearch
em-websocket (>= 0.4.0)
email_validator (= 1.6.0)
@ -828,8 +820,6 @@ DEPENDENCIES
factory_girl_rails
faker (= 1.3.0)
faraday (= 0.9.2)
fb_graph (= 2.5.9)
filepicker-rails (= 0.1.0)
fog
fog-brightbox (= 0.11.0)
fpm
@ -846,8 +836,8 @@ DEPENDENCIES
jam_ruby!
jam_websockets!
jampb!
jquery-rails
jquery-ui-rails (= 4.2.1)
jquery-rails (= 4.4.0)
jquery-ui-rails
kickbox
language_list
launchy (= 2.1.1)
@ -860,32 +850,25 @@ DEPENDENCIES
oj (= 3.1.3)
omniauth
omniauth-facebook
omniauth-google-oauth2
omniauth-google-oauth2 (= 0.8.2)
omniauth-stripe-connect
omniauth-twitter
paypal-sdk-merchant-jk (= 1.118.1)
pg (= 0.17.1)
pg
postgres-copy
postgres_ext
prawn-table
protected_attributes
protected_attributes_continued
pry
puma
quiet_assets
rabl (= 0.13.1)
rack-test
rails (= 4.2.8)
rails-assets-bluebird!
rails-assets-classnames!
rails-assets-react-select (= 0.6.7)!
rails-assets-reflux (= 0.3.0)!
rails (= 5.1.7)
rails-observers
railties (= 4.2.8)
react-rails (= 1.3.3)
react-rails
recurly (= 2.18.16)
redis (= 3.3.3)
redis-namespace (= 1.5.3)
responders (~> 2.0)
responders
resque
resque-dynamic-queues
resque-failed-job-mailer
@ -926,7 +909,11 @@ DEPENDENCIES
unicorn
uuidtools (= 2.1.2)
webdrivers (~> 4.0)
<<<<<<< HEAD
webmock (~> 3.11, >= 3.11.2)
=======
webpacker (= 4.3.0)
>>>>>>> 010c68037 (pause)
will_paginate
zip-codes
@ -934,4 +921,4 @@ RUBY VERSION
ruby 2.4.1p111
BUNDLED WITH
1.17.3
2.2.15

5
web/app/assets/javascripts/application.js
View File

@ -16,10 +16,7 @@
//= require bind-polyfill
//= require jquery
//= require jquery.monkeypatch
//= require jquery_ujs
//= require jquery.ui.datepicker
//= require jquery.ui.draggable
//= require jquery.ui.droppable
////= require jquery_ujs
//= require jquery.bt
//= require jquery.icheck
//= require jquery.color

4
web/app/assets/javascripts/jk2021/jk2021.js
View File

@ -4,12 +4,8 @@
//= require bind-polyfill
//= require jquery
//= require jquery.monkeypatch
//= require jquery_ujs
//= require ./bootstrap.min
//= require ./bootstrap.bundle.min
//= require jquery.ui.draggable
//= require jquery.queryparams
//= require jquery.hoverIntent
//= require jquery.cookie

4
web/app/assets/javascripts/landing/landing.js
View File

@ -4,8 +4,6 @@
//= require bind-polyfill
//= require jquery
//= require jquery.monkeypatch
//= require jquery_ujs
//= require jquery.ui.draggable
//= require jquery.queryparams
//= require jquery.hoverIntent
//= require jquery.cookie
@ -49,4 +47,4 @@
//= require landing/init
//= require landing/signup
//= require_directory ../dialog
//= require everywhere/everywhere
//= require everywhere/everywhere

5
web/app/assets/javascripts/minimal/minimal.js
View File

@ -4,9 +4,6 @@
//= require bind-polyfill
//= require jquery
//= require jquery.monkeypatch
//= require jquery_ujs
//= require jquery.ui.draggable
//= require jquery.ui.droppable
//= require jquery.bt
//= require jquery.icheck
//= require jquery.easydropdown
@ -47,4 +44,4 @@ function initializeInfluxDB() {
window.stats.write = window.stats.writePoint;
}
initializeInfluxDB()
initializeInfluxDB()

2
web/app/assets/javascripts/web/web.js
View File

@ -4,8 +4,6 @@
//= require bind-polyfill
//= require jquery
//= require jquery.monkeypatch
//= require jquery_ujs
//= require jquery.ui.draggable
//= require jquery.queryparams
//= require jquery.hoverIntent
//= require jquery.cookie

4
web/app/assets/stylesheets/client/client.css
View File

@ -10,7 +10,7 @@
*
*= require_self
*= require web/Raleway
*= require jquery.ui.datepicker
*= require jquery-ui/datepicker
*= require jquery.jstarbox
*= require ./ie
*= require jquery.bt
@ -95,4 +95,4 @@
*= require ./teachers
*= require_directory ./react-components
*/
*/

2
web/app/controllers/api_affiliate_controller.rb
View File

@ -1,6 +1,6 @@
class ApiAffiliateController < ApiController
before_filter :api_signed_in_user, :except => [ :create ]
before_action :api_signed_in_user, :except => [ :create ]
include ErrorsHelper

2
web/app/controllers/api_alerts_controller.rb
View File

@ -1,7 +1,7 @@
class ApiAlertsController < ApiController
before_filter :api_signed_in_user, only: :create
before_action :api_signed_in_user, only: :create
def log

4
web/app/controllers/api_backing_tracks_controller.rb
View File

@ -1,9 +1,9 @@
class ApiBackingTracksController < ApiController
# have to be signed in currently to see this screen
before_filter :api_signed_in_user
before_action :api_signed_in_user
before_filter :lookup_recorded_backing_track, :only => [ :backing_track_silent ]
before_action :lookup_recorded_backing_track, :only => [ :backing_track_silent ]
respond_to :json

6
web/app/controllers/api_bands_controller.rb
View File

@ -1,11 +1,11 @@
class ApiBandsController < ApiController
before_filter :api_signed_in_user, :except => [:index, :show, :follower_index]
before_filter :auth_band_member, :only => [:update,
before_action :api_signed_in_user, :except => [:index, :show, :follower_index]
before_action :auth_band_member, :only => [:update,
:recording_create, :recording_update, :recording_destroy,
:invitation_index, :invitation_show, :invitation_create, :invitation_destroy,
:update_photo, :delete_photo, :generate_filepicker_policy]
before_filter :auth_band_admin, :only => [:delete]
before_action :auth_band_admin, :only => [:delete]
respond_to :json

4
web/app/controllers/api_chats_controller.rb
View File

@ -1,6 +1,6 @@
class ApiChatsController < ApiController
before_filter :api_signed_in_user, :check_session
before_action :api_signed_in_user, :check_session
respond_to :json
@ -45,4 +45,4 @@ class ApiChatsController < ApiController
end
end
end

4
web/app/controllers/api_claimed_recordings_controller.rb
View File

@ -1,7 +1,7 @@
class ApiClaimedRecordingsController < ApiController
before_filter :api_signed_in_user, :except => [ :download, :show ]
before_filter :look_up_claimed_recording, :only => [ :show, :update, :delete, :download ]
before_action :api_signed_in_user, :except => [ :download, :show ]
before_action :look_up_claimed_recording, :only => [ :show, :update, :delete, :download ]
respond_to :json

2
web/app/controllers/api_diagnostics_controller.rb
View File

@ -1,6 +1,6 @@
class ApiDiagnosticsController < ApiController
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json
def create

4
web/app/controllers/api_favorites_controller.rb
View File

@ -2,7 +2,7 @@ class ApiFavoritesController < ApiController
respond_to :json
before_filter :api_signed_in_user
before_action :api_signed_in_user
def index
@claimed_recordings, @next = ClaimedRecording.index_favorites(current_user,
@ -23,4 +23,4 @@ class ApiFavoritesController < ApiController
respond_with_model(like)
end
end
end

6
web/app/controllers/api_icecast_controller.rb
View File

@ -24,9 +24,9 @@
=end
class ApiIcecastController < ApiController
before_filter :local_only, :only => [:test]
before_filter :parse_mount, :only => [:mount_add, :mount_remove, :listener_add, :listener_remove]
before_filter :api_signed_in_user, :only => [ :create_source_change ]
before_action :local_only, :only => [:test]
before_action :parse_mount, :only => [:mount_add, :mount_remove, :listener_add, :listener_remove]
before_action :api_signed_in_user, :only => [ :create_source_change ]
# each request will have this in it, if it's icecast.
#user-agent = Icecast 2.3.3

2
web/app/controllers/api_invitations_controller.rb
View File

@ -1,7 +1,7 @@
class ApiInvitationsController < ApiController
# have to be signed in currently to see this screen
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json

4
web/app/controllers/api_invited_users_controller.rb
View File

@ -1,7 +1,7 @@
class ApiInvitedUsersController < ApiController
# have to be signed in currently to see this screen
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json
@ -62,4 +62,4 @@ class ApiInvitedUsersController < ApiController
end
end
end
end

10
web/app/controllers/api_jam_track_mixdowns_controller.rb
View File

@ -1,11 +1,11 @@
class ApiJamTrackMixdownsController < ApiController
# have to be signed in currently to see this screen
before_filter :api_signed_in_user
before_filter :lookup_jam_track_mixdown, :only => [:download, :enqueue, :update]
before_filter :lookup_jam_track_right, :only => [:download, :enqueue, :update]
before_filter :ip_blacklist, :only => [:download]
before_filter :user_blacklist, :only => [:download]
before_action :api_signed_in_user
before_action :lookup_jam_track_mixdown, :only => [:download, :enqueue, :update]
before_action :lookup_jam_track_right, :only => [:download, :enqueue, :update]
before_action :ip_blacklist, :only => [:download]
before_action :user_blacklist, :only => [:download]
respond_to :json
def log

10
web/app/controllers/api_jam_tracks_controller.rb
View File

@ -1,11 +1,11 @@
class ApiJamTracksController < ApiController
# have to be signed in currently to see this screen
before_filter :api_signed_in_user, :except => [:index, :autocomplete, :show_with_artist_info, :artist_index]
before_filter :api_any_user, :only => [:index, :autocomplete, :show_with_artist_info, :artist_index]
before_filter :lookup_jam_track_right, :only => [:download, :enqueue, :show_jam_track_right, :mark_active, :download_stem]
before_filter :ip_blacklist, :only => [:download_stem, :download]
before_filter :user_blacklist, :only => [:download_stem, :download]
before_action :api_signed_in_user, :except => [:index, :autocomplete, :show_with_artist_info, :artist_index]
before_action :api_any_user, :only => [:index, :autocomplete, :show_with_artist_info, :artist_index]
before_action :lookup_jam_track_right, :only => [:download, :enqueue, :show_jam_track_right, :mark_active, :download_stem]
before_action :ip_blacklist, :only => [:download_stem, :download]
before_action :user_blacklist, :only => [:download_stem, :download]
respond_to :json

2
web/app/controllers/api_jamblasters_controller.rb
View File

@ -1,6 +1,6 @@
class ApiJamblastersController < ApiController
before_filter :api_signed_in_user, except: [:login, :store_token, :auth_users, :can_pair, :is_allowed]
before_action :api_signed_in_user, except: [:login, :store_token, :auth_users, :can_pair, :is_allowed]
respond_to :json

2
web/app/controllers/api_join_requests_controller.rb
View File

@ -1,7 +1,7 @@
class ApiJoinRequestsController < ApiController
# have to be signed in currently to see this screen
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json

2
web/app/controllers/api_latency_testers_controller.rb
View File

@ -1,7 +1,7 @@
class ApiLatencyTestersController < ApiController
# have to be signed in currently to see this screen
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json

6
web/app/controllers/api_lesson_bookings_controller.rb
View File

@ -1,8 +1,8 @@
class ApiLessonBookingsController < ApiController
before_filter :api_signed_in_user
before_filter :lookup_lesson_booking, :only => [:accept, :counter, :cancel, :show]
before_filter :auth_lesson_booking, :only => [:accept, :counter, :cancel, :show]
before_action :api_signed_in_user
before_action :lookup_lesson_booking, :only => [:accept, :counter, :cancel, :show]
before_action :auth_lesson_booking, :only => [:accept, :counter, :cancel, :show]
respond_to :json
def index

8
web/app/controllers/api_lesson_sessions_controller.rb
View File

@ -1,9 +1,9 @@
class ApiLessonSessionsController < ApiController
before_filter :api_signed_in_user
before_filter :lookup_lesson, except: [:index, :uncollectable, :rating_decision]
before_filter :is_teacher, only: [:accept]
before_filter :is_student, only: []
before_action :api_signed_in_user
before_action :lookup_lesson, except: [:index, :uncollectable, :rating_decision]
before_action :is_teacher, only: [:accept]
before_action :is_student, only: []
respond_to :json
def index

4
web/app/controllers/api_links_controller.rb
View File

@ -2,8 +2,8 @@ class ApiLinksController < ApiController
respond_to :json
before_filter :api_any_user
before_filter :affiliate_partner
before_action :api_any_user
before_action :affiliate_partner
def log
@log || Logging.logger[ApiLinksController]

6
web/app/controllers/api_mixes_controller.rb
View File

@ -4,9 +4,9 @@ class ApiMixesController < ApiController
# hitting these routes.
CRON_TOKEN = "2kkl39sjjf3ijdsflje2923j"
before_filter :api_signed_in_user, :only => [ :schedule ]
before_filter :require_cron_token, :only => [ :next, :finish ]
before_filter :look_up_mix, :only => [ :finish ]
before_action :api_signed_in_user, :only => [ :schedule ]
before_action :require_cron_token, :only => [ :next, :finish ]
before_action :look_up_mix, :only => [ :finish ]
respond_to :json

2
web/app/controllers/api_music_notations_controller.rb
View File

@ -1,7 +1,7 @@
require 'aws-sdk'
class ApiMusicNotationsController < ApiController
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json

8
web/app/controllers/api_music_sessions_controller.rb
View File

@ -3,10 +3,10 @@ require 'aws-sdk'
class ApiMusicSessionsController < ApiController
# have to be signed in currently to see this screen
before_filter :api_signed_in_user, :except => [ :add_like, :show, :show_history, :add_session_info_comment, :auth ]
before_filter :lookup_session, only: [:show, :update, :delete, :claimed_recording_start, :claimed_recording_stop, :track_sync, :jam_track_open, :jam_track_close, :backing_track_open, :backing_track_close, :metronome_open, :metronome_close, :attach_recording]
before_filter :lookup_perm_session, only: [:get_livestream, :create_livestream, :livestream_transition]
skip_before_filter :api_signed_in_user, only: [:perf_upload]
before_action :api_signed_in_user, :except => [ :add_like, :show, :show_history, :add_session_info_comment ]
before_action :lookup_session, only: [:show, :update, :delete, :claimed_recording_start, :claimed_recording_stop, :track_sync, :jam_track_open, :jam_track_close, :backing_track_open, :backing_track_close, :metronome_open, :metronome_close, :attach_recording]
before_action :lookup_perm_session, only: [:get_livestream, :create_livestream, :livestream_transition]
skip_before_action :api_signed_in_user, only: [:perf_upload]
around_filter :transactions_filter, only:[:sms_index, :ams_index]
respond_to :json

4
web/app/controllers/api_pay_pal_controller.rb
View File

@ -1,6 +1,6 @@
class ApiPayPalController < ApiController
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json
@ -133,4 +133,4 @@ class ApiPayPalController < ApiController
set_purchased_jamtrack_cookie
render :json => response, :status => 200
end
end
end

4
web/app/controllers/api_payment_histories_controller.rb
View File

@ -1,6 +1,6 @@
class ApiPaymentHistoriesController < ApiController
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json
@ -15,4 +15,4 @@ class ApiPaymentHistoriesController < ApiController
@next = data[:next_page]
render "api_payment_histories/index", :layout => nil
end
end
end

8
web/app/controllers/api_posa_cards_controller.rb
View File

@ -1,10 +1,10 @@
require 'sanitize'
class ApiPosaCardsController < ApiController
before_filter :api_signed_in_user, :only => [:claim]
before_filter :posa_http_basic_auth, :only => [:activate]
before_action :api_signed_in_user, :only => [:claim]
before_action :posa_http_basic_auth, :only => [:activate]
#before_filter :lookup_review_summary, :only => [:details]
#before_filter :lookup_review, :only => [:update, :delete, :show]
#before_action :lookup_review_summary, :only => [:details]
#before_action :lookup_review, :only => [:update, :delete, :show]
respond_to :json

12
web/app/controllers/api_recordings_controller.rb
View File

@ -1,11 +1,11 @@
class ApiRecordingsController < ApiController
before_filter :api_signed_in_user, :except => [ :add_like ]
before_action :api_signed_in_user, :except => [ :add_like ]
before_filter :lookup_recording, :only => [ :show, :stop, :claim, :discard, :keep, :delete_claim, :add_timeline, :add_video_data, :delete_video_data, :mobile_upload, :mobile_update, :mobile_upload_download, :mobile_upload_delete ]
before_filter :lookup_recorded_track, :only => [ :download, :upload_next_part, :upload_sign, :upload_part_complete, :upload_complete ]
before_filter :lookup_recorded_backing_track, :only => [ :backing_track_download, :backing_track_upload_next_part, :backing_track_upload_sign, :backing_track_upload_part_complete, :backing_track_upload_complete ]
before_filter :lookup_recorded_video, :only => [ :video_upload_sign, :video_upload_start, :video_upload_complete ]
before_filter :lookup_stream_mix, :only => [ :upload_next_part_stream_mix, :upload_sign_stream_mix, :upload_part_complete_stream_mix, :upload_complete_stream_mix ]
before_action :lookup_recording, :only => [ :show, :stop, :claim, :discard, :keep, :delete_claim, :add_timeline, :add_video_data, :delete_video_data, :mobile_upload, :mobile_update, :mobile_upload_download, :mobile_upload_delete ]
before_action :lookup_recorded_track, :only => [ :download, :upload_next_part, :upload_sign, :upload_part_complete, :upload_complete ]
before_action :lookup_recorded_backing_track, :only => [ :backing_track_download, :backing_track_upload_next_part, :backing_track_upload_sign, :backing_track_upload_part_complete, :backing_track_upload_complete ]
before_action :lookup_recorded_video, :only => [ :video_upload_sign, :video_upload_start, :video_upload_complete ]
before_action :lookup_stream_mix, :only => [ :upload_next_part_stream_mix, :upload_sign_stream_mix, :upload_part_complete_stream_mix, :upload_complete_stream_mix ]
respond_to :json

10
web/app/controllers/api_recurly_controller.rb
View File

@ -1,9 +1,9 @@
require 'jam_ruby/recurly_client'
class ApiRecurlyController < ApiController
before_filter :api_signed_in_user, :except => [:create_account]
before_filter :create_client
before_filter :ip_blacklist, :only => [:place_order]
before_filter :user_blacklist, :only => [:place_order]
before_action :api_signed_in_user, :except => [:create_account]
before_action :create_client
before_action :ip_blacklist, :only => [:place_order]
before_action :user_blacklist, :only => [:place_order]
respond_to :json
@ -322,4 +322,4 @@ class ApiRecurlyController < ApiController
}
end
end # class
end # class

2
web/app/controllers/api_recurly_web_hook_controller.rb
View File

@ -2,7 +2,7 @@ class ApiRecurlyWebHookController < ApiController
http_basic_authenticate_with name: Rails.application.config.recurly_webhook_user, password: Rails.application.config.recurly_webhook_pass
before_filter :api_signed_in_user, only: []
before_action :api_signed_in_user, only: []
#respond_to :xml

10
web/app/controllers/api_retailer_invitations_controller.rb
View File

@ -1,10 +1,10 @@
class ApiRetailerInvitationsController < ApiController
before_filter :api_signed_in_user
before_filter :lookup_retailer, :only => [:index, :create]
before_filter :auth_retailer, :only => [:index, :create]
before_filter :lookup_retailer_invitation, :only => [:delete, :resend]
before_filter :auth_retailer_invitation, :only => [:delete, :resend]
before_action :api_signed_in_user
before_action :lookup_retailer, :only => [:index, :create]
before_action :auth_retailer, :only => [:index, :create]
before_action :lookup_retailer_invitation, :only => [:delete, :resend]
before_action :auth_retailer_invitation, :only => [:delete, :resend]
respond_to :json

6
web/app/controllers/api_retailers_controller.rb
View File

@ -1,8 +1,8 @@
class ApiRetailersController < ApiController
before_filter :api_signed_in_user, :except => [:customer_email]
before_filter :lookup_retailer, :only => [:show, :update, :update_avatar, :delete_avatar, :generate_filepicker_policy, :remove_student, :remove_teacher, :customer_email]
before_filter :auth_retailer, :only => [:show, :update, :update_avatar, :delete_avatar, :generate_filepicker_policy, :remove_student, :remove_teacher]
before_action :api_signed_in_user, :except => [:customer_email]
before_action :lookup_retailer, :only => [:show, :update, :update_avatar, :delete_avatar, :generate_filepicker_policy, :remove_student, :remove_teacher, :customer_email]
before_action :auth_retailer, :only => [:show, :update, :update_avatar, :delete_avatar, :generate_filepicker_policy, :remove_student, :remove_teacher]
respond_to :json

6
web/app/controllers/api_reviews_controller.rb
View File

@ -1,8 +1,8 @@
require 'sanitize'
class ApiReviewsController < ApiController
before_filter :api_signed_in_user, :except => [:index]
before_filter :lookup_review_summary, :only => [:details]
before_filter :lookup_review, :only => [:update, :delete, :show]
before_action :api_signed_in_user, :except => [:index]
before_action :lookup_review_summary, :only => [:details]
before_action :lookup_review, :only => [:update, :delete, :show]
respond_to :json

4
web/app/controllers/api_rsvp_requests_controller.rb
View File

@ -1,6 +1,6 @@
class ApiRsvpRequestsController < ApiController
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json
@ -56,4 +56,4 @@ class ApiRsvpRequestsController < ApiController
respond_with responder: ApiResponder, :status => 204
end
end
end

4
web/app/controllers/api_rsvp_slots_controller.rb
View File

@ -1,6 +1,6 @@
class ApiRsvpSlotsController < ApiController
# before_filter :auth_user
# before_action :auth_user
respond_to :json
@ -33,4 +33,4 @@ class ApiRsvpSlotsController < ApiController
# respond_with @rsvp, responder: ApiResponder, :status => 201
# end
# end
end
end

4
web/app/controllers/api_sales_controller.rb
View File

@ -1,6 +1,6 @@
class ApiSalesController < ApiController
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json
@ -15,4 +15,4 @@ class ApiSalesController < ApiController
@next = data[:next_page]
render "api_sales/index", :layout => nil
end
end
end

10
web/app/controllers/api_school_invitations_controller.rb
View File

@ -1,11 +1,11 @@
class
ApiSchoolInvitationsController < ApiController
before_filter :api_signed_in_user
before_filter :lookup_school, :only => [:index, :create]
before_filter :auth_school, :only => [:index, :create]
before_filter :lookup_school_invitation, :only => [:delete, :resend]
before_filter :auth_school_invitation, :only => [:delete, :resend]
before_action :api_signed_in_user
before_action :lookup_school, :only => [:index, :create]
before_action :auth_school, :only => [:index, :create]
before_action :lookup_school_invitation, :only => [:delete, :resend]
before_action :auth_school_invitation, :only => [:delete, :resend]
respond_to :json

6
web/app/controllers/api_schools_controller.rb
View File

@ -1,8 +1,8 @@
class ApiSchoolsController < ApiController
before_filter :api_signed_in_user
before_filter :lookup_school, :only => [:show, :update, :update_avatar, :delete_avatar, :generate_filepicker_policy, :remove_student, :remove_teacher]
before_filter :auth_school, :only => [:show, :update, :update_avatar, :delete_avatar, :generate_filepicker_policy, :remove_student, :remove_teacher]
before_action :api_signed_in_user
before_action :lookup_school, :only => [:show, :update, :update_avatar, :delete_avatar, :generate_filepicker_policy, :remove_student, :remove_teacher]
before_action :auth_school, :only => [:show, :update, :update_avatar, :delete_avatar, :generate_filepicker_policy, :remove_student, :remove_teacher]
respond_to :json

2
web/app/controllers/api_scoring_controller.rb
View File

@ -1,7 +1,7 @@
class ApiScoringController < ApiController
respond_to :json
before_filter :api_signed_in_user
before_action :api_signed_in_user
def work # clientid; returns another clientid
clientid = params[:clientid]

2
web/app/controllers/api_search_controller.rb
View File

@ -1,7 +1,7 @@
class ApiSearchController < ApiController
# have to be signed in currently to see this screen
before_filter :api_signed_in_user, :except => :jam_tracks
before_action :api_signed_in_user, :except => :jam_tracks
respond_to :json

2
web/app/controllers/api_shopping_carts_controller.rb
View File

@ -1,6 +1,6 @@
class ApiShoppingCartsController < ApiController
before_filter :api_any_user
before_action :api_any_user
respond_to :json

4
web/app/controllers/api_signup_hints_controller.rb
View File

@ -1,7 +1,7 @@
class ApiSignupHintsController < ApiController
before_filter :api_anonymous_user, except: [:create_redirect]
before_filter :api_signed_in_user, only: [:create_redirect]
before_action :api_anonymous_user, except: [:create_redirect]
before_action :api_signed_in_user, only: [:create_redirect]
respond_to :json

2
web/app/controllers/api_stripe_controller.rb
View File

@ -1,6 +1,6 @@
class ApiStripeController < ApiController
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json
def store

2
web/app/controllers/api_teacher_distributions_controller.rb
View File

@ -1,6 +1,6 @@
class ApiTeacherDistributionsController < ApiController
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json
def index

6
web/app/controllers/api_teachers_controller.rb
View File

@ -1,8 +1,8 @@
class ApiTeachersController < ApiController
before_filter :api_signed_in_user, :except => [:index, :detail, :search, :search_help]
before_filter :auth_teacher, :only => [:update, :delete]
before_filter :auth_user, :only => [:create, :update]
before_action :api_signed_in_user, :except => [:index, :detail, :search, :search_help]
before_action :auth_teacher, :only => [:update, :delete]
before_action :auth_user, :only => [:create, :update]
respond_to :json

4
web/app/controllers/api_text_messages_controller.rb
View File

@ -1,7 +1,7 @@
require 'sanitize'
class ApiTextMessagesController < ApiController
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json
@ -16,4 +16,4 @@ class ApiTextMessagesController < ApiController
respond_with @text_message
end
end
end

2
web/app/controllers/api_twitters_controller.rb
View File

@ -1,6 +1,6 @@
class ApiTwittersController < ApiController
before_filter :api_signed_in_user
before_action :api_signed_in_user
respond_to :json

4
web/app/controllers/api_user_syncs_controller.rb
View File

@ -3,8 +3,8 @@
class ApiUserSyncsController < ApiController
before_filter :api_signed_in_user, :except => [ ]
before_filter :auth_user
before_action :api_signed_in_user, :except => [ ]
before_action :auth_user
respond_to :json

10
web/app/controllers/api_users_controller.rb
View File

@ -1,9 +1,8 @@
require 'sanitize'
class ApiUsersController < ApiController
before_filter :api_signed_in_user, :except => [:create, :calendar, :show, :signup_confirm, :auth_session_create, :complete, :finalize_update_email, :isp_scoring, :add_play, :crash_dump, :user_assets, :validate_data, :google_auth, :user_event, :onboardings, :update_onboarding, :show_onboarding]
before_filter :auth_user, :only => [:session_settings_show, :session_history_index, :session_user_history_index, :update, :delete, :authorizations, :test_drive_status,
before_action :api_signed_in_user, :except => [:create, :calendar, :show, :signup_confirm, :auth_session_create, :complete, :finalize_update_email, :isp_scoring, :add_play, :crash_dump, :validate_data, :google_auth, :user_event, :onboardings, :update_onboarding, :show_onboarding]
before_action :auth_user, :only => [:session_settings_show, :session_history_index, :session_user_history_index, :update, :delete, :authorizations, :test_drive_status,
:liking_create, :liking_destroy, # likes
:following_create, :following_show, :following_destroy, # followings
:recording_update, :recording_destroy, # recordings
@ -14,9 +13,14 @@ class ApiUsersController < ApiController
:band_invitation_index, :band_invitation_show, :band_invitation_update, # band invitations
:set_password, :begin_update_email, :update_avatar, :delete_avatar, :generate_filepicker_policy,
:share_session, :share_recording,
<<<<<<< HEAD
:affiliate_report, :audio_latency, :get_latencies, :broadcast_notification, :redeem_giftcard]
before_filter :ip_blacklist, :only => [:create, :redeem_giftcard]
=======
:affiliate_report, :audio_latency, :broadcast_notification, :redeem_giftcard]
before_action :ip_blacklist, :only => [:create, :redeem_giftcard]
>>>>>>> 010c68037 (pause)
respond_to :json, :except => :calendar
respond_to :ics, :only => :calendar

10
web/app/controllers/application_controller.rb
View File

@ -10,15 +10,15 @@ class ApplicationController < ActionController::Base
# inject username/email into bugsnag data
before_bugsnag_notify :add_user_info_to_bugsnag
before_filter do
before_action do
gon_setup
end
before_filter :set_tracking_cookie
before_filter :track_affiliate_visits
before_filter :track_origin
before_action :set_tracking_cookie
before_action :track_affiliate_visits
before_action :track_origin
#before_filter do
#before_action do
# if params[AffiliatePartner::PARAM_REFERRAL].present? && current_user.nil?
# if cookies[AffiliatePartner::PARAM_COOKIE].blank?
# code = params[AffiliatePartner::PARAM_REFERRAL].downcase

4
web/app/controllers/extras_controller.rb
View File

@ -1,7 +1,7 @@
class ExtrasController < ApplicationController
before_filter :signed_in_user
before_filter :admin_user
before_action :signed_in_user
before_action :admin_user
def settings
render layout: "web"

2
web/app/controllers/landings_controller.rb
View File

@ -4,7 +4,7 @@ class LandingsController < ApplicationController
respond_to :html
before_filter :posa_http_basic_auth, only: [:posa_activation]
before_action :posa_http_basic_auth, only: [:posa_activation]
def watch_bands
@promo_buzz = PromoBuzz.active

2
web/app/controllers/sessions_controller.rb
View File

@ -1,7 +1,7 @@
# this is not a jam session - this is an 'auth session'
class SessionsController < ApplicationController
before_filter :api_signed_in_user, only: :paypal_express_checkout
before_action :api_signed_in_user, only: :paypal_express_checkout
layout "web"

10
web/app/controllers/users_controller.rb
View File

@ -16,12 +16,12 @@ class UsersController < ApplicationController
include ClientHelper
before_filter :signed_in_user,
before_action :signed_in_user,
only: [:index, :edit, :update, :destroy]
before_filter :correct_user, only: [:edit, :update]
before_filter :admin_user, only: :destroy
before_filter :is_native_client
before_filter :ip_blacklist, :only => [:create]
before_action :correct_user, only: [:edit, :update]
before_action :admin_user, only: :destroy
before_action :is_native_client
before_action :ip_blacklist, :only => [:create]
rescue_from 'JamRuby::PermissionError' do |exception|
@exception = exception

4
web/app/helpers/client_helper.rb
View File

@ -59,8 +59,8 @@ module ClientHelper
end
gon.check_for_client_updates = Rails.application.config.check_for_client_updates
gon.fp_apikey = Rails.application.config.filepicker_rails.api_key
gon.fp_upload_dir = Rails.application.config.filepicker_upload_dir
#gon.fp_apikey = Rails.application.config.filepicker_rails.api_key
#gon.fp_upload_dir = Rails.application.config.filepicker_upload_dir
gon.allow_force_native_client = Rails.application.config.allow_force_native_client
gon.ftue_io_wait_time = Rails.application.config.ftue_io_wait_time
gon.ftue_packet_rate_treshold = Rails.application.config.ftue_packet_rate_treshold

23
web/app/javascript/packs/events.js Normal file
View File

@ -0,0 +1,23 @@
/* eslint no-console:0 */
// This file is automatically compiled by Webpack, along with any other files
// present in this directory. You're encouraged to place your actual application logic in
// a relevant structure within app/javascript and only use these pack files to reference
// that code so it'll be compiled.
//
// To reference this file, add <%= javascript_pack_tag 'events' %> to the appropriate
// layout file, like app/views/layouts/application.html.erb
// Uncomment to copy all static images under ../images to the output folder and reference
// them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>)
// or the `imagePath` JavaScript helper below.
//
// const images = require.context('../images', true)
// const imagePath = (name) => images(name, true)
console.log('Hello World from Webpacker')
import 'core-js/stable'
import 'regenerator-runtime/runtime'
import React from 'react'

4
web/app/uploaders/image_uploader.rb
View File

@ -2,8 +2,8 @@
class ImageUploader < CarrierWave::Uploader::Base
include CarrierWaveDirect::Uploader
include CarrierWave::MimeTypes
process :set_content_type
#include CarrierWave::MimeTypes
#process :set_content_type
def initialize(*)

4
web/app/views/layouts/events.html.erb
View File

@ -23,7 +23,7 @@
<body class="events <%= yield(:page_name) %>">
<div id="basic-container">
<script src="https://cdn.plyr.io/3.5.10/plyr.polyfilled.js"></script>
<%= javascript_include_tag "events/events" %>
<%= javascript_pack_tag 'events' %>
<div class="wrapper">
<%= yield %>
<div id="footer">
@ -41,4 +41,4 @@
<%= render 'dialogs/banner' %>
<%= render "shared/ga" %>
</body>
</html>
</html>

8
web/config/application.rb
View File

@ -103,8 +103,8 @@ if defined?(Bundler)
config.rabbitmq_port = 5672
# filepicker app configured to use S3 bucket jamkazam-dev
config.filepicker_rails.api_key = "Asx4wh6GSlmpAAzoM0Cunz"
config.filepicker_upload_dir = 'avatars'
#config.filepicker_rails.api_key = "Asx4wh6GSlmpAAzoM0Cunz"
#config.filepicker_upload_dir = 'avatars'
config.fp_secret = 'FTDL4TYDENBWZKK3UZCFIQWXS4'
config.recaptcha_enable = true
@ -112,7 +112,7 @@ if defined?(Bundler)
config.recaptcha_public_key = '6Let8dgSAAAAAFheKGWrs6iaq_hIlPOZ2f3Bb56B'
config.recaptcha_private_key = '6Let8dgSAAAAAJzFxL9w2QR5auxjk0ol1_xAtOGO'
config.active_record.raise_in_transactional_callbacks = true
#config.active_record.raise_in_transactional_callbacks = true
# create one user per real jamkazam employee?
config.bootstrap_dev_users = true
@ -316,7 +316,7 @@ if defined?(Bundler)
# we have to do this for a while until all www.jamkazam.com cookies are gone,
# and only .jamkazam.com cookies are around.. 2016?
config.middleware.insert_before "ActionDispatch::Cookies", "Middlewares::ClearDuplicatedSession"
#config.middleware.insert_before "ActionDispatch::Cookies", "Middlewares::ClearDuplicatedSession"
config.network_test_required = false
# how long should the frontend wait for the IO to stabilize before asking for a IO score?
config.ftue_io_wait_time = 5

2
web/config/environments/development.rb
View File

@ -17,6 +17,8 @@ SampleApp::Application.configure do
# since you don't have to restart the web server when you make code changes.
config.cache_classes = false
config.assets.quiet = true
# Log error messages when you accidentally call methods on nil.
config.whiny_nils = true

2
web/config/environments/production.rb
View File

@ -80,7 +80,7 @@ SampleApp::Application.configure do
config.cloudfront_host = "d34f55ppvvtgi3.cloudfront.net"
# filepicker app configured to use S3 bucket jamkazam
config.filepicker_rails.api_key = "AhUoVoBZSLirP3esyCl7Zz"
#config.filepicker_rails.api_key = "AhUoVoBZSLirP3esyCl7Zz"
config.fp_secret = 'HZBIMSOI5VAQ5LXT4XLG6XA7IE'
config.allow_force_native_client = false

18
web/package.json
View File

@ -1,16 +1,20 @@
{
"name": "jam-web",
"dependencies" : {
"dependencies": {
"@rails/webpacker": "^4.3.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"browserify": "~> 6.3",
"browserify-incremental": "^1.4.0",
"coffee-reactify": "~>3.0.0",
"coffeeify": "~> 0.6",
"react": "0.13.3",
"react-input-autosize": "0.5.3",
"react-select": "0.5.6",
"react-tools": "^0.13.3",
"reactify": "^0.17.1",
"coffee-reactify": "~>3.0.0",
"react": "^0.12.0",
"react-tools": "^0.12.1"
"reflux": "0.2.1"
},
"engines": {
"node": ">= 0.10"
"devDependencies": {
"webpack-dev-server": "^3.11.2"
}
}

2
web/spec/factories.rb
View File

@ -746,7 +746,7 @@ FactoryGirl.define do
association :user, factory: :user
association :jam_track, factory: :jam_track
sequence(:name) { |n| "mixdown-#{n}"}
settings {speed:5}
settings {{speed:5}}
end
factory :jam_track_mixdown_package, :class => JamRuby::JamTrackMixdownPackage do