seth
/
jam-cloud
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

wip

This commit is contained in:
Seth Call 2015-08-21 04:15:37 -05:00
parent cdc734e331
commit 7380cfc69f
16 changed files with 176 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
admin/Gemfile
View File

@ -14,40 +14,40 @@ else
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
end
gem 'rails', '~> 3.2.22'
gem 'rails', '> 4.2'
gem 'bootstrap-sass', '2.0.4'
gem 'bcrypt-ruby', '3.0.1'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'sass-rails' #, '~> 3.2.3'
gem 'coffee-rails' #, '~> 3.2.1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', :platforms => :ruby
gem 'uglifier', '>= 1.0.3'
gem 'uglifier' #, '>= 1.0.3'
# this version is pinned due to this: https://github.com/gregbell/active_admin/issues/1939
gem 'coffee-script-source', '~> 1.4.0' # ADD THIS LINE, 1.5.0 doesn't compile ActiveAdmin JavaScript files
gem 'coffee-script-source' #, '~> 1.4.0' # ADD THIS LINE, 1.5.0 doesn't compile ActiveAdmin JavaScript files
end
gem 'devise', '3.3.0'
gem 'will_paginate', '3.0.3'
gem 'bootstrap-will_paginate', '0.0.6'
gem 'carrierwave', '0.9.0'
gem 'carrierwave' #, '0.9.0'
gem 'carrierwave_direct'
gem 'uuidtools', '2.1.2'
gem 'jquery-rails' # , '2.3.0' # pinned because jquery-ui-rails was split from jquery-rails, but activeadmin doesn't support this gem yet
gem 'jquery-ui-rails', '4.2.1'
gem 'rails3-jquery-autocomplete'
gem 'activeadmin' #, github: 'activeadmin', branch: '0-6-stable'
gem 'activeadmin' , github: 'activeadmin', branch: 'master'
gem 'mime-types', '1.25'
gem 'meta_search'
gem 'fog', "~> 1.32.0"
gem 'unf', '0.1.3' #optional fog dependency
gem 'country-select'
gem 'aasm', '3.0.16'
gem 'aasm' #, '3.0.16'
gem 'postgres-copy', '0.6.0'
gem 'aws-sdk', '~> 1'
gem 'bugsnag'
@ -105,8 +105,8 @@ group :development, :test do
gem 'jasmine', '1.3.1'
gem 'execjs', '1.4.0'
#gem 'therubyracer' #, '0.11.0beta8'
gem 'factory_girl_rails', '4.1.0'
gem 'database_cleaner', '0.7.0'
gem 'factory_girl_rails' # , '4.1.0'
gem 'database_cleaner' #, '0.7.0'
gem 'launchy'
gem 'faker', '1.3.0'
gem 'puma'

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

@ -28,9 +28,6 @@ JamAdmin::Application.configure do
# Raise exception on mass assignment protection for Active Record models
config.active_record.mass_assignment_sanitizer = :strict
# Log the query plan for queries taking more than this (works
# with SQLite, MySQL, and PostgreSQL)
config.active_record.auto_explain_threshold_in_seconds = 0.5
# Do not compress assets
config.assets.compress = false

4
admin/config/environments/production.rb
View File

@ -63,10 +63,6 @@ JamAdmin::Application.configure do
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
# Log the query plan for queries taking more than this (works
# with SQLite, MySQL, and PostgreSQL)
# config.active_record.auto_explain_threshold_in_seconds = 0.5
# Set the logging destination(s)
config.log_to = %w[file]

4
web/Gemfile
View File

@ -37,13 +37,13 @@ gem 'em-websocket', '>=0.4.0' #, :path => '/Users/seth/workspace/em-websocket'
gem 'uuidtools', '2.1.2'
gem 'ruby-protocol-buffers', '1.2.2'
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' #, '1.1.3' # 1.1.4 throws an exception on startup about !initialize on nil
gem 'rabl', '0.11.0' # for JSON API development
gem 'gon', '~>4.1.0' # for passthrough of Ruby variables to Javascript variables
gem 'eventmachine', '1.0.4'
gem 'faraday', '~>0.9.0'
gem 'amqp', '0.9.8'
gem 'logging-rails', :require => 'logging/rails'
#gem 'logging-rails', :require => 'logging/rails'
gem 'omniauth', '1.1.1'
gem 'omniauth-facebook', '1.4.1'
gem 'omniauth-twitter'

2
web/app/assets/stylesheets/client/jamkazam.css.scss
View File

@ -4,6 +4,8 @@
* <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" /> */
//@import "client/reset.css.scss";
@import "compass/reset";
@import "compass/css3/images";
@import "compass/css3/background-size";

43
web/app/assets/stylesheets/client/reset.css.scss Normal file
View File

@ -0,0 +1,43 @@
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}

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

@ -79,6 +79,7 @@ class ApiMusicSessionsController < ApiController
# TODO: if you're the creator of a session it will be treated the same as if you had rsvp'd and been accepted.
ActiveRecord::Base.transaction do
@music_sessions, @user_scores = MusicSession.sms_index(current_user, params)
return
end
end

8
web/app/helpers/users_helper.rb
View File

@ -16,10 +16,10 @@ module UsersHelper
instrument_list = []
# instruments are all denormalized into json arrays. fix em up into an instrument_list on the user object
instrument_ids = JSON.parse(approved_rsvp[:instrument_ids])
instrument_descs = JSON.parse(approved_rsvp[:instrument_descriptions])
instrument_proficiencies = JSON.parse(approved_rsvp[:instrument_proficiencies])
rsvp_request_id = JSON.parse(approved_rsvp[:rsvp_request_ids])[0] # there should always be only one
instrument_ids = approved_rsvp[:instrument_ids]
instrument_descs = approved_rsvp[:instrument_descriptions]
instrument_proficiencies = approved_rsvp[:instrument_proficiencies]
rsvp_request_id = approved_rsvp[:rsvp_request_ids][0] # there should always be only one
instrument_ids.each_with_index do |instrument_id, i|
desc = instrument_descs[i]

3
web/app/views/clients/_account_session_properties.html.haml
View File

@ -35,7 +35,8 @@
Time Zone:
.right-column
%select#timezone-prop-list{style: "width: 100%"}
- ActiveSupport::TimeZone.zones_map.each do |name, tz|
- ActiveSupport::TimeZone.zones_map.keys.each do |name|
- tz = ActiveSupport::TimeZone.zones_map[name]
%option.label{value: "#{name},#{tz.tzinfo.name}", 'data-tz'=>tz.tzinfo.name, 'data-utc-offset' => tz.utc_offset} #{tz.to_s}
.clearall.left-column
Recurring:

3
web/app/views/clients/_scheduledSession.html.erb
View File

@ -142,7 +142,8 @@
<div class="clearall left ib w35 h40">Time Zone:</div>
<div class="right ib w65 h40 timezone-list-holder">
<select id="timezone-list" class="w100">
<% ActiveSupport::TimeZone.zones_map.each do |name, tz| %>
<% ActiveSupport::TimeZone.zones_map.keys do |name| %>
<% tz = ActiveSupport::TimeZone.zones_map[name] %>
<option value="<%= name + ',' + tz.tzinfo.name %>" class="label" data-tz="<%= tz.tzinfo.name %>" data-utc-offset="<%= tz.utc_offset %>"><%= tz.to_s %></option>
<% end %>
</select>

2
web/config/application.rb
View File

@ -66,7 +66,7 @@ if defined?(Bundler)
# This will create an empty whitelist of attributes available for mass-assignment for all models
# in your app. As such, your models will need to explicitly whitelist or blacklist accessible
# parameters by using an attr_accessible or attr_protected declaration.
config.active_record.whitelist_attributes = true
#config.active_record.whitelist_attributes = true
# Enable the asset pipeline
config.assets.enabled = true

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

@ -37,10 +37,6 @@ SampleApp::Application.configure do
# Raise exception on mass assignment protection for Active Record models
config.active_record.mass_assignment_sanitizer = :strict
# Log the query plan for queries taking more than this (works
# with SQLite, MySQL, and PostgreSQL)
config.active_record.auto_explain_threshold_in_seconds = 0.5
# Do not compress assets
config.assets.compress = false

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

@ -63,10 +63,6 @@ SampleApp::Application.configure do
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
# Log the query plan for queries taking more than this (works
# with SQLite, MySQL, and PostgreSQL)
# config.active_record.auto_explain_threshold_in_seconds = 0.5
# Set the logging destination(s)
config.log_to = %w[file]

1
web/config/initializers/secret_token.rb
View File

@ -5,3 +5,4 @@
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
SampleApp::Application.config.secret_token = 'ced345e01611593c1b783bae98e4e56dbaee787747e92a141565f7c61d0ab2c6f98f7396fb4b178258301e2713816e158461af58c14b695901692f91e72b6200'
SampleApp::Application.config.secret_key_base = 'ced345e01611593c1b783bae98e4e56dbaee787747e92a141565f7c61d0ab2c6f98f7396fb4b178258301e2713816e158461af58c14b695901692f91e72b6200'

216
web/config/routes.rb
View File

@ -11,94 +11,94 @@ Rails.application.routes.draw do
root to: 'users#home'
# signup, and signup completed, related pages
match '/signup', to: 'users#new', :via => 'get'
match '/signup', to: 'users#create', :via => 'post'
match '/congratulations_musician', to: 'users#congratulations_musician'
match '/congratulations_fan', to: 'users#congratulations_fan'
match '/downloads', to: 'users#downloads'
get '/signup', to: 'users#new'
post '/signup', to: 'users#create'
get '/congratulations_musician', to: 'users#congratulations_musician'
get '/congratulations_fan', to: 'users#congratulations_fan'
get '/downloads', to: 'users#downloads'
match '/signin', to: 'sessions#signin', via: :get
match '/signin', to: 'sessions#create', via: :post
match '/signout', to: 'sessions#destroy', via: :delete
get '/signin', to: 'sessions#signin'
post '/signin', to: 'sessions#create'
delete '/signout', to: 'sessions#destroy'
# landing pages
match '/landing/wb', to: 'landings#watch_bands', via: :get, as: 'landing_wb'
match '/landing/wo', to: 'landings#watch_overview', via: :get, as: 'landing_wo'
match '/landing/wbt', to: 'landings#watch_bands_tight', via: :get, as: 'landing_wbt'
match '/landing/wot', to: 'landings#watch_overview_tight', via: :get, as: 'landing_wot'
match '/landing/kick', to: 'landings#watch_overview_kick', via: :get, as: 'landing_kick'
match '/landing/kick2', to: 'landings#watch_overview_kick2', via: :get, as: 'landing_kick2'
match '/landing/kick3', to: 'landings#watch_overview_kick3', via: :get, as: 'landing_kick3'
match '/landing/kick4', to: 'landings#watch_overview_kick4', via: :get, as: 'landing_kick4'
match '/landing/jamtracks/:plan_code', to: 'landings#individual_jamtrack', via: :get, as: 'individual_jamtrack'
match '/landing/jamtracks/band/:plan_code', to: 'landings#individual_jamtrack_band', via: :get, as: 'individual_jamtrack_band'
get '/landing/wb', to: 'landings#watch_bands', as: 'landing_wb'
get '/landing/wo', to: 'landings#watch_overview', as: 'landing_wo'
get '/landing/wbt', to: 'landings#watch_bands_tight', as: 'landing_wbt'
get '/landing/wot', to: 'landings#watch_overview_tight', as: 'landing_wot'
get '/landing/kick', to: 'landings#watch_overview_kick', as: 'landing_kick'
get '/landing/kick2', to: 'landings#watch_overview_kick2', as: 'landing_kick2'
get '/landing/kick3', to: 'landings#watch_overview_kick3', as: 'landing_kick3'
get '/landing/kick4', to: 'landings#watch_overview_kick4', as: 'landing_kick4'
get '/landing/jamtracks/:plan_code', to: 'landings#individual_jamtrack', as: 'individual_jamtrack'
get '/landing/jamtracks/band/:plan_code', to: 'landings#individual_jamtrack_band', as: 'individual_jamtrack_band'
# these are the older versions of the landing pages
match '/landing/jamtracks/v1/:plan_code', to: 'landings#individual_jamtrack_v1', via: :get, as: 'individual_jamtrack_v1'
match '/landing/jamtracks/v1/band/:plan_code', to: 'landings#individual_jamtrack_band_v1', via: :get, as: 'individual_jamtrack_band_v1'
get '/landing/jamtracks/v1/:plan_code', to: 'landings#individual_jamtrack_v1', as: 'individual_jamtrack_v1'
get '/landing/jamtracks/v1/band/:plan_code', to: 'landings#individual_jamtrack_band_v1', as: 'individual_jamtrack_band_v1'
match '/affiliateProgram', to: 'landings#affiliate_program', via: :get, as: 'affiliate_program'
get '/affiliateProgram', to: 'landings#affiliate_program', as: 'affiliate_program'
match '/affiliate/links/:id', to: 'affiliates#links', via: :get, as: 'affilate_links'
get '/affiliate/links/:id', to: 'affiliates#links', as: 'affilate_links'
# redirect /jamtracks to jamtracks browse page
get '/jamtracks', to: redirect('/client#/jamtrack/search')
# product pages
match '/products/jamblaster', to: 'landings#product_jamblaster', via: :get, as: 'product_jamblaster'
match '/products/platform', to: 'landings#product_platform', via: :get, as: 'product_platform'
match '/products/jamtracks', to: 'landings#product_jamtracks', via: :get, as: 'product_jamtracks'
get '/products/jamblaster', to: 'landings#product_jamblaster', as: 'product_jamblaster'
get '/products/platform', to: 'landings#product_platform', as: 'product_platform'
get '/products/jamtracks', to: 'landings#product_jamtracks', as: 'product_jamtracks'
# oauth
match '/auth/:provider/callback', :to => 'sessions#oauth_callback'
match '/auth/failure', :to => 'sessions#failure'
match '/auth/has_google_auth', :to => 'sessions#has_google_auth'
get '/auth/:provider/callback', :to => 'sessions#oauth_callback'
get '/auth/failure', :to => 'sessions#failure'
get '/auth/has_google_auth', :to => 'sessions#has_google_auth'
# session info page
match '/_sessions/:id/details' => 'music_sessions#session_info', :via => :get, :as => 'music_scheduled_session_detail'
get '/sessions/:id/details' => 'music_sessions#session_info', :as => 'music_scheduled_session_detail'
# session / recording landing pages
match '/_sessions/:id' => 'music_sessions#show', :via => :get, :as => 'music_session_detail'
match '/recordings/:id' => 'recordings#show', :via => :get, :as => 'recording_detail'
get '/sessions/:id' => 'music_sessions#show', :as => 'music_session_detail'
get '/recordings/:id' => 'recordings#show', :as => 'recording_detail'
match '/isp', :to => 'users#isp'
match '/isp/ping.jar', :to => redirect('/ping.jar')
match '/isp/ping:isp', :to => 'users#jnlp', :constraints => {:format => :jnlp}, :as => 'isp_ping'
get '/isp', :to => 'users#isp'
get '/isp/ping.jar', :to => redirect('/ping.jar')
get '/isp/ping:isp', :to => 'users#jnlp', :constraints => {:format => :jnlp}, :as => 'isp_ping'
match '/client', to: 'clients#index'
match '/latency_tester', to: 'clients#latency_tester'
get '/client', to: 'clients#index'
get '/latency_tester', to: 'clients#latency_tester'
match '/confirm/:signup_token', to: 'users#signup_confirm', as: 'signup_confirm'
get '/confirm/:signup_token', to: 'users#signup_confirm', as: 'signup_confirm'
match '/client/authed/:authed/:data', to: 'clients#auth_action', :as => :auth_action
get '/client/authed/:authed/:data', to: 'clients#auth_action', :as => :auth_action
# ping test
match '/ping', to: 'ping#index'
match '/ping/pingat.jnlp', to: 'ping#at'
match '/ping/pingcc.jnlp', to: 'ping#cc'
match '/ping/pingno.jnlp', to: 'ping#no'
match '/ping/pingtw.jnlp', to: 'ping#tw'
match '/ping/pingvz.jnlp', to: 'ping#vz'
match '/ping/icon.jpg', to:'ping#icon', :as => 'ping_icon'
#get '/ping', to: 'ping#index'
#get '/ping/pingat.jnlp', to: 'ping#at'
#get '/ping/pingcc.jnlp', to: 'ping#cc'
#get '/ping/pingno.jnlp', to: 'ping#no'
#get '/ping/pingtw.jnlp', to: 'ping#tw'
#get '/ping/pingvz.jnlp', to: 'ping#vz'
#get '/ping/icon.jpg', to:'ping#icon', :as => 'ping_icon'
# share tokens
match '/s/:id', to: 'share_tokens#shareable_resolver', :as => 'share_token'
get '/s/:id', to: 'share_tokens#shareable_resolver', :as => 'share_token'
# password reset
match '/request_reset_password' => 'users#request_reset_password', :via => :get
match '/reset_password' => 'users#reset_password', :via => :post
match '/reset_password_token' => 'users#reset_password_token', :via => :get
match '/reset_password_complete' => 'users#reset_password_complete', :via => :post
get '/request_reset_password' => 'users#request_reset_password'
post '/reset_password' => 'users#reset_password'
get '/reset_password_token' => 'users#reset_password_token'
post '/reset_password_complete' => 'users#reset_password_complete'
match '/unsubscribe/:user_token' => 'users#unsubscribe', via: [:get, :post]
# email update
match '/confirm_email' => 'users#finalize_update_email', :as => 'confirm_email' # NOTE: if you change this, you break outstanding email changes because links in user inboxes are broken
get '/confirm_email' => 'users#finalize_update_email', :as => 'confirm_email' # NOTE: if you change this, you break outstanding email changes because links in user inboxes are broken
match '/gmail_contacts', to: 'gmail#gmail_contacts'
get '/gmail_contacts', to: 'gmail#gmail_contacts'
match '/events/:slug', to: 'events#show', :via => :get, :as => 'event'
get '/events/:slug', to: 'events#show', :as => 'event'
match '/endorse/:id/:service', to: 'users#endorse', :as => 'endorse'
get '/endorse/:id/:service', to: 'users#endorse', :as => 'endorse'
# embed resque-web if this is development mode
if Rails.env == "development" || Rails.application.config.allow_spikes
@ -108,84 +108,84 @@ Rails.application.routes.draw do
mount Resque::Server.new, :at => "/resque" if Rails.env == "development"
# route to spike controller (proof-of-concepts)
match '/listen_in', to: 'spikes#listen_in'
match '/facebook_invite', to: 'spikes#facebook_invite'
match '/launch_app', to: 'spikes#launch_app'
match '/websocket', to: 'spikes#websocket'
match '/test_subscription', to: 'spikes#subscription'
match '/widgets/download_jam_track', to: 'spikes #download_jam_track'
match '/widgets/jam_track_preview', to: 'spikes#jam_track_preview'
match '/site_validate', to: 'spikes#site_validate'
match '/recording_source', to: 'spikes#recording_source'
match '/musician_search_filter', to: 'spikes#musician_search_filter'
match '/band_search_filter', to: 'spikes#band_search_filter'
get '/listen_in', to: 'spikes#listen_in'
get '/facebook_invite', to: 'spikes#facebook_invite'
get '/launch_app', to: 'spikes#launch_app'
get '/websocket', to: 'spikes#websocket'
get '/test_subscription', to: 'spikes#subscription'
get '/widgets/download_jam_track', to: 'spikes#download_jam_track'
get '/widgets/jam_track_preview', to: 'spikes#jam_track_preview'
get '/site_validate', to: 'spikes#site_validate'
get '/recording_source', to: 'spikes#recording_source'
get '/musician_search_filter', to: 'spikes#musician_search_filter'
get '/band_search_filter', to: 'spikes#band_search_filter'
# junk pages
match '/help', to: 'static_pages#help'
match '/about', to: 'static_pages#about'
match '/contact', to: 'static_pages#contact'
match '/faders', to: 'static_pages#faders'
get '/help', to: 'static_pages#help'
get '/about', to: 'static_pages#about'
get '/contact', to: 'static_pages#contact'
get '/faders', to: 'static_pages#faders'
end
if Rails.env == "test"
match '/test_connection', to: 'sessions#connection_state', :as => :connection_state
get '/test_connection', to: 'sessions#connection_state', :as => :connection_state
# vanilla forums 'fake methods'
match '/forums', to: 'vanilla_forums#fake_root'
match '/forums/entry/jsconnect', to: 'vanilla_forums#fake_jsconnect'
get '/forums', to: 'vanilla_forums#fake_root'
get '/forums/entry/jsconnect', to: 'vanilla_forums#fake_jsconnect'
end
# vanilla forums sso
match '/forums/sso', to: 'vanilla_forums#authenticate'
get '/forums/sso', to: 'vanilla_forums#authenticate'
# admin-only page to control settings
match '/extras/settings', to: 'extras#settings'
get '/extras/settings', to: 'extras#settings'
scope '/popups' do
match '/recording-controls', to: 'popups#recording_controls'
match '/media-controls', to: 'popups#media_controls'
match '/youtube/player', to: 'popups#youtube_player'
get '/recording-controls', to: 'popups#recording_controls'
get '/media-controls', to: 'popups#media_controls'
get '/youtube/player', to: 'popups#youtube_player'
end
scope '/corp' do
# about routes
match '/about', to: 'corps#about', as: 'corp_about'
get '/about', to: 'corps#about', as: 'corp_about'
# news routes
match '/news', to: 'corps#news', as: 'corp_news'
get '/news', to: 'corps#news', as: 'corp_news'
# media center routes
match '/media_center', to: 'corps#media_center', as: 'corp_media_center'
match '/overview', to: 'corps#overview', as: 'corp_overview'
match '/features', to: 'corps#features', as: 'corp_features'
match '/faqs', to: 'corps#faqs', as: 'corp_faqs'
match '/screenshots', to: 'corps#screenshots', as: 'corp_screenshots'
match '/photos', to: 'corps#photos', as: 'corp_photos'
match '/logos', to: 'corps#logos', as: 'corp_logos'
get '/media_center', to: 'corps#media_center', as: 'corp_media_center'
get '/overview', to: 'corps#overview', as: 'corp_overview'
get '/features', to: 'corps#features', as: 'corp_features'
get '/faqs', to: 'corps#faqs', as: 'corp_faqs'
get '/screenshots', to: 'corps#screenshots', as: 'corp_screenshots'
get '/photos', to: 'corps#photos', as: 'corp_photos'
get '/logos', to: 'corps#logos', as: 'corp_logos'
match '/testimonials', to: 'corps#testimonials', as: 'corp_testimonials'
match '/audio', to: 'corps#audio', as: 'corp_audio'
match '/videos', to: 'corps#videos', as: 'corp_videos'
get '/testimonials', to: 'corps#testimonials', as: 'corp_testimonials'
get '/audio', to: 'corps#audio', as: 'corp_audio'
get '/videos', to: 'corps#videos', as: 'corp_videos'
# contact routes
match '/contact', to: 'corps#contact', as: 'corp_contact'
get '/contact', to: 'corps#contact', as: 'corp_contact'
# privacy routes
match '/privacy', to: 'corps#privacy', as: 'corp_privacy'
get '/privacy', to: 'corps#privacy', as: 'corp_privacy'
# terms routes
match '/terms', to: 'corps#terms', as: 'corp_terms'
get '/terms', to: 'corps#terms', as: 'corp_terms'
# help routes
match '/help', to: 'corps#help', as: 'corp_help'
get '/help', to: 'corps#help', as: 'corp_help'
match '/cookies_policy',to: 'corps#cookie_policy', as: 'corp_cookie_policy'
match '/premium_accounts',to: 'corps#premium_accounts', as: 'corp_premium_accounts'
get '/cookies_policy',to: 'corps#cookie_policy', as: 'corp_cookie_policy'
get '/premium_accounts',to: 'corps#premium_accounts', as: 'corp_premium_accounts'
end
scope '/api' do
match '/auths/login' => 'api_auths#login', :via => :post
post '/auths/login' => 'api_auths#login'
# music sessions
match '/sessions/:id/participants/legacy' => 'api_music_sessions#participant_create_legacy', :via => :post # can be removed when new Create Session comes in
@ -511,7 +511,7 @@ Rails.application.routes.draw do
# Recordings - recorded_tracks
match '/recordings/:id/tracks/:track_id' => 'api_recordings#show_recorded_track', :via => :get, :as => 'api_recordings_show_recorded_track'
match '/recordings/:id/tracks/:track_id/download' => 'api_recordings#download', :via => :get, :as => 'api_recordings_download'
match '/recordings/:id/tracks/:track_id/download' => 'api_recordings#download', :via => :get
match '/recordings/:id/tracks/:track_id/upload_next_part' => 'api_recordings#upload_next_part', :via => :get
match '/recordings/:id/tracks/:track_id/upload_sign' => 'api_recordings#upload_sign', :via => :get
match '/recordings/:id/tracks/:track_id/upload_part_complete' => 'api_recordings#upload_part_complete', :via => :post
@ -525,7 +525,7 @@ Rails.application.routes.draw do
# Recordings - backing tracks
match '/recordings/:id/backing_tracks/:track_id' => 'api_recordings#show_recorded_backing_track', :via => :get, :as => 'api_recordings_show_recorded_backing_track'
match '/recordings/:id/backing_tracks/:track_id/download' => 'api_recordings#backing_track_download', :via => :get, :as => 'api_recordings_download'
match '/recordings/:id/backing_tracks/:track_id/download' => 'api_recordings#backing_track_download', :via => :get
match '/recordings/:id/backing_tracks/:track_id/upload_next_part' => 'api_recordings#backing_track_upload_next_part', :via => :get
match '/recordings/:id/backing_tracks/:track_id/upload_sign' => 'api_recordings#backing_track_upload_sign', :via => :get
match '/recordings/:id/backing_tracks/:track_id/upload_part_complete' => 'api_recordings#backing_track_upload_part_complete', :via => :post
@ -550,16 +550,16 @@ Rails.application.routes.draw do
match '/mixes/:id/download(/:type)' => 'api_mixes#download', :via => :get, :as => :mix_download
# version check for JamClient
match '/versioncheck' => 'artifacts#versioncheck'
get '/versioncheck' => 'artifacts#versioncheck'
# discover websocket gateway info
match '/config' => 'api_configs#index'
get '/config' => 'api_configs#index'
# no-op method to see if server is running
match '/healthcheck' => 'artifacts#healthcheck'
get '/healthcheck' => 'artifacts#healthcheck'
# list all uris for available clients on mac, windows, linux, if available
match '/artifacts/clients' => 'artifacts#client_downloads'
get '/artifacts/clients' => 'artifacts#client_downloads'
# crash logs
match '/dumps' => 'api_users#crash_dump', :via => :put
@ -606,11 +606,11 @@ Rails.application.routes.draw do
match '/alerts' => 'api_alerts#create', :via => :post
# links generated to help affiliates share relevant links
match '/links/jamtrack_songs' => 'api_links#jamtrack_song_index'
match '/links/jamtrack_bands' => 'api_links#jamtrack_band_index'
match '/links/jamtrack_general' => 'api_links#jamtrack_general_index'
match '/links/jamkazam' => 'api_links#jamkazam_general_index'
match '/links/sessions' => 'api_links#session_index'
match '/links/recordings' => 'api_links#recording_index'
get '/links/jamtrack_songs' => 'api_links#jamtrack_song_index'
get '/links/jamtrack_bands' => 'api_links#jamtrack_band_index'
get '/links/jamtrack_general' => 'api_links#jamtrack_general_index'
get '/links/jamkazam' => 'api_links#jamkazam_general_index'
get '/links/sessions' => 'api_links#session_index'
get '/links/recordings' => 'api_links#recording_index'
end
end

6
web/spec/factories.rb
View File

@ -752,12 +752,6 @@ FactoryGirl.define do
association :user, factory: :user
end
factory :jam_track_tap_in, :class => JamRuby::JamTrackTapIn do
association :jam_track, factory: :jam_track
offset_time 0
bpm 120
tap_in_count 3
end
factory :recurly_transaction_web_hook, :class => JamRuby::RecurlyTransactionWebHook do