+
+
+
+
+ - " + combinedErrorMsg + "
" + errorMsg }); + } + + + function clientUpdateLaunchSuccess(updateLocation) { + logger.debug("client update launched successfully to: " + updateLocation); + } + + function clientUpdateLaunchFailure(errorMsg) { + logger.error("client update launch error: " + errorMsg) + + updateClientUpdateDialog("update-error", {error_msg: "Unable to launch client updater. Error reason:
" + errorMsg}); + } + /********************************************/ + /******** END: CALLBACKS FROM BACKEND *******/ + /********************************************/ + + // if the current version doesn't not match the server version, attempt to do an upgrade + function shouldUpdate(currentVersion, version) { + if(version === undefined || version == null || version == "") { + return false; + } + else { + return currentVersion != version; + } + } + + // check if updated is needed + function check() { + + // check kill switch before all other logic + if(!gon.check_for_client_updates) { + logger.debug("skipping client update because the server is telling us not to") + return; + } + + var product = "JamClient" + var os = context.jamClient.GetOSAsString() + var currentVersion = context.jamClient.ClientUpdateVersion(); + + + if(currentVersion == null || currentVersion.indexOf("Compiled") > -1) { + // this is a developer build; it doesn't make much sense to do an packaged update, so skip + logger.debug("skipping client update check because this is a development build ('" + currentVersion + "')") + return; + } + + // # strange client oddity: remove quotes, if found, from start and finish of version. + if(currentVersion.indexOf('"') == 0 && currentVersion.lastIndexOf('"') == currentVersion.length -1 ) { + currentVersion = currentVersion.substring(1, currentVersion.length - 1); + } + + + $.ajax({ + type: "GET", + url: "/api/versioncheck?product=" + product + "&os=" + os, + success: function(response) { + var version = response.version; + logger.debug("our client version: " + currentVersion + ", server client version: " + version); + + // test url in lieu of having a configured server with a client-update available + + if(shouldUpdate(currentVersion, version)) { + updateSize = response.size; + + // test metadata in lieu of having a configured server with a client-update available + //updateSize = 10000; + //version = "1.2.3" + + // this will update the client dialog to how it should look when an update is just starting + // and show it front-and-center on the screen + updateClientUpdateDialog("update-start", { uri : response.uri } ) + } + }, + error: function(jqXHR, textStatus, errorThrown) { + logger.error("Unable to do a client update check against /api/versioncheck"); + } + }); + } + + function startDownload(url) { + logger.debug("starting client updater download from: " + url); + + updateClientUpdateDialog("update-downloading") + + context.jamClient.ClientUpdateStartDownload(url, + "JK.ClientUpdate.DownloadProgressCallback", + "JK.ClientUpdate.DownloadSuccessCallback", + "JK.ClientUpdate.DownloadFailureCallback"); + } + + function startUpdate(updaterFilePath) { + logger.debug("starting client update from: " + updaterFilePath) + + context.jamClient.ClientUpdateStartUpdate(updaterFilePath, + "JK.ClientUpdate.LaunchUpdateSuccessCallback", + "JK.ClientUpdate.LaunchUpdateFailureCallback"); + + } + + function initialize() { + context.JK.ClientUpdate.DownloadProgressCallback = clientUpdateDownloadProgress; + context.JK.ClientUpdate.DownloadSuccessCallback = clientUpdateDownloadSuccess; + context.JK.ClientUpdate.DownloadFailureCallback = clientUpdateDownloadFailure; + context.JK.ClientUpdate.LaunchUpdateSuccessCallback = clientUpdateLaunchSuccess; + context.JK.ClientUpdate.LaunchUpdateFailureCallback = clientUpdateLaunchFailure; + + return self; + } + + // Expose publics + this.initialize = initialize; + this.check = check; + } + +})(window,jQuery); \ No newline at end of file diff --git a/web/app/assets/javascripts/configureTrack.js b/web/app/assets/javascripts/configureTrack.js new file mode 100644 index 000000000..ededb4025 --- /dev/null +++ b/web/app/assets/javascripts/configureTrack.js @@ -0,0 +1,834 @@ +(function(context,$) { + + "use strict"; + + context.JK = context.JK || {}; + context.JK.ConfigureTrackDialog = function(app, myTracks, sessionId, sessionModel) { + var logger = context.JK.logger; + var myTrackCount; + + var ASSIGNMENT = { + CHAT: -2, + OUTPUT: -1, + UNASSIGNED: 0, + TRACK1: 1, + TRACK2: 2 + }; + + var VOICE_CHAT = { + NO_CHAT: "0", + CHAT: "1" + }; + + var instrument_array = []; + + // dialog variables + var inputUnassignedList = []; + var track1AudioInputChannels = []; + var track2AudioInputChannels = []; + + var outputUnassignedList = []; + var outputAssignedList = []; + + var chatUnassignedList = []; + var chatAssignedList = []; + + var chatOtherUnassignedList = []; + var chatOtherAssignedList = []; + + var devices = []; + var originalDeviceId; + var originalVoiceChat; + + var configure_audio_instructions = { + "Win32": "Choose the audio profile you would like to use for this session. If needed, use arrow buttons to assign audio inputs " + + "to your tracks, to indicate what instrument you are playing on each track, and to assign audio outputs for listening. " + + "If you want to use a new audio device you have not tested/certified for latency using JamKazam, click the Add New Audio " + + "Gear button to test that device.", + + "MacOSX": "Choose the audio profile you would like to use for this session. If needed, use arrow buttons to assign audio inputs " + + "to your tracks, to indicate what instrument you are playing on each track, and to assign audio outputs for listening. " + + "If you want to use a new audio device you have not tested/certified for latency using JamKazam, click the Add New Audio " + + "Gear button to test that device.", + + "Unix": "Choose the audio profile you would like to use for this session. If needed, use arrow buttons to assign audio inputs " + + "to your tracks, to indicate what instrument you are playing on each track, and to assign audio outputs for listening. " + + "If you want to use a new audio device you have not tested/certified for latency using JamKazam, click the Add New Audio " + + "Gear button to test that device." + }; + + var configure_voice_instructions = "If you are using a microphone to capture your instrumental or vocal audio, you can simply use that mic " + + "for both music and chat. Otherwise, choose a device to use for voice chat, and use arrow buttons to " + + "select an input on that device."; + + function toggleTrack2ConfigDetails(visible) { + if (visible) { + $('#track2-details').show(); + $('#track2-input-buttons').show(); + $('#track1-input').height('92px'); + $('#track1-instrument').height('92px'); + $('#track1-input-buttons').addClass('mt30'); + $('#track1-input-buttons').removeClass('mt65'); + } + else { + $('#track2-details').hide(); + $('#track2-input-buttons').hide(); + $('#track1-input').height('195px'); + $('#track1-instrument').height('195px'); + $('#track1-input-buttons').addClass('mt65'); + $('#track1-input-buttons').removeClass('mt30'); + } + } + + function events() { + + // Music Audio Tab + var $tabConfigureAudio = $('#tab-configure-audio'); + $tabConfigureAudio.unbind("click"); + $tabConfigureAudio.click(function() { + // validate voice chat settings + if (validateVoiceChatSettings(true)) { + showMusicAudioPanel(false); + } + }); + + // Voice Chat Tab + var $tabConfigureVoice = $('#tab-configure-voice'); + $tabConfigureVoice.unbind("click"); + $tabConfigureVoice.click(function() { + // validate audio settings + if (validateAudioSettings(true)) { + showVoiceChatPanel(false); + } + }); + + // Track 1 Add + var $imgTrack1Add = $('#img-track1-input-add'); + $imgTrack1Add.unbind("click"); + $imgTrack1Add.click(function() { + var $unusedMusicInputs = $('#audio-inputs-unused > option:selected'); + _handleTrackInputAdd($unusedMusicInputs, '#track1-input'); + }); + + // Track 2 Add + var $imgTrack2Add = $('#img-track2-input-add'); + $imgTrack2Add.unbind("click"); + $imgTrack2Add.click(function() { + var $unusedMusicInputs = $('#audio-inputs-unused > option:selected'); + _handleTrackInputAdd($unusedMusicInputs, '#track2-input'); + }); + + // Track 1 Remove + var $imgTrack1Remove = $('#img-track1-input-remove'); + $imgTrack1Remove.unbind("click"); + $imgTrack1Remove.click(function() { + _handleTrackInputRemove('#track1-input'); + }); + + // Track 2 Remove + var $imgTrack2Remove = $('#img-track2-input-remove'); + $imgTrack2Remove.unbind("click"); + $imgTrack2Remove.click(function() { + _handleTrackInputRemove('#track2-input'); + }); + + // Audio Output Add + var $imgAudioOutputAdd = $('#img-audio-output-add'); + $imgAudioOutputAdd.unbind("click"); + $imgAudioOutputAdd.click(function() { + var $unusedAudioOutputs = $('#audio-output-unused > option:selected'); + $unusedAudioOutputs.remove().appendTo('#audio-output-selection'); + }); + + // Audio Output Remove + var $imgAudioOutputRemove = $('#img-audio-output-remove'); + $imgAudioOutputRemove.unbind("click"); + $imgAudioOutputRemove.click(function() { + var $usedAudioOutputs = $('#audio-output-selection > option:selected'); + $usedAudioOutputs.remove().appendTo('#audio-output-unused'); + }); + + // Voice Chat Add + var $imgVoiceAdd = $('#img-voice-input-add'); + $imgVoiceAdd.unbind("click"); + $imgVoiceAdd.click(function() { + var $unusedVoiceInputs = $('#voice-inputs-unused > option:selected'); + _handleVoiceInputAdd($unusedVoiceInputs); + }); + + // Voice Chat Remove + var $imgVoiceRemove = $('#img-voice-input-remove'); + $imgVoiceRemove.unbind("click"); + $imgVoiceRemove.click(function() { + var $usedVoiceInputs = $("#voice-inputs-selection > option:selected"); + _handleVoiceInputRemove($usedVoiceInputs); + }); + + $('#audio-drivers').unbind("change"); + $('#audio-drivers').change(function() { + audioDriverChanged(); + }); + + $('#voice-chat-type').unbind("change"); + $('#voice-chat-type').change(function() { + voiceChatChanged(); + }); + + $('#btn-driver-settings').unbind("click"); + $('#btn-driver-settings').click(function() { + context.jamClient.TrackOpenControlPanel(); + }); + + $('#btn-cancel-new-audio').unbind("click"); + $('#btn-cancel-new-audio').click(context.JK.showOverlay); + + $('#btn-error-ok').click(context.JK.showOverlay); + + $('#btn-save-settings').unbind("click"); + $('#btn-save-settings').click(saveSettings); + + $('#btn-cancel-settings').unbind("click"); + $('#btn-cancel-settings').click(cancelSettings); + } + + function _handleTrackInputAdd($selectedMusicInputs, selector) { + $selectedMusicInputs.each(function() { + var deviceId = this.value; + var description = this.text; + $(this).remove().appendTo(selector); + + // if this input exists in the Voice Chat unused box, remove it + var $voiceChatUnused = $('#voice-inputs-unused > option[value="' + deviceId + '"]'); + if ($voiceChatUnused.length > 0) { + logger.debug("Removing " + deviceId + " from Voice Chat Unused"); + $voiceChatUnused.remove(); + } + }); + + _syncVoiceChatType(); + } + + function _handleTrackInputRemove(trackSelector) { + trackSelector = trackSelector + ' > option:selected'; + $(trackSelector).each(function() { + var $removedInput = $(this).remove(); + var $cloneAudio = $removedInput.clone(true, true); + var $cloneChat = $removedInput.clone(true, true); + + $cloneAudio.appendTo('#audio-inputs-unused'); + + // add it to the unused Voice Chat box + if ($('#voice-chat-type').val() == VOICE_CHAT.CHAT) { + $cloneChat.appendTo('#voice-inputs-unused'); + } + }); + + _syncVoiceChatType(); + } + + function _syncVoiceChatType() { + var $option1 = $('#voice-chat-type > option[value="1"]'); + var voiceChatType = $('#voice-chat-type').val(); + + // remove option 1 from voice chat type dropdown if no music (based on what's unused on the Music Audio tab) or chat inputs are available + if ($('#audio-inputs-unused > option').size() === 0 && chatOtherUnassignedList.length === 0 && chatOtherAssignedList.length === 0) { + logger.debug("Removing Option 1 from Voice Chat dropdown."); + $option1.remove(); + } + else { + // make sure it's not already in list before adding back + if ($option1.length === 0) { + logger.debug("Adding Option 1 back to Voice Chat dropdown."); + $('#voice-chat-type').append(''); + } + } + } + + function _handleVoiceInputAdd($selectedVoiceInputs) { + $selectedVoiceInputs.each(function() { + var id = this.value; + + // if this input is in the unused track input box, remove it + var $unusedMusic = $('#audio-inputs-unused > option[value="' + id + '"]'); + if ($unusedMusic.length > 0) { + $unusedMusic.remove(); + } + $(this).remove().appendTo('#voice-inputs-selection'); + }); + } + + function _handleVoiceInputRemove($selectedVoiceInputs) { + $selectedVoiceInputs.each(function() { + var $removedInput = $(this).remove(); + var $cloneAudio = $removedInput.clone(true, true); + var $cloneChat = $removedInput.clone(true, true); + + $cloneChat.appendTo('#voice-inputs-unused'); + + // add it to the unused Music Input box if the selected input is not type "chat" + if (!isChatInput(this.value)) { + $cloneAudio.appendTo('#audio-inputs-unused'); + } + }); + } + + function isChatInput(id) { + // copy the arrays since $.grep modifies them + var chatOtherUnassignedListCopy = chatOtherUnassignedList; + var chatOtherAssignedListCopy = chatOtherAssignedList; + + // is this input in the unassigned list? + $.grep(chatOtherUnassignedListCopy, function(n,i){ + return n.chat && n.id === id; + }); + + // is this input in the assigned list? + $.grep(chatOtherAssignedListCopy, function(n,i){ + return n.chat && n.id === id; + }); + + logger.debug("chatOtherUnassignedListCopy=" + JSON.stringify(chatOtherUnassignedListCopy)); + logger.debug("chatOtherAssignedListCopy=" + JSON.stringify(chatOtherAssignedListCopy)); + + return chatOtherUnassignedListCopy.length > 0 || chatOtherAssignedListCopy.length > 0; + } + + function audioDriverChanged() { + + context.jamClient.TrackSetMusicDevice($('#audio-drivers').val()); + + logger.debug("Called TrackSetMusicDevice with " + $('#audio-drivers').val()); + + context.jamClient.TrackLoadAssignments(); + initDialogData(); + + // refresh dialog + showVoiceChatPanel(true); + showMusicAudioPanel(true); + } + + function voiceChatChanged() { + var voiceChatVal = $('#voice-chat-type').val(); + + logger.debug("voiceChatVal=" + voiceChatVal); + + if (voiceChatVal == VOICE_CHAT.NO_CHAT) { + logger.debug("VOICE_CHAT.NO_CHAT"); + _addSelectedVoiceInputsToMusicInputs(); + + $('#voice-inputs-unused').empty(); + $('#voice-inputs-selection').empty(); + } + else if (voiceChatVal == VOICE_CHAT.CHAT) { + logger.debug("VOICE_CHAT.CHAT"); + + $('#voice-inputs-unused').empty(); + $('#voice-inputs-selection').empty(); + + // add the chat inputs (unassigned and assigned) to the unused box to force the user to select again + context.JK.loadOptions($('#template-option').html(), $('#voice-inputs-unused'), chatOtherUnassignedList, "id", "name", -1); + context.JK.loadOptions($('#template-option').html(), $('#voice-inputs-unused'), chatOtherAssignedList, "id", "name", -1); + + // add each unused music input if it doesn't already exist + $('#audio-inputs-unused > option').each(function() { + if ($('#voice-inputs-unused > option[value="' + this.value + '"]').length === 0) { + $('#voice-inputs-unused').append(''); + } + }); + } + } + + function _addSelectedVoiceInputsToMusicInputs() { + $('#voice-inputs-selection > option').each(function() { + // if this input is not already in the available music inputs box and the selected input is not chat input, add + // it to the unused music inputs box + if ($('#audio-inputs-unused > option[value="' + this.value + '"]').length === 0 && !isChatInput(this.value)) { + $('#audio-inputs-unused').append(''); + } + }); + } + + function configureDriverSettingsButton() { + if (context.jamClient.TrackHasControlPanel()) { + $('#btn-driver-settings').show(); + } + else { + $('#btn-driver-settings').hide(); + } + } + + function showMusicAudioPanel(refreshLists) { + _setInstructions('audio'); + _activateTab('audio'); + + if (refreshLists) { + $('#audio-drivers').empty(); + + // determine correct music device to preselect + var deviceId = context.jamClient.TrackGetMusicDeviceID(); + logger.debug("deviceId = " + deviceId); + + // load Audio Driver dropdown + devices = context.jamClient.TrackGetDevices(); + var keys = Object.keys(devices); + + for (var i=0; i < keys.length; i++) { + var template = $('#template-option').html(); + var isSelected = ""; + if (keys[i] === deviceId) { + isSelected = "selected"; + } + var html = context.JK.fillTemplate(template, { + value: keys[i], + label: devices[keys[i]], + selected: isSelected + }); + + $('#audio-drivers').append(html); + } + + if (deviceId === '') { + context.jamClient.TrackSetMusicDevice($('#audio-drivers').val()); + } + + configureDriverSettingsButton(); + + $('#audio-inputs-unused').empty(); + $('#track1-input').empty(); + $('#track1-instrument').empty(); + $('#track2-input').empty(); + $('#track2-instrument').empty(); + $('#audio-output-unused').empty(); + $('#audio-output-selection').empty(); + + _initMusicTabData(); + + // load Unused Inputs + context.JK.loadOptions($('#template-option').html(), $('#audio-inputs-unused'), inputUnassignedList, "id", "name", -1); + + // load Track 1 Input(s) + context.JK.loadOptions($('#template-option').html(), $('#track1-input'), track1AudioInputChannels, "id", "name", -1); + + // load Track 1 Instrument + var current_instrument = context.jamClient.TrackGetInstrument(ASSIGNMENT.TRACK1); + + // if no instrument is stored on the backend, the user is opening this dialog for the first time after FTUE; + // initialize to the user's first instrument + if (current_instrument === 0) { + if (context.JK.userMe.instruments && context.JK.userMe.instruments.length > 0) { + var instrument_desc = context.JK.userMe.instruments[0].description; + current_instrument = context.JK.server_to_client_instrument_map[instrument_desc].client_id; + } + } + + context.JK.loadOptions($('#template-option').html(), $('#track1-instrument'), instrument_array, "id", "description", current_instrument); + + // load Track 2 config details if necessary + if (myTrackCount > 1) { + // load Track 2 Input(s) + context.JK.loadOptions($('#template-option').html(), $('#track2-input'), track2AudioInputChannels, "id", "name", -1); + + // load Track 2 Instrument + current_instrument = context.jamClient.TrackGetInstrument(ASSIGNMENT.TRACK2); + context.JK.loadOptions($('#template-option').html(), $('#track2-instrument'), instrument_array, "id", "description", current_instrument); + } + + // load Unused Outputs + context.JK.loadOptions($('#template-option').html(), $('#audio-output-unused'), outputUnassignedList, "id", "name", -1); + + // load Session Audio Output + context.JK.loadOptions($('#template-option').html(), $('#audio-output-selection'), outputAssignedList, "id", "name", -1); + } + } + + function showVoiceChatPanel(refreshLists) { + _setInstructions('voice'); + _activateTab('voice'); + + if (refreshLists) { + $('#voice-inputs-unused').empty(); + $('#voice-inputs-selection').empty(); + + _initVoiceChatTabData(); + + var chatOption = $('#voice-chat-type').val(); + + if (chatOption == VOICE_CHAT.CHAT) { + context.JK.loadOptions($('#template-option').html(), $('#voice-inputs-unused'), chatUnassignedList, "id", "name", -1); + context.JK.loadOptions($('#template-option').html(), $('#voice-inputs-selection'), chatAssignedList, "id", "name", -1); + + context.JK.loadOptions($('#template-option').html(), $('#voice-inputs-unused'), chatOtherUnassignedList, "id", "name", -1); + context.JK.loadOptions($('#template-option').html(), $('#voice-inputs-selection'), chatOtherAssignedList, "id", "name", -1); + } + + // disable inputs + else if (chatOption == VOICE_CHAT.NO_CHAT) { + } + } + } + + function _activateTab(type) { + if (type === 'voice') { + $('div[tab-id="music-audio"]').hide(); + $('div[tab-id="voice-chat"]').show(); + + $('#tab-configure-audio').removeClass('selected'); + $('#tab-configure-voice').addClass('selected'); + } + else { + $('div[tab-id="music-audio"]').show(); + $('div[tab-id="voice-chat"]').hide(); + + $('#tab-configure-audio').addClass('selected'); + $('#tab-configure-voice').removeClass('selected'); + } + } + + function initDialogData() { + _initMusicTabData(); + _initVoiceChatTabData(); + } + + function _initMusicTabData() { + inputUnassignedList = _loadList(ASSIGNMENT.UNASSIGNED, true, false); + logger.debug("inputUnassignedList=" + JSON.stringify(inputUnassignedList)); + + track1AudioInputChannels = _loadList(ASSIGNMENT.TRACK1, true, false); + logger.debug("track1AudioInputChannels=" + JSON.stringify(track1AudioInputChannels)); + + track2AudioInputChannels = _loadList(ASSIGNMENT.TRACK2, true, false); + logger.debug("track2AudioInputChannels=" + JSON.stringify(track2AudioInputChannels)); + + outputUnassignedList = _loadList(ASSIGNMENT.UNASSIGNED, false, false); + outputAssignedList = _loadList(ASSIGNMENT.OUTPUT, false, false); + } + + function _initVoiceChatTabData() { + chatUnassignedList = _loadList(ASSIGNMENT.UNASSIGNED, true, false); + logger.debug("chatUnassignedList=" + JSON.stringify(chatUnassignedList)); + + chatAssignedList = _loadList(ASSIGNMENT.CHAT, true, false); + logger.debug("chatAssignedList=" + JSON.stringify(chatAssignedList)); + + chatOtherUnassignedList = _loadList(ASSIGNMENT.UNASSIGNED, true, true); + logger.debug("chatOtherUnassignedList=" + JSON.stringify(chatOtherUnassignedList)); + + chatOtherAssignedList = _loadList(ASSIGNMENT.CHAT, true, true); + logger.debug("chatOtherAssignedList=" + JSON.stringify(chatOtherAssignedList)); + } + + // TODO: copied in addTrack.js - refactor to common place + function _loadList(assignment, input, chat) { + var list = []; + + // get data needed for listboxes + var channels = context.jamClient.TrackGetChannels(); + + var musicDevices = context.jamClient.TrackGetMusicDeviceNames(input); + + // SEE loadList function in TrackAssignGui.cpp of client code + $.each(channels, function(index, val) { + + if (input !== val.input) { + return; + } + + var currAssignment = context.jamClient.TrackGetAssignment(val.id, val.input); + if (assignment !== currAssignment) { + return; + } + + // logger.debug("channel id=" + val.id + ", channel input=" + val.input + ", channel assignment=" + currAssignment + + // ", channel name=" + val.name + ", channel type=" + val.device_type + ", chat=" + val.chat); + + var os = context.jamClient.GetOSAsString(); + if (os === context.JK.OS.WIN32) { + if (chat && ($.inArray(val.device_id, musicDevices) > -1 || context.jamClient.TrackIsMusicDeviceType(val.device_type))) { + return; + } + } + else { + if (chat && ($.inArray(val.device_id, musicDevices) > -1 || !context.jamClient.TrackIsMusicDeviceType(val.device_type))) { + return; + } + } + + if (!chat && $.inArray(val.device_id, musicDevices) === -1) { + return; + } + + if ((chat && !val.chat) || (!chat && val.chat)) { + return; + } + + list.push(val); + }); + + return list; + } + + function saveSettings() { + if (!validateAudioSettings(false)) { + return; + } + + if (!validateVoiceChatSettings(false)) { + return; + } + + saveAudioSettings(); + saveVoiceChatSettings(); + + context.jamClient.TrackSaveAssignments(); + + originalDeviceId = $('#audio-drivers').val(); + app.layout.closeDialog('configure-audio'); + + // refresh Session screen + sessionModel.refreshCurrentSession(); + } + + function saveAudioSettings() { + + context.jamClient.TrackSetMusicDevice($('#audio-drivers').val()); + + // UNASSIGNED INPUTS + $('#audio-inputs-unused > option').each(function() { + logger.debug("Marking " + this.value + " as unassigned input."); + context.jamClient.TrackSetAssignment(this.value, true, ASSIGNMENT.UNASSIGNED); + }); + + // TRACK 1 INPUTS + $('#track1-input > option').each(function() { + logger.debug("Saving track 1 input = " + this.value); + context.jamClient.TrackSetAssignment(this.value, true, ASSIGNMENT.TRACK1); + }); + + // TRACK 1 INSTRUMENT + var instrumentVal = $('#track1-instrument').val(); + var instrumentText = $('#track1-instrument > option:selected').text().toLowerCase(); + + // logger.debug("Saving track 1 instrument = " + instrumentVal); + context.jamClient.TrackSetInstrument(ASSIGNMENT.TRACK1, instrumentVal); + + // UPDATE SERVER + //logger.debug("Updating track " + myTracks[0].trackId + " with instrument " + instrumentText); + var data = {}; + data.instrument_id = instrumentText; + sessionModel.updateTrack(sessionId, myTracks[0].trackId, data); + + if (myTrackCount > 1) { + // TRACK 2 INPUTS + $('#track2-input > option').each(function() { + logger.debug("Saving track 2 input = " + this.value); + context.jamClient.TrackSetAssignment(this.value, true, ASSIGNMENT.TRACK2); + }); + + // TRACK 2 INSTRUMENT + instrumentVal = $('#track2-instrument').val(); + instrumentText = $('#track2-instrument > option:selected').text().toLowerCase(); + + logger.debug("Saving track 2 instrument = " + instrumentVal); + context.jamClient.TrackSetInstrument(ASSIGNMENT.TRACK2, instrumentVal); + + // UPDATE SERVER + //logger.debug("Updating track " + myTracks[1].trackId + " with instrument " + instrumentText); + data.instrument_id = instrumentText; + sessionModel.updateTrack(sessionId, myTracks[1].trackId, data); + } + + // UNASSIGNED OUTPUTS + $('#audio-output-unused > option').each(function() { + logger.debug("Marking " + this.value + " as unassigned output."); + context.jamClient.TrackSetAssignment(this.value, false, ASSIGNMENT.UNASSIGNED); + }); + + // OUTPUT + $('#audio-output-selection > option').each(function() { + logger.debug("Saving session audio output = " + this.value); + context.jamClient.TrackSetAssignment(this.value, false, ASSIGNMENT.OUTPUT); + }); + } + + function saveVoiceChatSettings() { + var voiceChatType = $('#voice-chat-type').val(); + originalVoiceChat = voiceChatType; + + logger.debug("Calling TrackSetChatEnable with value = " + voiceChatType); + context.jamClient.TrackSetChatEnable(voiceChatType == VOICE_CHAT.CHAT ? true : false); + + // UNASSIGNED VOICE CHAT + $('#voice-inputs-unused > option').each(function() { + logger.debug("Marking " + this.value + " as unassigned voice input."); + context.jamClient.TrackSetAssignment(this.value, true, ASSIGNMENT.UNASSIGNED); + }); + + // VOICE CHAT INPUT + $("#voice-inputs-selection > option").each(function() { + logger.debug("Saving chat input = " + this.value); + context.jamClient.TrackSetAssignment(this.value, true, ASSIGNMENT.CHAT); + }); + } + + function cancelSettings() { + logger.debug("Cancel settings"); + + // reset to original device ID + context.jamClient.TrackSetMusicDevice(originalDeviceId); + + $('#voice-chat-type').val(originalVoiceChat); + + app.layout.closeDialog('configure-audio'); + } + + function validateAudioSettings(allowEmptyInput) { + var isValid = true; + var noTrackErrMsg = 'You must assign at least one input port to each of your tracks. Please update your settings to correct this. If you want to delete a track, please return to the session screen and delete the track by clicking the "x" box in the upper right-hand corner of the track.'; + var noInstrumentErrMsg = 'You must specify what instrument is being played for each track. Please update your settings to correct this.'; + var outputErrMsg = 'You must assign two output ports for stereo session audio to hear music. Please update your settings to correct this.'; + + var errMsg; + + // if there are no inputs remaining then allow the user to switch to the Voice Chat tab + // to remove some + if (allowEmptyInput && $('#audio-inputs-unused > option').size() === 0) { + return isValid; + } + else { + // verify Track 1 Input and Instrument exist + if ($('#track1-input > option').size() === 0 || $('#track1-input > option').size() > 2) { + errMsg = noTrackErrMsg; + isValid = false; + } + + if (isValid) { + if ($('#track1-instrument > option:selected').length === 0) { + errMsg = noInstrumentErrMsg; + isValid = false; + } + } + + logger.debug("validateAudioSettings:myTrackCount=" + myTrackCount); + + // if Track 2 exists, verify Input and Instrument exist + if (isValid && myTrackCount > 1) { + if ($('#track2-input > option').size() === 0 || $('#track2-input > option').size() > 2) { + errMsg = noTrackErrMsg; + isValid = false; + } + + if (isValid && $('#track2-instrument > option:selected').length === 0) { + errMsg = noInstrumentErrMsg; + isValid = false; + } + } + + // verify Session Audio Output exists + if (isValid && $('#audio-output-selection > option').size() !== 2) { + errMsg = outputErrMsg; + isValid = false; + } + + if (!isValid) { + context.JK.showErrorDialog(app, errMsg, "invalid settings"); + } + } + + return isValid; + } + + function validateVoiceChatSettings(allowEmptyInput) { + var isValid = true; + var noTrackErrMsg = 'You must select a voice input.'; + var limitExceededErrMsg = 'You cannot select more than 1 voice chat input.'; + var errMsg; + + if (allowEmptyInput && $('#voice-inputs-unused > option').size() === 0) { + return isValid; + } + else { + var chatType = $('#voice-chat-type').val(); + if (chatType == VOICE_CHAT.CHAT) { + var $voiceInputSelection = $('#voice-inputs-selection > option'); + var count = $voiceInputSelection.size(); + if (count === 0) { + errMsg = noTrackErrMsg; + isValid = false; + } + else if (count > 1) { + errMsg = limitExceededErrMsg; + isValid = false; + } + } + else if (chatType == VOICE_CHAT.NO_CHAT) { + // NO VALIDATION NEEDED + } + + if (!isValid) { + context.JK.showErrorDialog(app, errMsg, "invalid settings"); + } + } + + return isValid; + } + + function _setInstructions(type) { + var $instructions = $('#instructions', 'div[layout-id="configure-audio"]'); + if (type === 'audio') { + var os = context.jamClient.GetOSAsString(); + $instructions.html(configure_audio_instructions[os]); + } + else if (type === 'voice') { + $instructions.html(configure_voice_instructions); + } + } + + function _init() { + // load instrument array for populating listboxes, using client_id in instrument_map as ID + context.JK.listInstruments(app, function(instruments) { + $.each(instruments, function(index, val) { + instrument_array.push({"id": context.JK.server_to_client_instrument_map[val.description].client_id, "description": val.description}); + }); + }); + + originalVoiceChat = context.jamClient.TrackGetChatEnable() ? VOICE_CHAT.CHAT : VOICE_CHAT.NO_CHAT; + logger.debug("originalVoiceChat=" + originalVoiceChat); + + $('#voice-chat-type').val(originalVoiceChat); + + originalDeviceId = context.jamClient.TrackGetMusicDeviceID(); + + context.jamClient.TrackLoadAssignments(); + initDialogData(); + + var $option1 = $('#voice-chat-type > option[value="1"]'); + + // remove option 1 from voice chat if none are available and not already assigned + if (inputUnassignedList.length === 0 && chatAssignedList.length === 0 && chatOtherAssignedList.length === 0 && chatOtherUnassignedList.length === 0) { + logger.debug("Removing Option 1 from Voice Chat dropdown."); + $option1.remove(); + } + // add it if it doesn't exist + else { + if ($option1.length === 0) { + logger.debug("Adding Option 1 back to Voice Chat dropdown."); + $('#voice-chat-type').append(''); + } + } + } + + this.initialize = function() { + events(); + _init(); + myTrackCount = myTracks.length; + logger.debug("initialize:myTrackCount=" + myTrackCount); + toggleTrack2ConfigDetails(myTrackCount > 1); + }; + + this.showMusicAudioPanel = showMusicAudioPanel; + this.showVoiceChatPanel = showVoiceChatPanel; + + return this; + }; + + })(window,jQuery); \ No newline at end of file diff --git a/web/app/assets/javascripts/corp/contact.js b/web/app/assets/javascripts/corp/contact.js new file mode 100644 index 000000000..0b963ab68 --- /dev/null +++ b/web/app/assets/javascripts/corp/contact.js @@ -0,0 +1,81 @@ +(function(context, $) { + + var api = context.JK.Rest(); + + function clearIfNeeded(input) { + var cleared = input.data("cleared"); + + if(!cleared) { + input.val(""); + input.data("cleared", true); + } + } + + function postFeedbackFailure(xhr, textStatus, errorMessage) { + + var errors = JSON.parse(xhr.responseText); + + if(xhr.status == 422) { + + var $feedback = $('#feedback'); + + var email = context.JK.format_errors("email", errors); + var body = context.JK.format_errors("body", errors); + + if(email != null) { + $('input[name=email]', $feedback).closest('div.field').addClass('error').end().after(email); + } + + if(body != null) { + $('textarea[name=body]', $feedback).closest('div.field').addClass('error').end().after(body); + } + } + else {app.ajaxError(xhr, textStatus, errorMessage); + } + } + + function events() { + + var $submit = $('#contact-submit'); + var $feedback = $('#feedback'); + + $feedback.submit(function(e) { + + $submit.val("SENDING..."); + + var $email = $('input[name=email]', $feedback); + var $body = $('textarea[name=body]', $feedback); + + api.postFeedback($email.val(), $body.val()) + .done(function() { + // remove any error fields still present + $('div.field', $feedback).removeClass('error'); + + $submit.val("THANKS!"); + }). + fail(function(xhr, textStatus, errorMessage) { + $submit.val("SEND"); + postFeedbackFailure(xhr, textStatus, errorMessage); + }); + + e.stopPropagation(); + return false; + }); + + $('input[name=email]', $feedback).focus(function() { + clearIfNeeded($(this)); + }); + + $('textarea[name=body]', $feedback).focus(function() { + clearIfNeeded($(this)); + }); + } + + function initialize() { + events(); + } + + context.JK.Corporate.contact = {}; + context.JK.Corporate.contact.initialize = initialize; + +})(window, jQuery); \ No newline at end of file diff --git a/web/app/assets/javascripts/corp/corporate.js b/web/app/assets/javascripts/corp/corporate.js new file mode 100644 index 000000000..c720ba5d9 --- /dev/null +++ b/web/app/assets/javascripts/corp/corporate.js @@ -0,0 +1,7 @@ +//= require jquery +//= require AAC_underscore +//= require jamkazam +//= require utils +//= require jam_rest +//= require corp/init +//= require_directory ../corp \ No newline at end of file diff --git a/web/app/assets/javascripts/corp/init.js b/web/app/assets/javascripts/corp/init.js new file mode 100644 index 000000000..9bb209302 --- /dev/null +++ b/web/app/assets/javascripts/corp/init.js @@ -0,0 +1 @@ +window.JK.Corporate = {}; \ No newline at end of file diff --git a/web/app/assets/javascripts/corp/navigation.js b/web/app/assets/javascripts/corp/navigation.js new file mode 100644 index 000000000..f918221b0 --- /dev/null +++ b/web/app/assets/javascripts/corp/navigation.js @@ -0,0 +1,6 @@ +$(function() { + // nav highlight + var purpose = $('body').attr('data-purpose'); + + $('#nav a[data-purpose="' + purpose + '"]').addClass('active'); +}); diff --git a/web/app/assets/javascripts/createSession.js b/web/app/assets/javascripts/createSession.js new file mode 100644 index 000000000..31363bcb8 --- /dev/null +++ b/web/app/assets/javascripts/createSession.js @@ -0,0 +1,506 @@ +(function(context,$) { + + "use strict"; + + context.JK = context.JK || {}; + context.JK.CreateSessionScreen = function(app) { + var logger = context.JK.logger; + var realtimeMessaging = context.JK.JamServer; + var friendSelectorDialog = new context.JK.FriendSelectorDialog(app, friendSelectorCallback); + var invitationDialog = new context.JK.InvitationDialog(app); + var autoComplete = null; + var userNames = []; + var userIds = []; + var userPhotoUrls = []; + var MAX_GENRES = 1; + var selectedFriendIds = {}; + var sessionSettings = {}; + + function beforeShow(data) { + userNames = []; + userIds = []; + userPhotoUrls = []; + context.JK.GenreSelectorHelper.render('#create-session-genre'); + resetForm(); + } + + function afterShow(data) { + $.ajax({ + type: "GET", + url: "/api/users/" + context.JK.currentUserId + "/friends", + async: false + }).done(function(response) { + $.each(response, function() { + userNames.push(this.name); + userIds.push(this.id); + userPhotoUrls.push(this.photo_url); + }); + + var autoCompleteOptions = { + lookup: { suggestions: userNames, data: userIds }, + onSelect: addInvitation + }; + if (!autoComplete) { + autoComplete = $('#friend-input').autocomplete(autoCompleteOptions); + } + else { + autoComplete.setOptions(autoCompleteOptions); + } + }); + + // var autoCompleteOptions = { + // serviceUrl: "/api/users/" + context.JK.currentUserId + "/friends", + // minChars: 3, + // dataType: 'jsonp', + // transformResult: function(response) { + // logger.debug("transforming..."); + // logger.debug("response.length=" + response.length); + // return { + // suggestions: $.map(response, function(dataItem) { + // return { value: dataItem.id, data: dataItem.name }; + // }) + // }; + // }, + // onSelect: addInvitation + // }; + + // if (!autoComplete) { + // autoComplete = $('#friend-input').autocomplete(autoCompleteOptions); + // } + // else { + // logger.debug("here2"); + // autoComplete.setOptions(autoCompleteOptions); + // } + } + + function friendSelectorCallback(newSelections) { + var keys = Object.keys(newSelections); + for (var i=0; i < keys.length; i++) { + addInvitation(newSelections[keys[i]].userName, newSelections[keys[i]].userId); + } + } + + function addInvitation(value, data) { + if ($('#selected-friends div[user-id=' + data + ']').length === 0) { + var template = $('#template-added-invitation').html(); + var invitationHtml = context.JK.fillTemplate(template, {userId: data, userName: value}); + $('#selected-friends').append(invitationHtml); + $('#friend-input').select(); + selectedFriendIds[data] = true; + } + else { + $('#friend-input').select(); + context.alert('Invitation already exists for this musician.'); + } + } + + function removeInvitation(evt) { + delete selectedFriendIds[$(evt.currentTarget).parent().attr('user-id')]; + $(evt.currentTarget).closest('.invitation').remove(); + } + + function resetForm() { + $('#intellectual-property').attr('checked', false); + + var $form = $('#create-session-form'); + var description = sessionSettings.hasOwnProperty('description') ? sessionSettings.description : ''; + $('textarea[name="description"]', $form).val(description); + var genre = sessionSettings.hasOwnProperty('genres') && sessionSettings.genres.length > 0 ? sessionSettings.genres[0].id : ''; + context.JK.GenreSelectorHelper.reset('#create-session-genre', genre); + + var musician_access = sessionSettings.hasOwnProperty('musician_access') ? sessionSettings.musician_access : true; + $('#musician-access option[value=' + musician_access + ']').attr('selected', 'selected'); + toggleMusicianAccess(); + + if (musician_access) { + var approval_required = sessionSettings.hasOwnProperty('approval_required') ? sessionSettings.approval_required : false; + $('#musician-access-option-' + approval_required).attr('checked', 'checked'); + } + + var fan_access = sessionSettings.hasOwnProperty('fan_access') ? sessionSettings.fan_access : true; + $('#fan-access option[value=' + fan_access + ']').attr('selected', 'selected'); + toggleFanAccess(); + + if (fan_access) { + var fan_chat = sessionSettings.hasOwnProperty('fan_chat') ? sessionSettings.fan_chat : false; + $('#fan-chat-option-' + fan_chat).attr('checked', 'checked'); + } + // Should easily be able to grab other items out of sessionSettings and put them into the appropriate ui elements. + } + + function validateForm() { + //var errors = []; + var isValid = true; + var $form = $('#create-session-form'); + + // Description can't be empty + var description = $('#description').val(); + if (!description) { + $('#divDescription .error-text').remove(); + $('#divDescription').addClass("error"); + $('#description').after("
- Description is required
- You must select a genre.
- You must accept the JamKazam Terms of Service.
Loading your contacts...
');
+ window._oauth_callback = function() {
+ window._oauth_win.close();
+ window._oauth_win = null;
+ window._oauth_callback = null;
+ $.ajax({
+ type: "GET",
+ url: "/gmail_contacts",
+ success: function(response) {
+ $('#invitation-checkboxes').html('');
+ for (var i in response) {
+ $('#invitation-checkboxes').append("");
+ }
+
+ $('.invitation-checkbox').change(function() {
+ var checkedBoxes = $('.invitation-checkbox:checkbox:checked');
+ var emails = '';
+ for (var i = 0; i < checkedBoxes.length; i++) {
+ emails += $(checkedBoxes[i]).data('email') + ', ';
+ }
+ emails = emails.replace(/, $/, '');
+ $('#txt-emails').val(emails);
+ });
+ },
+ error: function() {
+ $('#invitation-checkboxes').html("Load failed");
+ }
+ });
+
+ };
+ window._oauth_win = window.open("/auth/google_login", "_blank", "height=500,width=500,menubar=no,resizable=no,status=no");
+ });
+
+ $('#btn-facebook-invitation').click(function() {
+ /*
+ $('#invitation-textarea-container').hide();
+ $('#invitation-checkbox-container').show();
+ $('#btn-send-invitation').hide();
+ $('#btn-next-invitation').show();
+ invitationDialog.showDialog();
+ $('#invitation-checkboxes').html('Loading your contacts...
');
+ */
+ window._oauth_callback = function() {
+ window._oauth_win.close();
+ window._oauth_win = null;
+ window._oauth_callback = null;
+ /*
+ $.ajax({
+ type: "GET",
+ url: "/gmail_contacts",
+ success: function(response) {
+ $('#invitation-checkboxes').html('');
+ for (var i in response) {
+ $('#invitation-checkboxes').append("");
+ }
+
+ $('.invitation-checkbox').change(function() {
+ var checkedBoxes = $('.invitation-checkbox:checkbox:checked');
+ var emails = '';
+ for (var i = 0; i < checkedBoxes.length; i++) {
+ emails += $(checkedBoxes[i]).data('email') + ', ';
+ }
+ emails = emails.replace(/, $/, '');
+ $('#txt-emails').val(emails);
+ });
+ },
+ error: function() {
+ $('#invitation-checkboxes').html("Load failed");
+ }
+ });
+ */
+ };
+ window._oauth_win = window.open("/auth/facebook_login", "_blank", "height=500,width=500,menubar=no,resizable=no,status=no");
+ });
+
+
+ $('#btn-next-invitation').click(function() {
+ $('#invitation-textarea-container').show();
+ $('#invitation-checkbox-container').hide();
+ $('#btn-send-invitation').show();
+ $('#btn-next-invitation').hide();
+ });
+
+ // friend input focus
+ $('#friend-input').focus(function() {
+ $(this).val('');
+ });
+
+ // friend input blur
+ $('#friend-input').blur(function() {
+ $(this).val('Type a friend\'s name');
+ });
+ }
+
+ function toggleMusicianAccess() {
+ var value = $("#musician-access option:selected").val();
+ if (value == "false") {
+ $("input[name='musician-access-option']").attr('disabled', 'disabled');
+ $("input[name='musician-access-option']").parent().addClass("op50");
+ }
+ else {
+ $("input[name='musician-access-option']").removeAttr('disabled');
+ $("input[name='musician-access-option']").parent().removeClass("op50");
+ }
+ }
+
+ function toggleFanAccess() {
+ var value = $("#fan-access option:selected").val();
+ if (value == "false") {
+ $("input[name='fan-chat-option']").attr('disabled', 'disabled');
+ $("input[name='fan-chat-option']").parent().addClass("op50");
+ }
+ else {
+ $("input[name='fan-chat-option']").removeAttr('disabled');
+ $("input[name='fan-chat-option']").parent().removeClass("op50");
+ }
+ }
+
+ function loadBands() {
+ var url = "/api/users/" + context.JK.currentUserId + "/bands";
+ $.ajax({
+ type: "GET",
+ url: url,
+ success: bandsLoaded
+ });
+ }
+
+ function bandsLoaded(response) {
+ $.each(response, function() {
+ var template = $('#template-band-option').html();
+ var bandOptionHtml = context.JK.fillTemplate(template, {value: this.id, label: this.name});
+ $('#band-list').append(bandOptionHtml);
+ });
+ }
+
+ function loadSessionSettings() {
+ var url = "/api/users/" + context.JK.currentUserId + "/session_settings";
+ $.ajax({
+ type: "GET",
+ url: url,
+ success: sessionSettingsLoaded
+ });
+ }
+
+ function sessionSettingsLoaded(response) {
+ if (response != null)
+ {
+ sessionSettings = response;
+ }
+ resetForm();
+ }
+
+ function searchFriends(query) {
+ if (query.length < 2) {
+ $('#friend-search-results').empty();
+ return;
+ }
+ var url = "/api/search?query=" + query + "&userId=" + context.JK.currentUserId;
+ $.ajax({
+ type: "GET",
+ url: url,
+ success: friendSearchComplete
+ });
+ }
+
+ function friendSearchComplete(response) {
+ // reset search results each time
+ $('#friend-search-results').empty();
+
+ // loop through each
+ $.each(response.friends, function() {
+ // only show friends who are musicians
+ if (this.musician === true) {
+ var template = $('#template-friend-search-results').html();
+ var searchResultHtml = context.JK.fillTemplate(template, {userId: this.id, name: this.first_name + ' ' + this.last_name});
+ $('#friend-search-results').append(searchResultHtml);
+ $('#friend-search-results').attr('style', 'display:block');
+ }
+ });
+ }
+
+ function initialize() {
+ friendSelectorDialog.initialize();
+ invitationDialog.initialize();
+ events();
+ loadBands();
+ loadSessionSettings();
+ var screenBindings = { 'beforeShow': beforeShow, 'afterShow': afterShow };
+ app.bindScreen('createSession', screenBindings);
+ }
+
+ // Expose publics
+ this.initialize = initialize;
+ this.resetForm = resetForm;
+ this.submitForm = submitForm;
+ this.validateForm = validateForm;
+ this.loadBands = loadBands;
+ this.searchFriends = searchFriends;
+ this.addInvitation = addInvitation;
+
+ return this;
+ };
+
+ })(window,jQuery);
diff --git a/web/app/assets/javascripts/faderHelpers.js b/web/app/assets/javascripts/faderHelpers.js
new file mode 100644
index 000000000..951ee5e4c
--- /dev/null
+++ b/web/app/assets/javascripts/faderHelpers.js
@@ -0,0 +1,226 @@
+/**
+* Functions related to faders (slider controls for volume).
+* These functions are intimately tied to the markup defined in
+* the templates in _faders.html.erb
+*/
+(function(g, $) {
+
+ "use strict";
+
+ g.JK = g.JK || {};
+
+ var $draggingFaderHandle = null;
+ var $draggingFader = null;
+
+ var subscribers = {};
+ var logger = g.JK.logger;
+ var MAX_VISUAL_FADER = 95;
+
+ function faderClick(evt) {
+ evt.stopPropagation();
+ if (g.JK.$draggingFaderHandle) {
+ return;
+ }
+ var $fader = $(evt.currentTarget);
+ var faderId = $fader.closest('[fader-id]').attr("fader-id");
+ var $handle = $fader.find('div[control="fader-handle"]');
+
+ var faderPct = faderValue($fader, evt);
+
+ // Notify subscribers of value change
+ g._.each(subscribers, function(changeFunc, index, list) {
+ if (faderId === index) {
+ changeFunc(faderId, faderPct, false);
+ }
+ });
+
+ setHandlePosition($fader, faderPct);
+ return false;
+ }
+
+ function setHandlePosition($fader, value) {
+ if (value > MAX_VISUAL_FADER) { value = MAX_VISUAL_FADER; } // Visual limit
+ var $handle = $fader.find('div[control="fader-handle"]');
+ var handleCssAttribute = getHandleCssAttribute($fader);
+ $handle.css(handleCssAttribute, value + '%');
+ }
+
+
+ function faderHandleDown(evt) {
+ evt.stopPropagation();
+ $draggingFaderHandle = $(evt.currentTarget);
+ $draggingFader = $draggingFaderHandle.closest('div[control="fader"]');
+ return false;
+ }
+
+ function faderMouseUp(evt) {
+ evt.stopPropagation();
+ if ($draggingFaderHandle) {
+ var $fader = $draggingFaderHandle.closest('div[control="fader"]');
+ var faderId = $fader.closest('[fader-id]').attr("fader-id");
+ var faderPct = faderValue($fader, evt);
+ // Notify subscribers of value change
+ g._.each(subscribers, function(changeFunc, index, list) {
+ if (faderId === index) {
+ changeFunc(faderId, faderPct, false);
+ }
+ });
+ $draggingFaderHandle = null;
+ $draggingFader = null;
+ }
+ return false;
+ }
+
+ function faderValue($fader, evt) {
+ var orientation = $fader.attr('orientation');
+ var getPercentFunction = getVerticalFaderPercent;
+ var absolutePosition = evt.clientY;
+ if (orientation && orientation == 'horizontal') {
+ getPercentFunction = getHorizontalFaderPercent;
+ absolutePosition = evt.clientX;
+ }
+ return getPercentFunction(absolutePosition, $fader);
+ }
+
+ function getHandleCssAttribute($fader) {
+ var orientation = $fader.attr('orientation');
+ return (orientation === 'horizontal') ? 'left' : 'bottom';
+ }
+
+ function faderMouseMove(evt) {
+ // bail out early if there's no in-process drag
+ if (!($draggingFaderHandle)) {
+ return false;
+ }
+ var $fader = $draggingFader;
+ var faderId = $fader.closest('[fader-id]').attr("fader-id"); var $handle = $draggingFaderHandle;
+ evt.stopPropagation();
+ var faderPct = faderValue($fader, evt);
+
+ // Notify subscribers of value change
+ g._.each(subscribers, function(changeFunc, index, list) {
+ if (faderId === index) {
+ changeFunc(faderId, faderPct, true);
+ }
+ });
+
+ if (faderPct > MAX_VISUAL_FADER) { faderPct = MAX_VISUAL_FADER; } // Visual limit
+ var handleCssAttribute = getHandleCssAttribute($fader);
+ $handle.css(handleCssAttribute, faderPct + '%');
+ return false;
+ }
+
+ function getVerticalFaderPercent(eventY, $fader) {
+ return getFaderPercent(eventY, $fader, 'vertical');
+ }
+
+ function getHorizontalFaderPercent(eventX, $fader) {
+ return getFaderPercent(eventX, $fader, 'horizontal');
+ }
+
+ /**
+ * Returns the current value of the fader as int percent 0-100
+ */
+ function getFaderPercent(value, $fader, orientation) {
+ var faderPosition = $fader.offset();
+ var faderMin = faderPosition.top;
+ var faderSize = $fader.height();
+ var handleValue = (faderSize - (value-faderMin));
+ if (orientation === "horizontal") {
+ faderMin = faderPosition.left;
+ faderSize = $fader.width();
+ handleValue = (value - faderMin);
+ }
+ var faderPct = Math.round(handleValue/faderSize * 100);
+ if (faderPct < 0) {
+ faderPct = 0;
+ }
+ if (faderPct > 100) {
+ faderPct = 100;
+ }
+ return faderPct;
+ }
+
+ g.JK.FaderHelpers = {
+
+ /**
+ * Subscribe to fader change events. Provide a subscriber id
+ * and a function in the form: change(faderId, newValue) which
+ * will be called anytime a fader changes value.
+ */
+ subscribe: function(subscriberId, changeFunction) {
+ subscribers[subscriberId] = changeFunction;
+ },
+
+ /**
+ * Render a fader into the element identifed by the provided
+ * selector, with the provided options.
+ */
+ renderFader: function(selector, userOptions) {
+ if (userOptions === undefined) {
+ throw ("renderFader: userOptions is required");
+ }
+ if (!(userOptions.hasOwnProperty("faderId"))) {
+ throw ("renderFader: userOptions.faderId is required");
+ }
+ var renderDefaults = {
+ faderType: "vertical",
+ height: 83, // only used for vertical
+ width: 83 // only used for horizontal
+ };
+ var options = $.extend({}, renderDefaults, userOptions);
+ var templateSelector = (options.faderType === 'horizontal') ?
+ "#template-fader-h" : '#template-fader-v';
+ var templateSource = $(templateSelector).html();
+
+ $(selector).html(g._.template(templateSource, options));
+ // Embed any custom styles, applied to the .fader below selector
+ if ("style" in options) {
+ for (var key in options.style) {
+ $(selector + ' .fader').css(key, options.style[key]);
+ }
+ }
+ },
+
+ convertLinearToDb: function(input) {
+ var temp;
+ temp = 0.0;
+ // coefficients
+ var a = -8.0013990435159329E+01;
+ var b = 4.1755639785242042E+00;
+ var c = -1.4036729740086906E-01;
+ var d = 3.1788545454166156E-03;
+ var f = -3.5148685730880861E-05;
+ var g = 1.4221429222004657E-07;
+ temp += a +
+ b * input +
+ c * Math.pow(input, 2.0) +
+ d * Math.pow(input, 3.0) +
+ f * Math.pow(input, 4.0) +
+ g * Math.pow(input, 5.0);
+
+ return temp;
+ },
+
+ setFaderValue: function(faderId, faderValue) {
+ var $fader = $('[fader-id="' + faderId + '"]');
+ this.setHandlePosition($fader, faderValue);
+ },
+
+ setHandlePosition: function($fader, faderValue) {
+ setHandlePosition($fader, faderValue);
+ },
+
+ initialize: function() {
+ $('body').on('click', 'div[control="fader"]', faderClick);
+ $('body').on('mousedown', 'div[control="fader-handle"]', faderHandleDown);
+ $('body').on('mousemove', 'div[layout-id="session"], [layout-wizard="ftue"]', faderMouseMove);
+ $('body').on('mouseup', 'div[layout-id="session"], [layout-wizard="ftue"]', faderMouseUp);
+ //$('body').on('mousemove', faderMouseMove);
+ //$('body').on('mouseup', faderMouseUp);
+ }
+
+ };
+
+
+})(window, jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/fakeJamClient.js b/web/app/assets/javascripts/fakeJamClient.js
new file mode 100644
index 000000000..662859ea2
--- /dev/null
+++ b/web/app/assets/javascripts/fakeJamClient.js
@@ -0,0 +1,592 @@
+(function(context,$) {
+
+ "use strict";
+
+ context.JK = context.JK || {};
+ context.JK.FakeJamClient = function(app) {
+ var logger = context.JK.logger;
+ logger.info("*** Fake JamClient instance initialized. ***");
+
+ // Change this to false if you want to see FTUE with fake jam client
+ var ftueStatus = true;
+ var eventCallbackName = '';
+ var eventCallbackRate = 1000;
+ var vuValue = -70;
+ var vuChange = 10;
+ var callbackTimer = null;
+ var _mix = -30;
+ var device_id = -1;
+ var latencyCallback = null;
+ var frameSize = 2.5;
+
+ function dbg(msg) { logger.debug('FakeJamClient: ' + msg); }
+
+ // Bummer that javascript doesn't have much in the way of reflection.
+ // arguments.callee.name would probably do what we want, but it's deprecated
+ // and not allowed when using "strict"
+ // (Wishing I could write a single function which debug logs the name of the
+ // current function and a JSON stringify of the arguments).
+
+ function OpenSystemBrowser(href) {
+ dbg("OpenSystemBrowser('" + href + "')");
+ context.window.open(href);
+ }
+ function FTUEGetInputLatency() {
+ dbg("FTUEGetInputLatency");
+ return 2;
+ }
+ function FTUESetInputLatency(latency) {
+ dbg("FTUESetInputLatency:" + latency);
+ }
+ function FTUEGetOutputLatency() {
+ dbg("FTUEGetOutputLatency");
+ return 2;
+ }
+ function FTUESetOutputLatency(latency) {
+ dbg("FTUESetOutputLatency:" + latency);
+ }
+ function FTUEGetVolumeRanges () {
+ dbg("FTUEGetVolumeRanges");
+ return {
+ input_maximum: 20,
+ input_minimum: -80,
+ output_maximum: 20,
+ output_minimum: -80
+ };
+ }
+ function FTUEHasControlPanel() {
+ dbg("FTUEHasControlPanel");
+ return true;
+ }
+ function FTUEGetFrameSize(newSize) {
+ dbg("FTUEGetFrameSize");
+ return frameSize;
+ }
+ function FTUESetFrameSize(newSize) {
+ dbg("FTUESetFrameSize:" + newSize);
+ // one of 2.5, 5 or 10
+ frameSize = newSize;
+ }
+ function FTUEOpenControlPanel() {
+ dbg("FTUEOpenControlPanel");
+ context.alert("Simulated ASIO Dialog");
+ }
+ function FTUEInit() { dbg("FTUEInit"); }
+ function FTUERefreshDevices() { dbg("FTUERefreshDevices()"); }
+ function FTUESave(b) { dbg("FTUESave(" + b + ")"); }
+ function FTUEGetStatus() { return ftueStatus; }
+ function FTUESetStatus(b) { ftueStatus = b; }
+ function FTUESetMusicDevice(id) { dbg("FTUESetMusicDevice"); }
+ function FTUEGetDevices() {
+ dbg('FTUEGetMusicDevices');
+ return {
+ "ASIO4ALL v2":"ASIO4ALL v2 - ASIO",
+ "M-Audio FW ASIO":"M-AUDIO FW ASIO - ASIO"
+ };
+ }
+ function FTUEGetMusicInputs() {
+ dbg('FTUEGetMusicInputs');
+ return {
+ "i~11~MultiChannel (FW AP Multi)~0^i~11~Multichannel (FW AP Multi)~1":
+ "Multichannel (FW AP Multi) - Channel 1/Multichannel (FW AP Multi) - Channel 2"
+ };
+ }
+ function FTUEGetMusicOutputs() {
+ dbg('FTUEGetMusicOutputs');
+ return {
+ "o~11~Multichannel (FW AP Multi)~0^o~11~Multichannel (FW AP Multi)~1":
+ "Multichannel (FW AP Multi) - Channel 1/Multichannel (FW AP Multi) - Channel 2"
+ };
+ }
+ function FTUEGetChatInputs() {
+ dbg('FTUEGetChatInputs');
+ return {
+ "i~11~MultiChannel (FW AP Multi)~0^i~11~Multichannel (FW AP Multi)~1":
+ "Multichannel (FW AP Multi) - Channel 1/Multichannel (FW AP Multi) - Channel 2"
+ };
+ }
+ function FTUESetMusicInput() { dbg('FTUESetMusicInput'); }
+ function FTUESetChatInput() { dbg('FTUESetChatInput'); }
+ function FTUESetMusicOutput() { dbg('FTUESetMusicOutput'); }
+ function FTUEGetInputVolume() { dbg('FTUEGetInputVolume'); return -60; }
+ function FTUESetInputVolume() { dbg('FTUESetInputVolume'); }
+ function FTUEGetOutputVolume() { dbg('FTUEGetOutputVolume'); return -40; }
+ function FTUESetOutputVolume() { dbg('FTUESetOutputVolume'); }
+ function FTUEGetChatInputVolume() { dbg('FTUEGetChatInputVolume'); return -10; }
+ function FTUESetChatInputVolume() { dbg('FTUESetChatInputVolume'); }
+ function FTUERegisterVUCallbacks() {
+ dbg('FTUERegisterVUCallbacks');
+ }
+ function FTUERegisterLatencyCallback(functionName) {
+ dbg('FTUERegisterLatencyCallback');
+ latencyCallback = functionName;
+ }
+ function FTUEStartLatency() {
+ function cb() {
+ // Change 4192 to modify latency MS results (in microseconds)
+ eval(latencyCallback + "(10.0)");
+ }
+ context.setTimeout(cb, 1000);
+ }
+
+ function RegisterVolChangeCallBack(functionName) {
+ dbg('RegisterVolChangeCallBack');
+ }
+
+
+ function GetOS() { return 100000000; }
+ function GetOSAsString() {
+ return "Win32";
+ //return "Mac";
+ }
+
+ function LatencyUpdated(map) { dbg('LatencyUpdated:' + JSON.stringify(map)); }
+ function LeaveSession(map) { dbg('LeaveSession:' + JSON.stringify(map)); }
+ function P2PMessageReceived(s1,s2) { dbg('P2PMessageReceived:' + s1 + ',' + s2); }
+ function JoinSession(sessionId) {dbg('JoinSession:' + sessionId);}
+ function ParticipantLeft(session, participant) {
+ dbg('ParticipantLeft:' + JSON.stringify(session) + ',' +
+ JSON.stringify(participant));
+ }
+ function ParticipantJoined(session, participant) {
+ dbg('ParticipantJoined:' + JSON.stringify(session) + ',' +
+ JSON.stringify(participant));
+ }
+ function RecordTestBegin() { dbg('RecordTestBegin'); }
+ function RecordTestEnd() { dbg('RecordTestBegin'); }
+ function RecordTestPlayback() { dbg('RecordTestBegin'); }
+ function SendP2PMessage(s1,s2) { dbg('SendP2PMessage:' + s1 + ',' + s2); }
+ function SetASIOEnabled(i1, i2, i3, i4, i5, i6) {
+ dbg('SetASIOEnabled(' + i1 + ',' + i2 + ',' + i3 + ',' + i4 + ',' + i5 + ',' + i6 + ')');
+ }
+ function SignalLatencyUpdated(client) {
+ dbg('SignalLatencyUpdated:' + JSON.stringify(client));
+ }
+ function SignalSendP2PMessage(s1,ba) {
+ dbg('SignalSendP2PMessage:' + JSON.stringify(arguments));
+ }
+ function StartPlayTest(s) { dbg('StartPlayTest' + JSON.stringify(arguments)); }
+ function StartRecordTest(s) { dbg('StartRecordTest' + JSON.stringify(arguments)); }
+ function StartRecording(map) { dbg('StartRecording' + JSON.stringify(arguments)); }
+ function StopPlayTest() { dbg('StopPlayTest'); }
+ function StopRecording(map) { dbg('StopRecording' + JSON.stringify(arguments)); }
+ function TestASIOLatency(s) { dbg('TestASIOLatency' + JSON.stringify(arguments)); }
+
+ function TestLatency(clientID, callbackFunctionName, timeoutCallbackName) {
+ logger.debug("Fake JamClient: TestLatency called with client, " + clientID + " and callback function name: " + callbackFunctionName);
+ var response = {
+ clientID: clientID,
+ latency: 50
+ };
+ var js = callbackFunctionName + "(" + JSON.stringify(response) + ");";
+ eval(js);
+ }
+
+ function GetASIODevices() {
+ var response =[{"device_id":0,"device_name":"Realtek High Definition Audio","device_type": 0,"interfaces":[{"interface_id":0,"interface_name":"Realtek HDA SPDIF Out","pins":[{"is_input":false,"pin_id":0,"pin_name":"PC Speaker"}]},{"interface_id":1,"interface_name":"Realtek HD Audio rear output","pins":[{"is_input":false,"pin_id":0,"pin_name":"PC Speaker"}]},{"interface_id":2,"interface_name":"Realtek HD Audio Mic input","pins":[{"is_input":true,"pin_id":0,"pin_name":"Recording Control"}]},{"interface_id":3,"interface_name":"Realtek HD Audio Line input","pins":[{"is_input":true,"pin_id":0,"pin_name":"Recording Control"}]},{"interface_id":4,"interface_name":"Realtek HD Digital input","pins":[{"is_input":true,"pin_id":0,"pin_name":"Capture"}]},{"interface_id":5,"interface_name":"Realtek HD Audio Stereo input","pins":[{"is_input":true,"pin_id":0,"pin_name":"Recording Control"}]}],"wavert_supported":false},{"device_id":1,"device_name":"M-Audio FW Audiophile","device_type": 1,"interfaces":[{"interface_id":0,"interface_name":"FW AP Multi","pins":[{"is_input":false,"pin_id":0,"pin_name":"Output"},{"is_input":true,"pin_id":1,"pin_name":"Input"}]},{"interface_id":1,"interface_name":"FW AP 1/2","pins":[{"is_input":false,"pin_id":0,"pin_name":"Output"},{"is_input":true,"pin_id":1,"pin_name":"Input"}]},{"interface_id":2,"interface_name":"FW AP SPDIF","pins":[{"is_input":false,"pin_id":0,"pin_name":"Output"},{"is_input":true,"pin_id":1,"pin_name":"Input"}]},{"interface_id":3,"interface_name":"FW AP 3/4","pins":[{"is_input":false,"pin_id":0,"pin_name":"Output"}]}],"wavert_supported":false},{"device_id":2,"device_name":"Virtual Audio Cable","device_type": 2,"interfaces":[{"interface_id":0,"interface_name":"Virtual Cable 2","pins":[{"is_input":true,"pin_id":0,"pin_name":"Capture"},{"is_input":false,"pin_id":1,"pin_name":"Output"}]},{"interface_id":1,"interface_name":"Virtual Cable 1","pins":[{"is_input":true,"pin_id":0,"pin_name":"Capture"},{"is_input":false,"pin_id":1,"pin_name":"Output"}]}],"wavert_supported":false},{"device_id":3,"device_name":"WebCamDV WDM Audio Capture","device_type": 3,"interfaces":[{"interface_id":0,"interface_name":"WebCamDV Audio","pins":[{"is_input":true,"pin_id":0,"pin_name":"Recording Control"},{"is_input":false,"pin_id":1,"pin_name":"Volume Control"}]}],"wavert_supported":false}];
+ return response;
+ }
+
+ // Session Functions
+ function SessionAddTrack() {}
+ function SessionGetControlState(mixerIds) {
+ dbg("SessionGetControlState");
+ var groups = [0, 1, 2, 3, 7, 9];
+ var names = [
+ "FW AP Multi",
+ "FW AP Multi",
+ "FW AP Multi",
+ "FW AP Multi",
+ "",
+ ""
+ ];
+ var clientIds = [
+ "",
+ "",
+ "",
+ "",
+ "3933ebec-913b-43ab-a4d3-f21dc5f8955b",
+ ""
+ ];
+ var response = [];
+ for (var i=0; i");
+ var msg_header = $("").text(msg.type);
+ msg_div.append(msg_header);
+
+ var list = $("
diff --git a/web/app/views/clients/_sidebar.html.erb b/web/app/views/clients/_sidebar.html.erb
new file mode 100644
index 000000000..51681fb58
--- /dev/null
+++ b/web/app/views/clients/_sidebar.html.erb
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_testBridge.html.erb b/web/app/views/clients/_testBridge.html.erb
new file mode 100644
index 000000000..6b6d51ada
--- /dev/null
+++ b/web/app/views/clients/_testBridge.html.erb
@@ -0,0 +1,62 @@
+
+").text(msg.type);
+ msg_div.append(msg_header);
+
+ var list = $("");
+ msg_div.append(list);
+
+ for (var key in inner) {
+ list.append($("- ").text(key));
+ list.append($("
- ").text(inner[key]));
+ }
+
+
+ $("#internal_session_activity").append(msg_div);
+ }
+
+ jamsocket.init = function() {
+
+ function send(msg) {
+ ws.send(context.JSON.stringify(msg));
+ }
+
+ // Let the library know where WebSocketMain.swf is:
+ context.WEB_SOCKET_SWF_LOCATION = "assets/flash/WebSocketMain.swf";
+
+ var mf = context.message_factory;
+
+ // Write your code in the same way as for native WebSocket:
+ var ws = new context.WebSocket(context.gon.websocket_gateway_uri);
+ ws.onopen = function() {
+ var token = $.cookie("remember_token");
+ // there is a chance the token is invalid at this point
+ // but if it is, login should fail, and we can catch that as an error
+ // and deal with it then.
+ $("#internal_session_activity").children().remove();
+ var login = mf.login_with_token(token);
+ send(login);
+ };
+ ws.onmessage = function(e) {
+ var msg = JSON.parse(e.data);
+ var inner = msg[msg.type.toLowerCase()];
+
+ debug_print(msg, inner);
+
+ if(msg.type == context.JK.MessageType.LOGIN_ACK) {
+ // we are in... sign in to jam session
+
+ var login_jam = mf.login_music_session(context.gon.music_session_id);
+ send(login_jam);
+ }
+ };
+ ws.onclose = function() {
+ context.alert("websocket connection closed");
+ };
+ };
+
+ context.jamsocket = jamsocket;
+})(window, jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/joinSession.js b/web/app/assets/javascripts/joinSession.js
new file mode 100644
index 000000000..25c3e3300
--- /dev/null
+++ b/web/app/assets/javascripts/joinSession.js
@@ -0,0 +1,57 @@
+(function(context,$) {
+
+ "use strict";
+
+ context.JK = context.JK || {};
+
+ context.JK.joinMusicSession = function(session_id, app) {
+ var logger = context.JK.logger;
+ var server = context.JK.JamServer;
+ var client = context.jamClient;
+
+ if (!server.signedIn)
+ {
+ logger.log("Can't join a session because the client is not connected.");
+ return;
+ }
+
+ logger.log("Joining session: " + session_id);
+
+
+ // FIXME. Setting tracks for join session. Only looking at profile
+ // for now. Needs to check jamClient instruments and if set, use those
+ // as first preference.
+ var track = { instrument_id: "electric guitar", sound: "stereo" };
+ if (context.JK.userMe.instruments.length) {
+ track = {
+ instrument_id: context.JK.userMe.instruments[0].instrument_id,
+ sound: "stereo"
+ };
+ }
+
+ var data = {
+ client_id: server.clientID,
+ ip_address: server.publicIP,
+ as_musician: true,
+ tracks: [ track ]
+ };
+ var url = "/api/sessions/" + session_id + "/participants";
+ $.ajax({
+ type: "POST",
+ dataType: "json",
+ contentType: 'application/json',
+ url: url,
+ data: JSON.stringify(data),
+ processData:false,
+ success: function(response) {
+ context.JK.Sessions.JoinSession(session_id);
+ if (client !== undefined) {
+ client.JoinSession({ sessionID: session_id });
+ }
+ context.JK.refreshMusicSession(session_id);
+ },
+ error: app.ajaxError
+ });
+ };
+
+ })(window,jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/jquery.autocomplete.js b/web/app/assets/javascripts/jquery.autocomplete.js
new file mode 100644
index 000000000..da94f65bf
--- /dev/null
+++ b/web/app/assets/javascripts/jquery.autocomplete.js
@@ -0,0 +1,433 @@
+/**
+* Ajax Autocomplete for jQuery, version 1.1.5
+* (c) 2010 Tomas Kirda, Vytautas Pranskunas
+*
+* Ajax Autocomplete for jQuery is freely distributable under the terms of an MIT-style license.
+* For details, see the web site: http://www.devbridge.com/projects/autocomplete/jquery/
+*
+* Last Review: 07/24/2012
+*/
+
+/*jslint onevar: true, evil: true, nomen: true, eqeqeq: true, bitwise: true, regexp: true, newcap: true, immed: true */
+/*global window: true, document: true, clearInterval: true, setInterval: true, jQuery: true */
+
+(function ($) {
+
+ var reEscape = new RegExp('(\\' + ['/', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\'].join('|\\') + ')', 'g');
+
+ function fnFormatResult(value, data, currentValue) {
+ var pattern = '(' + currentValue.replace(reEscape, '\\$1') + ')';
+ return value.replace(new RegExp(pattern, 'gi'), '$1<\/strong>');
+ }
+
+ function Autocomplete(el, options) {
+ this.el = $(el);
+ this.el.attr('autocomplete', 'off');
+ this.suggestions = [];
+ this.data = [];
+ this.badQueries = [];
+ this.selectedIndex = -1;
+ this.currentValue = this.el.val();
+ this.intervalId = 0;
+ this.cachedResponse = [];
+ this.onChangeInterval = null;
+ this.onChange = null;
+ this.ignoreValueChange = false;
+ this.serviceUrl = options.serviceUrl;
+ this.isLocal = false;
+ this.options = {
+ autoSubmit: false,
+ minChars: 1,
+ maxHeight: 300,
+ deferRequestBy: 0,
+ width: 0,
+ highlight: true,
+ params: {},
+ fnFormatResult: fnFormatResult,
+ delimiter: null,
+ zIndex: 9999
+ };
+ this.initialize();
+ this.setOptions(options);
+ this.el.data('autocomplete', this);
+ }
+
+ $.fn.autocomplete = function (options, optionName) {
+
+ var autocompleteControl;
+
+ if (typeof options == 'string') {
+ autocompleteControl = this.data('autocomplete');
+ if (typeof autocompleteControl[options] == 'function') {
+ autocompleteControl[options](optionName);
+ }
+ } else {
+ autocompleteControl = new Autocomplete(this.get(0) || $(''), options);
+ }
+ return autocompleteControl;
+ };
+
+
+ Autocomplete.prototype = {
+
+ killerFn: null,
+
+ initialize: function () {
+
+ var me, uid, autocompleteElId;
+ me = this;
+ uid = Math.floor(Math.random() * 0x100000).toString(16);
+ autocompleteElId = 'Autocomplete_' + uid;
+
+ this.killerFn = function (e) {
+ if ($(e.target).parents('.autocomplete').size() === 0) {
+ me.killSuggestions();
+ me.disableKillerFn();
+ }
+ };
+
+ if (!this.options.width) { this.options.width = this.el.width(); }
+ this.mainContainerId = 'AutocompleteContainter_' + uid;
+
+ $('').appendTo('body');
+
+ this.container = $('#' + autocompleteElId);
+ this.fixPosition();
+ if (window.opera) {
+ this.el.keypress(function (e) { me.onKeyPress(e); });
+ } else {
+ this.el.keydown(function (e) { me.onKeyPress(e); });
+ }
+ this.el.keyup(function (e) { me.onKeyUp(e); });
+ this.el.blur(function () { me.enableKillerFn(); });
+ this.el.focus(function () { me.fixPosition(); });
+ this.el.change(function () { me.onValueChanged(); });
+ },
+
+ extendOptions: function (options) {
+ $.extend(this.options, options);
+ },
+
+ setOptions: function (options) {
+ var o = this.options;
+ this.extendOptions(options);
+ if (o.lookup || o.isLocal) {
+ this.isLocal = true;
+ if ($.isArray(o.lookup)) { o.lookup = { suggestions: o.lookup, data: [] }; }
+ }
+ $('#' + this.mainContainerId).css({ zIndex: o.zIndex });
+ this.container.css({ maxHeight: o.maxHeight + 'px', width: o.width });
+ },
+
+ clearCache: function () {
+ this.cachedResponse = [];
+ this.badQueries = [];
+ },
+
+ disable: function () {
+ this.disabled = true;
+ },
+
+ enable: function () {
+ this.disabled = false;
+ },
+
+ fixPosition: function () {
+ var offset = this.el.offset();
+ $('#' + this.mainContainerId).css({ top: (offset.top + this.el.innerHeight()) + 'px', left: offset.left + 'px' });
+ },
+
+ enableKillerFn: function () {
+ var me = this;
+ $(document).bind('click', me.killerFn);
+ },
+
+ disableKillerFn: function () {
+ var me = this;
+ $(document).unbind('click', me.killerFn);
+ },
+
+ killSuggestions: function () {
+ var me = this;
+ this.stopKillSuggestions();
+ this.intervalId = window.setInterval(function () { me.hide(); me.stopKillSuggestions(); }, 300);
+ },
+
+ stopKillSuggestions: function () {
+ window.clearInterval(this.intervalId);
+ },
+
+ onValueChanged: function () {
+ this.change(this.selectedIndex);
+ },
+
+ onKeyPress: function (e) {
+ if (this.disabled || !this.enabled) { return; }
+ // return will exit the function
+ // and event will not be prevented
+ switch (e.keyCode) {
+ case 27: //KEY_ESC:
+ this.el.val(this.currentValue);
+ this.hide();
+ break;
+ case 9: //KEY_TAB:
+ case 13: //KEY_RETURN:
+ if (this.selectedIndex === -1) {
+ this.hide();
+ return;
+ }
+ this.select(this.selectedIndex);
+ if (e.keyCode === 9) { return; }
+ break;
+ case 38: //KEY_UP:
+ this.moveUp();
+ break;
+ case 40: //KEY_DOWN:
+ this.moveDown();
+ break;
+ default:
+ return;
+ }
+ e.stopImmediatePropagation();
+ e.preventDefault();
+ },
+
+ onKeyUp: function (e) {
+ if (this.disabled) { return; }
+ switch (e.keyCode) {
+ case 38: //KEY_UP:
+ case 40: //KEY_DOWN:
+ return;
+ }
+ clearInterval(this.onChangeInterval);
+ if (this.currentValue !== this.el.val()) {
+ if (this.options.deferRequestBy > 0) {
+ // Defer lookup in case when value changes very quickly:
+ var me = this;
+ this.onChangeInterval = setInterval(function () { me.onValueChange(); }, this.options.deferRequestBy);
+ } else {
+ this.onValueChange();
+ }
+ }
+ },
+
+ onValueChange: function () {
+ clearInterval(this.onChangeInterval);
+ this.currentValue = this.el.val();
+ var q = this.getQuery(this.currentValue);
+ this.selectedIndex = -1;
+ if (this.ignoreValueChange) {
+ this.ignoreValueChange = false;
+ return;
+ }
+ if (q === '' || q.length < this.options.minChars) {
+ this.hide();
+ } else {
+ this.getSuggestions(q);
+ }
+ },
+
+ getQuery: function (val) {
+ var d, arr;
+ d = this.options.delimiter;
+ if (!d) { return $.trim(val); }
+ arr = val.split(d);
+ return $.trim(arr[arr.length - 1]);
+ },
+
+ getSuggestionsLocal: function (q) {
+ var ret, arr, len, val, i;
+ arr = this.options.lookup;
+ len = arr.suggestions.length;
+ ret = { suggestions: [], data: [] };
+ q = q.toLowerCase();
+ for (i = 0; i < len; i++) {
+ val = arr.suggestions[i];
+ if (val.toLowerCase().indexOf(q) === 0) {
+ ret.suggestions.push(val);
+ ret.data.push(arr.data[i]);
+ }
+ }
+ return ret;
+ },
+
+ getSuggestions: function (q) {
+
+ var cr, me;
+ cr = this.isLocal ? this.getSuggestionsLocal(q) : this.cachedResponse[q]; //dadeta this.options.isLocal ||
+ if (cr && $.isArray(cr.suggestions)) {
+ this.suggestions = cr.suggestions;
+ this.data = cr.data;
+ this.suggest();
+ } else if (!this.isBadQuery(q)) {
+ me = this;
+ me.options.params.query = q;
+ $.get(this.serviceUrl, me.options.params, function (txt) { me.processResponse(txt); }, 'text');
+ }
+ },
+
+ isBadQuery: function (q) {
+ var i = this.badQueries.length;
+ while (i--) {
+ if (q.indexOf(this.badQueries[i]) === 0) { return true; }
+ }
+ return false;
+ },
+
+ hide: function () {
+ this.enabled = false;
+ this.selectedIndex = -1;
+ this.container.hide();
+ },
+
+ suggest: function () {
+
+ if (this.suggestions.length === 0) {
+ this.hide();
+ return;
+ }
+
+ var me, len, div, f, v, i, s, mOver, mClick;
+ me = this;
+ len = this.suggestions.length;
+ f = this.options.fnFormatResult;
+ v = this.getQuery(this.currentValue);
+ mOver = function (xi) { return function () { me.activate(xi); }; };
+ mClick = function (xi) { return function () { me.select(xi); }; };
+ this.container.hide().empty();
+ for (i = 0; i < len; i++) {
+ s = this.suggestions[i];
+ div = $((me.selectedIndex === i ? '' + f(s, this.data[i], v) + '');
+ div.mouseover(mOver(i));
+ div.click(mClick(i));
+ this.container.append(div);
+ }
+ this.enabled = true;
+ this.container.show();
+ },
+
+ processResponse: function (text) {
+ var response;
+ try {
+ response = eval('(' + text + ')');
+ } catch (err) { return; }
+ if (!$.isArray(response.data)) { response.data = []; }
+ if (!this.options.noCache) {
+ this.cachedResponse[response.query] = response;
+ if (response.suggestions.length === 0) { this.badQueries.push(response.query); }
+ }
+ if (response.query === this.getQuery(this.currentValue)) {
+ this.suggestions = response.suggestions;
+ this.data = response.data;
+ this.suggest();
+ }
+ },
+
+ activate: function (index) {
+ var divs, activeItem;
+ divs = this.container.children();
+ // Clear previous selection:
+ if (this.selectedIndex !== -1 && divs.length > this.selectedIndex) {
+ $(divs.get(this.selectedIndex)).removeClass();
+ }
+ this.selectedIndex = index;
+ if (this.selectedIndex !== -1 && divs.length > this.selectedIndex) {
+ activeItem = divs.get(this.selectedIndex);
+ $(activeItem).addClass('selected');
+ }
+ return activeItem;
+ },
+
+ deactivate: function (div, index) {
+ div.className = '';
+ if (this.selectedIndex === index) { this.selectedIndex = -1; }
+ },
+
+ select: function (i) {
+ var selectedValue, f;
+ selectedValue = this.suggestions[i];
+ if (selectedValue) {
+ this.el.val(selectedValue);
+ if (this.options.autoSubmit) {
+ f = this.el.parents('form');
+ if (f.length > 0) { f.get(0).submit(); }
+ }
+ this.ignoreValueChange = true;
+ this.hide();
+ this.onSelect(i);
+ }
+ },
+
+ change: function (i) {
+ var selectedValue, fn, me;
+ me = this;
+ selectedValue = this.suggestions[i];
+ if (selectedValue) {
+ var s, d;
+ s = me.suggestions[i];
+ d = me.data[i];
+ me.el.val(me.getValue(s));
+ }
+ else {
+ s = '';
+ d = -1;
+ }
+
+ fn = me.options.onChange;
+ if ($.isFunction(fn)) { fn(s, d, me.el); }
+ },
+
+ moveUp: function () {
+ if (this.selectedIndex === -1) { return; }
+ if (this.selectedIndex === 0) {
+ this.container.children().get(0).className = '';
+ this.selectedIndex = -1;
+ this.el.val(this.currentValue);
+ return;
+ }
+ this.adjustScroll(this.selectedIndex - 1);
+ },
+
+ moveDown: function () {
+ if (this.selectedIndex === (this.suggestions.length - 1)) { return; }
+ this.adjustScroll(this.selectedIndex + 1);
+ },
+
+ adjustScroll: function (i) {
+ var activeItem, offsetTop, upperBound, lowerBound;
+ activeItem = this.activate(i);
+ offsetTop = activeItem.offsetTop;
+ upperBound = this.container.scrollTop();
+ lowerBound = upperBound + this.options.maxHeight - 25;
+ if (offsetTop < upperBound) {
+ this.container.scrollTop(offsetTop);
+ } else if (offsetTop > lowerBound) {
+ this.container.scrollTop(offsetTop - this.options.maxHeight + 25);
+ }
+ this.el.val(this.getValue(this.suggestions[i]));
+ },
+
+ onSelect: function (i) {
+ var me, fn, s, d;
+ me = this;
+ fn = me.options.onSelect;
+ s = me.suggestions[i];
+ d = me.data[i];
+ me.el.val(me.getValue(s));
+ if ($.isFunction(fn)) { fn(s, d, me.el); }
+ },
+
+ getValue: function (value) {
+ var del, currVal, arr, me;
+ me = this;
+ del = me.options.delimiter;
+ if (!del) { return value; }
+ currVal = me.currentValue;
+ arr = currVal.split(del);
+ if (arr.length === 1) { return value; }
+ return currVal.substr(0, currVal.length - arr[arr.length - 1].length) + value;
+ }
+
+ };
+
+} (jQuery));
diff --git a/web/app/assets/javascripts/jquery.formToObject.js b/web/app/assets/javascripts/jquery.formToObject.js
new file mode 100644
index 000000000..e50881c72
--- /dev/null
+++ b/web/app/assets/javascripts/jquery.formToObject.js
@@ -0,0 +1,110 @@
+(function($) {
+
+ /**
+ * Go through the current JQuery match, and build a
+ * javascript object based on the name attributes of
+ * child elements. This is intended to be used for forms
+ * with inputs: var jsObj = $('#myform').formToObject();
+ *
+ * Using dots in the name attributes will build nested
+ * structures into the resulting object:
+ *
+ *
+ * returns
+ * { foo: { bar:"x" } }
+ *
+ * The same name appearing twice will be returned as an array:
+ *
+ *
+ *
+ * returns
+ * { foo: ['a','b'] }
+ *
+ * Checkboxes and Radio inputs which are not checked will not
+ * appear at all, nor will any inputs which are disabled.
+ *
+ * Form fields which are optional can be omitted from the resulting
+ * object by providing a value for that field of "__OMIT__".
+ *
+ */
+ "use strict";
+
+ $.fn.formToObject = function() {
+ // don't want to depend on other libs. Provide our own size to check
+ // length of an associative array:
+ function _size(obj) {
+ var key, size=0;
+ for (key in obj) {
+ if (obj.hasOwnProperty(key)) size++;
+ }
+ return size;
+ }
+
+ var formObject = {},
+ a = this.serializeArray();
+
+ $.each(a, function() {
+ var data = $('[name="' + this.name + '"]').first().data(),
+ current = formObject,
+ childKey,
+ path = this.name.split('.'),
+ key = path.pop(),
+ val = (data && data.parseInt !== undefined && data.parseInt) ? parseInt(this.value, 10) : (
+ (this.value.toLowerCase() == 'true') ? true : (
+ (this.value.toLowerCase() == 'false') ? false : (
+ (this.value.toLowerCase() == 'null') ? null : (
+ (typeof this.value == 'undefined') ? '' : this.value
+ )
+ )
+ )
+ );
+
+ while (path.length > 0) {
+ // Shift the front element from path into childKey
+ childKey = path.shift();
+ if (!(childKey in current)) {
+ current[childKey] = {};
+ }
+ // Move down and start working with the child object
+ current = current[childKey];
+ }
+
+ // We're at the right level in hierarchy. Define property next.
+ if (key in current) { // already exists.
+ if ($.isPlainObject(current[key])) { // about to overwrite obj with property!
+ throw "Can't overwrite named structure";
+ }
+ if (!current[key].push) { // convert property to array
+ current[key] = [current[key]];
+ }
+ current[key].push(val);
+ } else { // doesn't exist. Just set.
+ if (val !== '__OMIT__') {
+ current[key] = val;
+ }
+ }
+ });
+
+ // Trim any keys who hold nothing but empty objects: {}
+
+ var removeEmptyObjects = function(o) {
+ var k;
+ var trimlist = [];
+ for (k in o) {
+ if ($.isPlainObject(o[k])) { // recurse: deep first
+ removeEmptyObjects(o[k]);
+ }
+ if ($.isPlainObject(o[k]) && _size(o[k]) === 0) {
+ trimlist.push(k);
+ }
+ }
+ $.each(trimlist, function() {
+ delete o[this];
+ });
+ };
+
+ removeEmptyObjects(formObject);
+ return (_size(formObject) === 0) ? null : formObject;
+ };
+
+})(jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/jquery.hoverIntent.js b/web/app/assets/javascripts/jquery.hoverIntent.js
new file mode 100644
index 000000000..3dcff261f
--- /dev/null
+++ b/web/app/assets/javascripts/jquery.hoverIntent.js
@@ -0,0 +1,106 @@
+/**
+* hoverIntent is similar to jQuery's built-in "hover" function except that
+* instead of firing the onMouseOver event immediately, hoverIntent checks
+* to see if the user's mouse has slowed down (beneath the sensitivity
+* threshold) before firing the onMouseOver event.
+*
+* hoverIntent r6 // 2011.02.26 // jQuery 1.5.1+
+*
+*
+* hoverIntent is currently available for use in all personal or commercial
+* projects under both MIT and GPL licenses. This means that you can choose
+* the license that best suits your project, and use it accordingly.
+*
+* // basic usage (just like .hover) receives onMouseOver and onMouseOut functions
+* $("ul li").hoverIntent( showNav , hideNav );
+*
+* // advanced usage receives configuration object only
+* $("ul li").hoverIntent({
+* sensitivity: 7, // number = sensitivity threshold (must be 1 or higher)
+* interval: 100, // number = milliseconds of polling interval
+* over: showNav, // function = onMouseOver callback (required)
+* timeout: 0, // number = milliseconds delay before onMouseOut function call
+* out: hideNav // function = onMouseOut callback (required)
+* });
+*
+* @param f onMouseOver function || An object with configuration options
+* @param g onMouseOut function || Nothing (use configuration options object)
+* @author Brian Cherne brian(at)cherne(dot)net
+*/
+(function($) {
+ $.fn.hoverIntent = function(f,g) {
+ // default configuration options
+ var cfg = {
+ sensitivity: 7,
+ interval: 100,
+ timeout: 0
+ };
+ // override configuration options with user supplied object
+ cfg = $.extend(cfg, g ? { over: f, out: g } : f );
+
+ // instantiate variables
+ // cX, cY = current X and Y position of mouse, updated by mousemove event
+ // pX, pY = previous X and Y position of mouse, set by mouseover and polling interval
+ var cX, cY, pX, pY;
+
+ // A private function for getting mouse position
+ var track = function(ev) {
+ cX = ev.pageX;
+ cY = ev.pageY;
+ };
+
+ // A private function for comparing current and previous mouse position
+ var compare = function(ev,ob) {
+ ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
+ // compare mouse positions to see if they've crossed the threshold
+ if ( ( Math.abs(pX-cX) + Math.abs(pY-cY) ) < cfg.sensitivity ) {
+ $(ob).unbind("mousemove",track);
+ // set hoverIntent state to true (so mouseOut can be called)
+ ob.hoverIntent_s = 1;
+ return cfg.over.apply(ob,[ev]);
+ } else {
+ // set previous coordinates for next time
+ pX = cX; pY = cY;
+ // use self-calling timeout, guarantees intervals are spaced out properly (avoids JavaScript timer bugs)
+ ob.hoverIntent_t = setTimeout( function(){compare(ev, ob);} , cfg.interval );
+ }
+ };
+
+ // A private function for delaying the mouseOut function
+ var delay = function(ev,ob) {
+ ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
+ ob.hoverIntent_s = 0;
+ return cfg.out.apply(ob,[ev]);
+ };
+
+ // A private function for handling mouse 'hovering'
+ var handleHover = function(e) {
+ // copy objects to be passed into t (required for event object to be passed in IE)
+ var ev = jQuery.extend({},e);
+ var ob = this;
+
+ // cancel hoverIntent timer if it exists
+ if (ob.hoverIntent_t) { ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t); }
+
+ // if e.type == "mouseenter"
+ if (e.type == "mouseenter") {
+ // set "previous" X and Y position based on initial entry point
+ pX = ev.pageX; pY = ev.pageY;
+ // update "current" X and Y position based on mousemove
+ $(ob).bind("mousemove",track);
+ // start polling interval (self-calling timeout) to compare mouse coordinates over time
+ if (ob.hoverIntent_s != 1) { ob.hoverIntent_t = setTimeout( function(){compare(ev,ob);} , cfg.interval );}
+
+ // else e.type == "mouseleave"
+ } else {
+ // unbind expensive mousemove event
+ $(ob).unbind("mousemove",track);
+ // if hoverIntent state is true, then call the mouseOut function after the specified delay
+ if (ob.hoverIntent_s == 1) { ob.hoverIntent_t = setTimeout( function(){delay(ev,ob);} , cfg.timeout );}
+ }
+ };
+
+ // bind the function to the two event listeners
+ return this.bind('mouseenter',handleHover).bind('mouseleave',handleHover);
+ };
+})(jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/landing/congratulations.js b/web/app/assets/javascripts/landing/congratulations.js
new file mode 100644
index 000000000..3fafd07e0
--- /dev/null
+++ b/web/app/assets/javascripts/landing/congratulations.js
@@ -0,0 +1,59 @@
+(function(context,$) {
+
+ "use strict";
+
+ var congratulations = {};
+
+ congratulations.initialize = function initialize() {
+ var rest = context.JK.Rest();
+
+ var currentOS = context.JK.detectOS();
+
+ var downloads = $('.downloads');
+ rest.getClientDownloads()
+ .done(function(data) {
+ downloads.removeClass('spinner-large');
+
+ var count = 0;
+ for ( var property in data ) count++;
+
+
+ if(count == 0) {
+ alert("Currently unable to list client software downloads.");
+ }
+ else {
+
+ $.each(data, function(key, item) {
+
+
+ // if the currentOS we detect from browser is found within the product of an available client
+ // we flag it with this boolean
+ var matchesUserOS = currentOS != null && key.toLowerCase().indexOf(currentOS.toLowerCase()) > -1;
+
+ var options = {
+ emphasis: matchesUserOS ? "currentOS" : "",
+ uri: item.uri,
+ platform: key.substring('JamClient/'.length)
+ }
+
+ var download = context._.template($('#client-download-link').html(), options, {variable: 'data'});
+
+ if(matchesUserOS) {
+ // make sure the current user OS is at the top
+ downloads.prepend(download);
+ }
+ else {
+ downloads.append(download)
+ }
+ });
+ }
+ })
+ .fail(function() {
+ downloads.removeClass('spinner-large');
+ alert("Currently unable to list client software downloads due to error.");
+ })
+ }
+
+ window.congratulations = congratulations;
+
+})(window, jQuery)
\ No newline at end of file
diff --git a/web/app/assets/javascripts/landing/init.js b/web/app/assets/javascripts/landing/init.js
new file mode 100644
index 000000000..bc2a5c696
--- /dev/null
+++ b/web/app/assets/javascripts/landing/init.js
@@ -0,0 +1,9 @@
+(function(context,$) {
+
+ "use strict";
+
+ $(function() {
+ context.JK.popExternalLinks();
+ })
+
+})(window, jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/landing/landing.js b/web/app/assets/javascripts/landing/landing.js
new file mode 100644
index 000000000..144b25c75
--- /dev/null
+++ b/web/app/assets/javascripts/landing/landing.js
@@ -0,0 +1,8 @@
+//= require jquery
+//= require AAC_underscore
+//= require jamkazam
+//= require utils
+//= require jam_rest
+//= require landing/init
+//= require landing/signup
+//= require landing/congratulations
\ No newline at end of file
diff --git a/web/app/assets/javascripts/landing/signup.js b/web/app/assets/javascripts/landing/signup.js
new file mode 100644
index 000000000..b0b006caa
--- /dev/null
+++ b/web/app/assets/javascripts/landing/signup.js
@@ -0,0 +1,189 @@
+(function() {
+
+ var signup = {}
+
+ function enable_disable_instruments(enable) {
+ var instrument_selector = $('#instrument_selector');
+
+ if(enable) {
+ instrument_selector.removeAttr('style')
+ $('input', instrument_selector).removeAttr('disabled').removeAttr('style');
+ $('select', instrument_selector).removeAttr('disabled').removeAttr('style');
+ }
+ else {
+ instrument_selector.css('color', '#AAA')
+ $('input', instrument_selector).attr('disabled', 'disabled').css('color', '#AAA');
+ $('select', instrument_selector).attr('disabled', 'disabled').css('color', '#AAA');
+ }
+ }
+
+ // instruments are selectable if musician = true
+ signup.handle_register_as_changes = function handle_register_as_changes() {
+
+ var initial_value = $('input.register-as:checked').val();
+ enable_disable_instruments(initial_value == "true");
+
+ $('input.register-as').change(function() {
+ var value = $(this).val()
+ enable_disable_instruments(value == "true")
+ })
+ }
+
+ // register form elements relating to location to update appropriately as the user makes changes
+ signup.handle_location_changes = function handle_location_changes() {
+
+ var country_select = $('#country_select')
+ var region_select = $('#region_select')
+ var city_select = $('#city_select')
+
+ country_select.change(function() {
+ var selected_country = $(this).val()
+ if(selected_country) {
+ // set region disabled while updating
+ region_select.attr('disabled', true);
+
+ $.ajax('/api/regions', {
+ data : { country: selected_country },
+ dataType : 'json'
+ }).done(regions_done).fail(regions_fail).always(function() { region_select.attr('disabled', false) })
+ }
+ })
+
+ function regions_done(data) {
+ region_select.children().remove()
+
+ region_select.append("")
+
+ $(data.regions).each(function(index, item) {
+ region_select.append("")
+ })
+ }
+
+ function regions_fail() {
+ alert("something went wrong in looking up regions")
+ }
+
+ region_select.change(function() {
+ var selected_country = country_select.val()
+ var selected_region = $(this).val()
+
+ // only update
+ if(selected_country && selected_region) {
+ // set city disabled while updating
+ city_select.attr('disabled', true);
+
+ $.ajax('/api/cities', {
+ data : { country: selected_country, region: selected_region },
+ dataType : 'json'
+ }).done(cities_done).fail(cities_fail).always(function() { city_select.attr('disabled', false) })
+ }
+ })
+
+ function cities_done(data) {
+ city_select.children().remove()
+
+ city_select.append("")
+
+ $(data.cities).each(function(index, item) {
+ city_select.append("")
+ })
+ }
+
+ function cities_fail() {
+ alert("something went wrong in looking up cities")
+ }
+ }
+
+ signup.handle_completion_submit = function handle_completion_submit() {
+
+ // based on rails date_select element, gather up birth_date selected by the user.
+ // returns null if any field (day/month/year) is left blank
+ function gather_birth_date() {
+ var month = $('#jam_ruby_user_birth_date_2i').value
+ var day = $('#jam_ruby_user_birth_date_3i').value
+ var year = $('#jam_ruby_user_birth_date_1i').value
+
+ if(month != null && month.length > 0 && day != null && day.length > 0 && year != null && year.length > 0) {
+ return month + "-" + day + "-" + year;
+ }
+ else {
+ return null;
+ }
+ }
+
+ // looks in instrument_selector parent element, and gathers up all
+ // selected elements, and the proficiency level declared
+ function gather_instruments() {
+ var instruments_parent_element = $(".instrument_selector")
+
+ var instruments = []
+ $('input[type=checkbox]:checked', instruments_parent_element).each(function(i) {
+
+ // traverse up to common parent of this intrument, and pick out proficienc selector
+ var proficiency = $('select.proficiency_selector', $(this).closest('tr')).val()
+
+ instruments.push({
+ instrument_id: $(this).attr('name'),
+ proficiency_level: proficiency,
+ priority : i
+ })
+ });
+
+ return instruments;
+ }
+
+ $('form.edit_jam_ruby_user').submit(function() {
+
+ var form = $(this)
+
+ var submit_data = {};
+ // gather up all fields from the form
+ submit_data.first_name = $('#jam_ruby_user_first_name').val()
+ submit_data.last_name = $('#jam_ruby_user_last_name').val()
+ submit_data.password = $('#jam_ruby_user_password').val()
+ submit_data.password_confirmation = $('#jam_ruby_user_password_confirmation').val()
+ submit_data.country = $('#jam_ruby_user_country').val()
+ submit_data.state = $('#jam_ruby_user_state').val()
+ submit_data.city = $('#jam_ruby_user_city').val()
+ submit_data.birth_date = gather_birth_date()
+ submit_data.instruments = gather_instruments()
+ //submit_data.photo_url = $('#jam_ruby_user_instruments').val()
+
+
+ $.ajax({
+ type: "POST",
+ url: "/api/users/complete/" + gon.signup_token,
+ contentType: 'application/json',
+ data: JSON.stringify(submit_data)
+ }).done(completion_done).fail(completion_fail)
+
+ return false;
+ })
+
+ function completion_done(data) {
+ // we can redirect on to client
+ window.location.href = '/client'
+
+ }
+
+ function completion_fail(xhr, status) {
+ // if status = 422, then we can display errors
+ if(xhr.status == 422) {
+ data = JSON.parse(xhr.responseText)
+ var errors = $('#errors')
+ errors.children().remove()
+ var list = $("
")
+ errors.append(list)
+ $(data).each(function(i) {
+ list.append("- " + this + "
")
+ })
+ }
+ else {
+ alert("something went wrong with the service. please try again later")
+ }
+ }
+
+ }
+
+ window.signup = signup
+})()
\ No newline at end of file
diff --git a/web/app/assets/javascripts/layout.js b/web/app/assets/javascripts/layout.js
new file mode 100644
index 000000000..2e3688d08
--- /dev/null
+++ b/web/app/assets/javascripts/layout.js
@@ -0,0 +1,689 @@
+/*
+ * View framework for JamKazam.
+ *
+ * Processes proprietary attributes in markup to convert a set of HTML elements
+ * into the JamKazam screen layout. This module is only responsible for size
+ * and position. All other visual aspects should be elsewhere.
+ *
+ * See the layout-example.html file for a simple working example.
+ */
+(function(context,$) {
+
+ "use strict";
+
+ context.JK = context.JK || {};
+
+ // Static function to hide the 'curtain' which hides the underlying
+ // stuff until we can get it laid out. Called from both the main
+ // client as well as the landing page.
+ context.JK.hideCurtain = function(duration) {
+ context.setTimeout(function() {
+ $('.curtain').fadeOut(2*duration);
+ }, duration);
+ };
+
+ context.JK.Layout = function() {
+
+ // privates
+ var logger = context.JK.logger;
+
+ var me = null; // Reference to this instance for context sanity.
+
+ var opts = {
+ headerHeight: 75,
+ sidebarWidth: 300,
+ notifyHeight: 150,
+ notifyGutter: 10,
+ collapsedSidebar: 30,
+ panelHeaderHeight: 36,
+ gutter: 60, // Margin around the whole UI
+ screenMargin: 0, // Margin around screens (not headers/sidebar)
+ gridOuterMargin: 6, // Outer margin on Grids (added to screenMargin if screen)
+ gridPadding: 8, // Padding around grid cells. Added to outer margin.
+ animationDuration: 400,
+ allowBodyOverflow: false // Allow tests to disable the body-no-scroll policy
+ };
+
+ var width = $(context).width();
+ var height = $(context).height();
+ var resizing = null;
+ var sidebarVisible = true;
+ var expandedPanel = null;
+ var previousScreen = null;
+ var currentScreen = null;
+
+ var screenBindings = {};
+ var dialogBindings = {};
+ var wizardShowFunctions = {};
+
+ function setup() {
+ requiredStyles();
+ hideAll();
+ setInitialExpandedSidebarPanel();
+ sizeScreens(width, height, '[layout="screen"]', true);
+ positionOffscreens(width, height);
+ $('[layout="sidebar"]').show();
+ $('[layout="panel"]').show();
+ layout();
+ }
+
+ function setInitialExpandedSidebarPanel() {
+ expandedPanel = $('[layout="panel"]').first().attr("layout-id");
+ }
+
+ function layout() {
+ width = $(context).width();
+ height = $(context).height();
+ // TODO
+ // Work on naming. File is layout, class is Layout, this method
+ // is layout and every other method starts with 'layoutX'. Perhaps
+ // a little redundant?
+ layoutCurtain(width, height);
+ layoutDialogOverlay(width, height);
+ layoutScreens(width, height);
+ layoutSidebar(width, height);
+ layoutHeader(width, height);
+ layoutNotify(width, height);
+ layoutFooter(width, height);
+ }
+
+ function layoutCurtain(screenWidth, screenHeight) {
+ var curtainStyle = {
+ position: 'absolute',
+ width: screenWidth + 'px',
+ height: screenHeight + 'px'
+ };
+ $('.curtain').css(curtainStyle);
+ }
+
+ function layoutDialogOverlay(screenWidth, screenHeight) {
+ var style = {
+ position: 'absolute',
+ width: screenWidth + 'px',
+ height: screenHeight + 'px'
+ };
+ $('.dialog-overlay').css(style);
+ }
+
+ function layoutScreens(screenWidth, screenHeight) {
+ var previousScreenSelector = '[layout-id="' + previousScreen + '"]';
+ var currentScreenSelector = '[layout-id="' + currentScreen + '"]';
+ $(currentScreenSelector).show();
+
+ var width = screenWidth - (2 * opts.gutter + 2 * opts.screenMargin);
+ var left = -1 * width - 100;
+
+ if (currentScreenSelector === previousScreenSelector) {
+ left = $(currentScreenSelector).css("left");
+ if (left) {
+ left = left.split("px")[0];
+ }
+ }
+ $(previousScreenSelector).animate({left: left}, {duration: opts.animationDuration, queue: false});
+ sizeScreens(screenWidth, screenHeight, '[layout="screen"]');
+ positionOffscreens(screenWidth, screenHeight);
+ positionOnscreen(screenWidth, screenHeight);
+ }
+
+ function sizeScreens(screenWidth, screenHeight, selector, immediate) {
+ var duration = opts.animationDuration;
+ if (immediate) {
+ duration = 0;
+ }
+
+ var width = screenWidth - (2 * opts.gutter + 2 * opts.screenMargin);
+ if (sidebarVisible) {
+ width -= (opts.sidebarWidth + 2*opts.gridPadding);
+ } else {
+ width -= opts.collapsedSidebar + 2*opts.gridPadding;
+ width += opts.gutter; // Add back in the right gutter width.
+ }
+ var height = screenHeight - opts.headerHeight - (2 * opts.gutter + 2 * opts.screenMargin);
+ var css = {
+ width: width,
+ height: height
+ };
+ var $screens = $(selector);
+ $screens.animate(css, {duration:duration, queue:false});
+ layoutHomeScreen(width, height);
+ }
+
+ /**
+ * Postition all screens that are not the current screen.
+ */
+ function positionOffscreens(screenWidth, screenHeight) {
+ var top = opts.headerHeight + opts.gutter + opts.screenMargin;
+ var left = -1 * (screenWidth + 2*opts.gutter);
+ var $screens = $('[layout="screen"]').not('[layout-id="' + currentScreen + '"]');
+ $screens.css({
+ top: top,
+ left: left
+ });
+ }
+
+ /**
+ * Position the current screen
+ */
+ function positionOnscreen(screenWidth, screenHeight, immediate) {
+ var duration = opts.animationDuration;
+ if (immediate) {
+ duration = 0;
+ }
+ var top = opts.headerHeight + opts.gutter + opts.screenMargin;
+ var left = opts.gutter + opts.screenMargin;
+ var $screen = $('[layout-id="' + currentScreen + '"]');
+ $screen.animate({
+ top: top,
+ left: left,
+ overflow: 'auto'
+ }, duration);
+ }
+
+ function layoutHomeScreen(homeScreenWidth, homeScreenHeight) {
+ var $grid = $('[layout-grid]');
+ var gridWidth = homeScreenWidth;
+ var gridHeight = homeScreenHeight;
+ $grid.css({width:gridWidth, height: gridHeight});
+ var layout = $grid.attr('layout-grid');
+ if (!layout)
+ return;
+ var gridRows = layout.split('x')[0];
+ var gridCols = layout.split('x')[1];
+
+ $grid.children().each(function() {
+ var childPosition = $(this).attr("layout-grid-position");
+ var childRow = childPosition.split(',')[1];
+ var childCol = childPosition.split(',')[0];
+ var childRowspan = $(this).attr("layout-grid-rows");
+ var childColspan = $(this).attr("layout-grid-columns");
+ var childLayout = me.getCardLayout(gridWidth, gridHeight, gridRows, gridCols,
+ childRow, childCol, childRowspan, childColspan);
+
+ $(this).animate({
+ width: childLayout.width,
+ height: childLayout.height,
+ top: childLayout.top,
+ left: childLayout.left
+ }, opts.animationDuration);
+ });
+ }
+
+ function layoutSidebar(screenWidth, screenHeight) {
+ var width = opts.sidebarWidth;
+ var expanderHeight = $('[layout-sidebar-expander]').height();
+ var height = screenHeight - opts.headerHeight - 2 * opts.gutter + expanderHeight;
+ var right = opts.gutter;
+ if (!sidebarVisible) {
+ // Negative right to hide most of sidebar
+ right = (0 - opts.sidebarWidth) + opts.collapsedSidebar;
+ }
+ var top = opts.headerHeight + opts.gutter - expanderHeight;
+ var css = {
+ width: width,
+ height: height,
+ top: top,
+ right: right
+ };
+ $('[layout="sidebar"]').animate(css, opts.animationDuration);
+ layoutPanels(width, height);
+ if (sidebarVisible) {
+ $('[layout-panel="collapsed"]').hide();
+ $('[layout-panel="expanded"]').show();
+ $('[layout-sidebar-expander="hidden"]').hide();
+ $('[layout-sidebar-expander="visible"]').show();
+ } else {
+ $('[layout-panel="collapsed"]').show();
+ $('[layout-panel="expanded"]').hide();
+ $('[layout-sidebar-expander="hidden"]').show();
+ $('[layout-sidebar-expander="visible"]').hide();
+ }
+ }
+
+ function layoutPanels(sidebarWidth, sidebarHeight) {
+ // TODO - don't like the accordian - poor usability. Requires longest mouse
+ // reach when switching panels. Probably better to do tabs.
+ if (!sidebarVisible) {
+ return;
+ }
+ var $expandedPanelContents = $('[layout-id="' + expandedPanel + '"] [layout-panel="contents"]');
+ var combinedHeaderHeight = $('[layout-panel="contents"]').length * opts.panelHeaderHeight;
+ var searchHeight = $('.sidebar .search').first().height();
+ var expanderHeight = $('[layout-sidebar-expander]').height();
+ var expandedPanelHeight = sidebarHeight - (combinedHeaderHeight + expanderHeight + searchHeight);
+ $('[layout-panel="contents"]').hide();
+ $('[layout-panel="contents"]').css({"height": "1px"});
+ $expandedPanelContents.show();
+ $expandedPanelContents.animate({"height": expandedPanelHeight + "px"}, opts.animationDuration);
+ }
+
+ function layoutHeader(screenWidth, screenHeight) {
+ var width = screenWidth - 2*opts.gutter;
+ var height = opts.headerHeight - opts.gutter;
+ var top = opts.gutter;
+ var left = opts.gutter;
+ var css = {
+ width: width + "px",
+ height: height + "px",
+ top: top + "px",
+ left: left + "px"
+ };
+ $('[layout="header"]').css(css);
+ }
+
+ function layoutNotify(screenWidth, screenHeight) {
+ var $notify = $('[layout="notify"]');
+ var nHeight = $notify.height();
+ var notifyStyle = {
+ bottom: '0px',
+ position: 'fixed'
+ };
+ $notify.css(notifyStyle);
+ }
+
+ function layoutFooter(screenWidth, screenHeight) {
+ var $footer = $('#footer');
+ var nHeight = $footer.height();
+ var footerStyle = {
+ top: (screenHeight - 80) + 'px'
+ };
+ var width = screenWidth - (2 * opts.gutter + 2 * opts.screenMargin);
+ var left = -1 * width - 100;
+ $footer.animate({ "left" : opts.gutter, "width" : width, "top": (screenHeight - 78) + "px"}, opts.animationDuration);
+ }
+
+ function requiredStyles() {
+ var bodyStyle = {
+ margin: '0px',
+ padding: '0px',
+ overflow: 'hidden'
+ };
+ if (opts.allowBodyOverflow) {
+ delete bodyStyle.overflow;
+ }
+ $('body').css(bodyStyle);
+
+ var layoutStyle = {
+ position: 'absolute',
+ margin: '0px',
+ padding: '0px'
+ };
+ $('[layout]').css(layoutStyle);
+ $('[layout="notify"]').css({"z-index": "9", "padding": "20px"});
+ $('[layout="panel"]').css({position: 'relative'});
+ $('[layout-panel="expanded"] [layout-panel="header"]').css({
+ margin: "0px",
+ padding: "0px",
+ height: opts.panelHeaderHeight + "px"
+ });
+ $('[layout-grid]').css({
+ position: "relative"
+ });
+ $('[layout-grid]').children().css({
+ position: "absolute"
+ });
+ var curtainStyle = {
+ position: "absolute",
+ margin: '0px',
+ padding: '0px',
+ overflow: 'hidden',
+ zIndex: 100
+ };
+ $('.curtain').css(curtainStyle);
+ }
+
+ function hideAll() {
+ $('[layout]').hide();
+ $('[layout="header"]').show();
+ }
+
+ function showSidebar() {
+ sidebarVisible = true;
+ layout();
+ }
+
+ function hideSidebar() {
+ sidebarVisible = false;
+ layout();
+ }
+
+ function toggleSidebar() {
+ if (sidebarVisible) {
+ hideSidebar();
+ } else {
+ showSidebar();
+ }
+ }
+
+ function hideDialogs() {
+ // TODO - may need dialogEvents here for specific dialogs.
+ $('[layout="dialog"]').hide();
+ $('.dialog-overlay').hide();
+ }
+
+ function tabClicked(evt) {
+ evt.preventDefault();
+ var destination = $(evt.currentTarget).attr('tab-target');
+ $('[tab-target]').removeClass('selected');
+ $(evt.currentTarget).addClass('selected');
+ $('.tab').hide();
+ $('[tab-id="' + destination + '"]').show();
+ }
+
+ function linkClicked(evt) {
+ evt.preventDefault();
+
+ // allow links to be disabled
+ if($(evt.currentTarget).hasClass("disabled") ) {
+ return;
+ }
+
+ var destination = $(evt.currentTarget).attr('layout-link');
+ var destinationType = $('[layout-id="' + destination + '"]').attr("layout");
+ if (destinationType === "screen") {
+ context.location = '#/' + destination;
+ } else if (destinationType === "dialog") {
+ showDialog(destination);
+ }
+ }
+
+ function close(evt) {
+ var $target = $(evt.currentTarget).closest('[layout]');
+ var layoutId = $target.attr('layout-id');
+ var isDialog = ($target.attr('layout') === 'dialog');
+ if (isDialog) {
+ closeDialog(layoutId);
+ } else {
+ $target.hide();
+ }
+ return false;
+ }
+
+ function closeDialog(dialog) {
+ var $dialog = $('[layout-id="' + dialog + '"]');
+ dialogEvent(dialog, 'beforeHide');
+ $('.dialog-overlay').hide();
+ $dialog.hide();
+ dialogEvent(dialog, 'afterHide');
+ }
+
+ function screenEvent(screen, evtName, data) {
+ if (screen && screen in screenBindings) {
+ if (evtName in screenBindings[screen]) {
+ screenBindings[screen][evtName].call(me, data);
+ }
+ }
+ }
+
+ function dialogEvent(dialog, evtName, data) {
+ if (dialog && dialog in dialogBindings) {
+ if (evtName in dialogBindings[dialog]) {
+ dialogBindings[dialog][evtName].call(me, data);
+ }
+ }
+ }
+
+ function changeToScreen(screen, data) {
+ previousScreen = currentScreen;
+ currentScreen = screen;
+
+ screenEvent(previousScreen, 'beforeHide', data);
+ screenEvent(currentScreen, 'beforeShow', data);
+
+ // For now -- it seems we want it open always.
+ // TODO - support user preference here? Remember how they left it?
+ sidebarVisible = true;
+ /*
+ var openSidebarScreens = [
+ 'home', 'session', 'createSession',
+ 'findSession', 'searchResults'
+ ];
+ $.each(openSidebarScreens, function() {
+ logger.debug("comparing " + this + " to " + currentScreen);
+ if (this === currentScreen) {
+ sidebarVisible = true;
+ return false;
+ }
+ });
+ */
+ layout();
+
+ screenEvent(previousScreen, 'afterHide', data);
+ screenEvent(currentScreen, 'afterShow', data);
+
+ // Show any requested dialog
+ if ("d" in data) {
+ showDialog(data.d);
+ }
+ }
+
+ function showDialog(dialog) {
+ dialogEvent(dialog, 'beforeShow');
+ $('.dialog-overlay').show();
+ centerDialog(dialog);
+ $('[layout-id="' + dialog + '"]').show();
+ dialogEvent(dialog, 'afterShow');
+ }
+
+ function centerDialog(dialog) {
+ var $dialog = $('[layout-id="' + dialog + '"]');
+ $dialog.css({
+ left: width/2 - ($dialog.width()/2) + "px",
+ top: height/2 - ($dialog.height()/2) + "px"
+ });
+ }
+
+
+ function panelHeaderClicked(evt) {
+ evt.preventDefault();
+ expandedPanel = $(evt.currentTarget).closest('[layout="panel"]').attr("layout-id");
+ layout();
+ return false;
+ }
+
+ function wizardLinkClicked(evt) {
+ evt.preventDefault();
+ var targetStepId = $(evt.currentTarget).attr("layout-wizard-link");
+ setWizardStep(targetStepId);
+ return false;
+ }
+
+ function setWizardStep(targetStepId) {
+ var selector = '[layout-wizard-step="' + targetStepId + '"]';
+ var $targetStep = $(selector);
+ var stepDialogTitle = $targetStep.attr("dialog-title");
+ if (stepDialogTitle) {
+ var $myDialog = $targetStep.closest('[layout="dialog"]');
+ var $myTitle = $('.content-head h1', $myDialog);
+ $myTitle.html(stepDialogTitle);
+ }
+ // Hide all steps:
+ // Invoke the 'show' function, if present prior to actually showing.
+ if (context._.contains(context._.keys(wizardShowFunctions), targetStepId)) {
+ wizardShowFunctions[targetStepId]();
+ }
+ $('[layout-wizard-step]').hide();
+ $targetStep.show();
+ }
+
+ function events() {
+ $(context).resize(function() {
+ if (resizing) {
+ context.clearTimeout(resizing);
+ }
+ resizing = context.setTimeout(layout, 80);
+ });
+ $('body').on('click', '[layout-link]', linkClicked);
+ $('[layout-action="close"]').on('click', close);
+ $('[layout-sidebar-expander]').on('click', toggleSidebar);
+ $('[layout-panel="expanded"] [layout-panel="header"]').on('click', panelHeaderClicked);
+ $('[layout-wizard-link]').on('click', wizardLinkClicked);
+ $('[tab-target]').on('click', tabClicked);
+ }
+
+ // public functions
+ this.getOpts = function() {
+ return opts;
+ };
+
+ // used for concurrent notifications
+ var notifyQueue = [];
+ var firstNotification = false;
+ var notifyDetails;
+
+ this.notify = function(message, descriptor) {
+ var $notify = $('[layout="notify"]');
+
+ if (notifyQueue.length === 0) {
+ firstNotification = true;
+ setNotificationInfo(message, descriptor);
+ }
+
+ notifyQueue.push({message: message, descriptor: descriptor});
+ $notify.slideDown(2000)
+ .delay(2000)
+ .slideUp({
+ duration: 2000,
+ queue: true,
+ complete: function() {
+ notifyDetails = notifyQueue.shift();
+
+ // shift 1 more time if this is first notification being displayed
+ if (firstNotification) {
+ notifyDetails = notifyQueue.shift();
+ firstNotification = false;
+ }
+
+ if (notifyDetails !== undefined) {
+ setNotificationInfo(notifyDetails.message, notifyDetails.descriptor);
+ }
+ }
+ });
+ }
+
+ function setNotificationInfo(message, descriptor) {
+ var $notify = $('[layout="notify"]');
+ $('h2', $notify).text(message.title);
+ $('p', $notify).text(message.text);
+
+ if (message.icon_url) {
+ $('#avatar', $notify).attr('src', message.icon_url);
+ $('#avatar', $notify).show();
+ }
+ else {
+ $('#avatar', $notify).hide();
+ }
+
+ if (message.detail) {
+ $('div.detail', $notify).html(message.detail).show();
+ }
+ else {
+ $('div.detail', $notify).hide();
+ }
+
+ if (descriptor) {
+ if (descriptor.ok_text) {
+ $('#ok-button', $notify).html(descriptor.ok_text);
+ }
+ else {
+ $('#ok-button', $notify).html("OKAY");
+ }
+
+ if (descriptor.ok_callback !== undefined) {
+ $('#ok-button', $notify).click(function() {
+ if (descriptor.ok_callback_args) {
+ logger.debug("descriptor.ok_callback_args=" + descriptor.ok_callback_args);
+ descriptor.ok_callback(descriptor.ok_callback_args);
+ return false;
+ }
+ else {
+ descriptor.ok_callback();
+ return false;
+ }
+ });
+ }
+
+ if (descriptor.cancel_text) {
+ $('#cancel-button', $notify).html(descriptor.cancel_text);
+ }
+ else {
+ if(descriptor.no_cancel) {
+ $('#cancel-button', $notify).hide();
+ }
+ else {
+ $('#cancel-button', $notify).html("CANCEL");
+ }
+ }
+ }
+ else {
+ $('#ok-button', $notify).html("OKAY");
+ $('#cancel-button', $notify).html("CANCEL");
+ }
+ }
+
+ this.setWizardStep = setWizardStep;
+
+ this.changeToScreen = function(screen, data) {
+ changeToScreen(screen, data);
+ };
+
+ this.showDialog = function(dialog) {
+ showDialog(dialog);
+ };
+
+ this.close = function(evt) {
+ close(evt);
+ };
+
+ this.closeDialog = closeDialog;
+
+ /**
+ * Given information on a grid, and a given card's grid settings, use the
+ * margin options and return a list of [top, left, width, height]
+ * for the cell.
+ */
+ this.getCardLayout = function(gridWidth, gridHeight, gridRows, gridCols,
+ row, col, rowspan, colspan) {
+
+ var _gridWidth = gridWidth + 3*opts.gridPadding;
+ var _gridHeight = gridHeight + 3*opts.gridPadding;
+ var cellWidth, cellHeight, top, left, width, height;
+
+ cellWidth = Math.floor((_gridWidth-2*opts.gridOuterMargin) / gridCols);
+ cellHeight = Math.floor((_gridHeight-2*opts.gridOuterMargin) / gridRows);
+ width = colspan * cellWidth - 2*opts.gridPadding;
+ height = rowspan * cellHeight - 2*opts.gridPadding;
+ top = row * cellHeight;// + opts.gridOuterMargin; // + opts.gridPadding;
+ left = col * cellWidth;// + opts.gridOuterMargin; // + opts.gridPadding;
+
+ return {
+ top: top,
+ left: left,
+ width: width,
+ height: height
+ };
+ };
+
+ this.bindScreen = function(screen, handler) {
+ screenBindings[screen] = handler;
+ };
+
+ this.bindDialog = function(dialog, handler) {
+ dialogBindings[dialog] = handler;
+ };
+
+ this.registerWizardStepFunction = function(stepId, showFunction) {
+ wizardShowFunctions[stepId] = showFunction;
+ };
+
+ this.initialize = function(inOpts) {
+ me = this;
+ opts = $.extend(opts, inOpts);
+ setup();
+ events();
+ };
+
+ return this;
+
+ };
+
+}(window, jQuery));
\ No newline at end of file
diff --git a/web/app/assets/javascripts/leaveSession.js b/web/app/assets/javascripts/leaveSession.js
new file mode 100644
index 000000000..11d90b736
--- /dev/null
+++ b/web/app/assets/javascripts/leaveSession.js
@@ -0,0 +1,32 @@
+(function(context,$) {
+
+ "use strict";
+
+ context.JK = context.JK || {};
+
+ context.JK.leaveMusicSession = function(session_id) {
+ var logger = context.JK.logger;
+ var server = context.JK.JamServer;
+ var client = context.jamClient;
+
+ if (!server.signedIn)
+ {
+ logger.log("Can't leave a session because the client is not connected.");
+ return;
+ }
+
+ logger.log("Leaving session: " + session_id);
+
+ var url = "/api/participants/" + server.clientID;
+ $.ajax({
+ type: "DELETE",
+ url: url
+ }).done(function (response) {
+ context.JK.Sessions.LeaveSession(session_id);
+ if (client !== undefined) {
+ client.LeaveSession({ sessionID: session_id });
+ }
+ });
+ };
+
+ })(window,jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/mixer.js b/web/app/assets/javascripts/mixer.js
new file mode 100644
index 000000000..e855d08b9
--- /dev/null
+++ b/web/app/assets/javascripts/mixer.js
@@ -0,0 +1,41 @@
+/**
+* Static functions for controlling underlying jamClient mixer
+* functions.
+*/
+(function(context, $) {
+
+ /**
+ * We'll want to move control over mixer functions out of the session.js
+ * file and into here, as it is becoming apparent we'll need better
+ * audio control globally.
+ */
+
+ "use strict";
+
+ context.JK = context.JK || {};
+
+ context.JK.Mixer = {
+
+ /**
+ * Fill the track volume object, given a controlState structure.
+ * Provide a boolean for broadcast indicating whether the change
+ * should go out over the network
+ */
+ fillTrackVolume: function(controlState, broadcast) {
+ context.trackVolumeObject.clientID = controlState.client_id;
+ context.trackVolumeObject.broadcast = broadcast;
+ context.trackVolumeObject.master = controlState.master;
+ context.trackVolumeObject.monitor = controlState.monitor;
+ context.trackVolumeObject.mute = controlState.mute;
+ context.trackVolumeObject.name = controlState.name;
+ context.trackVolumeObject.record = controlState.record;
+ context.trackVolumeObject.volL = controlState.volume_left;
+ context.trackVolumeObject.volR = controlState.volume_right;
+ // trackVolumeObject doesn't have a place for range min/max
+ //currentMixerRangeMin = mixer.range_low;
+ //currentMixerRangeMax = mixer.range_high;
+ }
+
+ };
+
+})(window, jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/profile.js b/web/app/assets/javascripts/profile.js
new file mode 100644
index 000000000..3268d1834
--- /dev/null
+++ b/web/app/assets/javascripts/profile.js
@@ -0,0 +1,610 @@
+(function(context,$) {
+
+ "use strict";
+
+ context.JK = context.JK || {};
+ context.JK.ProfileScreen = function(app) {
+ var logger = context.JK.logger;
+ var userId;
+ var user = {};
+
+ var proficiencyDescriptionMap = {
+ "1": "BEGINNER",
+ "2": "INTERMEDIATE",
+ "3": "EXPERT"
+ };
+
+ var proficiencyCssMap = {
+ "1": "proficiency-beginner",
+ "2": "proficiency-intermediate",
+ "3": "proficiency-expert"
+ };
+
+ function beforeShow(data) {
+ userId = data.id;
+ }
+
+ function afterShow(data) {
+ resetForm();
+ events();
+ renderActive();
+ }
+
+ function resetForm() {
+ $('#profile-instruments').empty();
+
+ $('#profile-about').show();
+ $('#profile-history').hide();
+ $('#profile-bands').hide();
+ $('#profile-social').hide();
+ $('#profile-favorites').hide();
+
+ $('.profile-nav a.active').removeClass('active');
+ $('.profile-nav a.#profile-about-link').addClass('active');
+ }
+
+ /****************** MAIN PORTION OF SCREEN *****************/
+ // events for main screen
+ function events() {
+ // wire up panel clicks
+ $('#profile-about-link').click(renderAbout);
+ $('#profile-history-link').click(renderHistory);
+ $('#profile-bands-link').click(renderBands);
+ $('#profile-social-link').click(renderSocial);
+ $('#profile-favorites-link').click(renderFavorites);
+
+ // wire up buttons if you're not viewing your own profile
+ if (userId != context.JK.currentUserId) {
+ // wire up Add Friend click
+ var friend = isFriend();
+ configureFriendButton(friend);
+
+ // wire up Follow click
+ var following = isFollowing();
+ configureFollowingButton(following);
+ }
+ else {
+ $('#btn-add-friend').hide();
+ $('#btn-follow-user').hide();
+ }
+ }
+
+ function sendFriendRequest(evt) {
+ evt.stopPropagation();
+ context.JK.sendFriendRequest(app, userId, friendRequestCallback);
+ }
+
+ function removeFriend(evt) {
+ evt.stopPropagation();
+
+ var url = "/api/users/" + context.JK.currentUserId + "/friends/" + userId;
+ $.ajax({
+ type: "DELETE",
+ dataType: "json",
+ url: url,
+ processData: false,
+ success: function(response) {
+ renderActive(); // refresh stats
+ configureFriendButton(false);
+ },
+ error: app.ajaxError
+ });
+ }
+
+ function isFriend() {
+ var alreadyFriend = false;
+
+ var url = "/api/users/" + context.JK.currentUserId + "/friends/" + userId;
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ url: url,
+ async: false,
+ processData: false,
+ success: function(response) {
+ if (response.id !== undefined) {
+ alreadyFriend = true;
+ }
+ else {
+ alreadyFriend = false;
+ }
+ },
+ error: app.ajaxError
+ });
+
+ return alreadyFriend;
+ }
+
+ function friendRequestCallback() {
+ configureFriendButton(true);
+ }
+
+ function configureFriendButton(friend) {
+ $('#btn-add-friend').unbind("click");
+
+ if (friend) {
+ $('#btn-add-friend').text('REMOVE FRIEND');
+ $('#btn-add-friend').click(removeFriend);
+ }
+ else {
+ $('#btn-add-friend').text('ADD FRIEND');
+ $('#btn-add-friend').click(sendFriendRequest);
+ }
+ }
+
+ function addFollowing() {
+ var newFollowing = {};
+ newFollowing.user_id = userId;
+
+ var url = "/api/users/" + context.JK.currentUserId + "/followings";
+ $.ajax({
+ type: "POST",
+ dataType: "json",
+ contentType: 'application/json',
+ url: url,
+ data: JSON.stringify(newFollowing),
+ processData: false,
+ success: function(response) {
+ renderActive(); // refresh stats
+ configureFollowingButton(true);
+ },
+ error: app.ajaxError
+ });
+ }
+
+ function removeFollowing(isBand, id) {
+ var following = {};
+
+ if (!isBand) {
+ following.user_id = id;
+ }
+ else {
+ following.band_id = id;
+ }
+
+ var url = "/api/users/" + context.JK.currentUserId + "/followings";
+ $.ajax({
+ type: "DELETE",
+ dataType: "json",
+ contentType: 'application/json',
+ url: url,
+ data: JSON.stringify(following),
+ processData: false,
+ success: function(response) {
+ renderActive(); // refresh stats
+ if (!isBand) {
+ configureFollowingButton(false);
+ }
+ else {
+ configureBandFollowingButton(false, id);
+ }
+ },
+ error: app.ajaxError
+ });
+ }
+
+ function isFollowing() {
+ var alreadyFollowing = false;
+
+ var url = "/api/users/" + context.JK.currentUserId + "/followings/" + userId;
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ url: url,
+ async: false,
+ processData: false,
+ success: function(response) {
+ if (response.id !== undefined) {
+ alreadyFollowing = true;
+ }
+ else {
+ alreadyFollowing = false;
+ }
+ },
+ error: app.ajaxError
+ });
+
+ return alreadyFollowing;
+ }
+
+ function configureFollowingButton(following) {
+ $('#btn-follow-user').unbind("click");
+
+ if (following) {
+ $('#btn-follow-user').text('STOP FOLLOWING');
+ $('#btn-follow-user').click(function() {
+ removeFollowing(false, userId);
+ });
+ }
+ else {
+ $('#btn-follow-user').text('FOLLOW');
+ $('#btn-follow-user').click(addFollowing);
+ }
+ }
+
+ // refreshes the currently active tab
+ function renderActive() {
+ if ($('#profile-about-link').hasClass('active')) {
+ renderAbout();
+ }
+ else if ($('#profile-history-link').hasClass('active')) {
+ renderHistory();
+ }
+ else if ($('#profile-bands-link').hasClass('active')) {
+ renderBands();
+ }
+ else if ($('#profile-social-link').hasClass('active')) {
+ renderSocial();
+ }
+ else if ($('#profile-favorites-link').hasClass('active')) {
+ renderFavorites();
+ }
+ }
+
+ /****************** ABOUT TAB *****************/
+ function renderAbout() {
+ $('#profile-instruments').empty();
+
+ $('#profile-about').show();
+ $('#profile-history').hide();
+ $('#profile-bands').hide();
+ $('#profile-social').hide();
+ $('#profile-favorites').hide();
+
+ $('.profile-nav a.active').removeClass('active');
+ $('.profile-nav a.#profile-about-link').addClass('active');
+
+ bindAbout();
+ }
+
+ function bindAbout() {
+ $('#profile-instruments').empty();
+ var url = "/api/users/" + userId;
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ url: url,
+ async: false,
+ processData:false,
+ success: function(response) {
+ user = response;
+ },
+ error: app.ajaxError
+ });
+
+ if (user) {
+
+ // name
+ $('#profile-username').html(user.name);
+
+ // avatar
+ $('#profile-avatar').attr('src', context.JK.resolveAvatarUrl(user.photo_url));
+
+ // instruments
+ if (user.instruments) {
+ for (var i=0; i < user.instruments.length; i++) {
+ var instrument = user.instruments[i];
+ var description = instrument.instrument_id;
+ var proficiency = instrument.proficiency_level;
+ var instrument_icon_url = context.JK.getInstrumentIcon45(description);
+
+ // add instrument info to layout
+ var template = $('#template-profile-instruments').html();
+ var instrumentHtml = context.JK.fillTemplate(template, {
+ instrument_logo_url: instrument_icon_url,
+ instrument_description: description,
+ proficiency_level: proficiencyDescriptionMap[proficiency],
+ proficiency_level_css: proficiencyCssMap[proficiency]
+ });
+
+ $('#profile-instruments').append(instrumentHtml);
+ }
+ }
+
+ // location
+ $('#profile-location').html(user.location);
+
+ // stats
+ var text = user.friend_count > 1 || user.friend_count == 0 ? " Friends" : " Friend";
+ $('#profile-friend-stats').html(user.friend_count + text);
+
+ text = user.follower_count > 1 || user.follower_count == 0 ? " Followers" : " Follower";
+ $('#profile-follower-stats').html(user.follower_count + text);
+
+ text = user.session_count > 1 || user.session_count == 0 ? " Sessions" : " Session";
+ $('#profile-session-stats').html(user.session_count + text);
+
+ text = user.recording_count > 1 || user.recording_count == 0 ? " Recordings" : " Recording";
+ $('#profile-recording-stats').html(user.recording_count + text);
+
+ //$('#profile-biography').html(user.biography);
+ }
+ else {
+
+ }
+ }
+
+ /****************** SOCIAL TAB *****************/
+ function renderSocial() {
+ $('#profile-social-friends').empty();
+ $('#profile-social-followings').empty();
+ $('#profile-social-followers').empty();
+
+ $('#profile-about').hide();
+ $('#profile-history').hide();
+ $('#profile-bands').hide();
+ $('#profile-social').show();
+ $('#profile-favorites').hide();
+
+ $('.profile-nav a.active').removeClass('active');
+ $('.profile-nav a.#profile-social-link').addClass('active');
+
+ bindSocial();
+ }
+
+ function bindSocial() {
+ // FRIENDS
+ var url = "/api/users/" + userId + "/friends";
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ url: url,
+ async: false,
+ processData:false,
+ success: function(response) {
+ $.each(response, function(index, val) {
+ var template = $('#template-profile-social').html();
+ var friendHtml = context.JK.fillTemplate(template, {
+ avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
+ userName: val.name,
+ location: val.location,
+ type: "Friends"
+ });
+
+ $('#profile-social-friends').append(friendHtml);
+ });
+ },
+ error: app.ajaxError
+ });
+
+ // FOLLOWINGS (USERS)
+ url = "/api/users/" + userId + "/followings";
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ url: url,
+ async: false,
+ processData:false,
+ success: function(response) {
+ $.each(response, function(index, val) {
+ var template = $('#template-profile-social').html();
+ var followingHtml = context.JK.fillTemplate(template, {
+ avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
+ userName: val.name,
+ location: val.location
+ });
+
+ $('#profile-social-followings').append(followingHtml);
+ });
+ },
+ error: app.ajaxError
+ });
+
+ // FOLLOWINGS (BANDS)
+ url = "/api/users/" + userId + "/band_followings";
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ url: url,
+ async: false,
+ processData:false,
+ success: function(response) {
+ $.each(response, function(index, val) {
+ var template = $('#template-profile-social').html();
+ var followingHtml = context.JK.fillTemplate(template, {
+ avatar_url: context.JK.resolveAvatarUrl(val.logo_url),
+ userName: val.name,
+ location: val.location
+ });
+
+ $('#profile-social-followings').append(followingHtml);
+ });
+ },
+ error: app.ajaxError
+ });
+
+ // FOLLOWERS
+ url = "/api/users/" + userId + "/followers";
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ url: url,
+ async: false,
+ processData:false,
+ success: function(response) {
+ $.each(response, function(index, val) {
+ var template = $('#template-profile-social').html();
+ var followerHtml = context.JK.fillTemplate(template, {
+ avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
+ userName: val.name,
+ location: val.location
+ });
+
+ $('#profile-social-followers').append(followerHtml);
+ });
+ },
+ error: app.ajaxError
+ });
+ }
+
+ /****************** HISTORY TAB *****************/
+ function renderHistory() {
+ $('#profile-about').hide();
+ $('#profile-history').show();
+ $('#profile-bands').hide();
+ $('#profile-social').hide();
+ $('#profile-favorites').hide();
+
+ $('.profile-nav a.active').removeClass('active');
+ $('.profile-nav a.#profile-history-link').addClass('active');
+
+ bindHistory();
+ }
+
+ function bindHistory() {
+
+ }
+
+ /****************** BANDS TAB *****************/
+ function renderBands() {
+ $('#profile-bands').empty();
+
+ $('#profile-about').hide();
+ $('#profile-history').hide();
+ $('#profile-bands').show();
+ $('#profile-social').hide();
+ $('#profile-favorites').hide();
+
+ $('.profile-nav a.active').removeClass('active');
+ $('.profile-nav a.#profile-bands-link').addClass('active');
+
+ bindBands();
+ }
+
+ function bindBands() {
+ var url = "/api/users/" + userId + "/bands";
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ url: url,
+ async: false,
+ processData:false,
+ success: function(response) {
+ $.each(response, function(index, val) {
+ var template = $('#template-profile-bands').html();
+ var bandHtml = context.JK.fillTemplate(template, {
+ bandId: val.id,
+ avatar_url: context.JK.resolveAvatarUrl(val.logo_url),
+ name: val.name,
+ location: val.location,
+ genres: formatGenres(val.genres)
+ });
+
+ $('#profile-bands').append(bandHtml);
+
+ // wire up Band Follow button click handler
+ var following = isFollowingBand(val.id);
+ configureBandFollowingButton(following, val.id);
+ });
+ },
+ error: app.ajaxError
+ });
+ }
+
+ function formatGenres(genres) {
+ var formattedGenres = '';
+ for (var i=0; i < genres.length; i++) {
+ var genre = genres[i];
+ formattedGenres += genre.description;
+ if (i < genres.length -1) {
+ formattedGenres += ', ';
+ }
+ }
+ return formattedGenres;
+ }
+
+ function addBandFollowing(evt) {
+ evt.stopPropagation();
+ var bandId = $(this).parent().attr('band-id');
+
+ var newFollowing = {};
+ newFollowing.band_id = bandId;
+
+ var url = "/api/users/" + context.JK.currentUserId + "/followings";
+ $.ajax({
+ type: "POST",
+ dataType: "json",
+ contentType: 'application/json',
+ url: url,
+ data: JSON.stringify(newFollowing),
+ processData: false,
+ success: function(response) {
+ renderActive(); // refresh stats
+ configureBandFollowingButton(true, bandId);
+ },
+ error: app.ajaxError
+ });
+ }
+
+ function isFollowingBand(bandId) {
+ var alreadyFollowing = false;
+
+ var url = "/api/users/" + context.JK.currentUserId + "/band_followings/" + bandId;
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ url: url,
+ async: false,
+ processData: false,
+ success: function(response) {
+ if (response.id !== undefined) {
+ alreadyFollowing = true;
+ }
+ else {
+ alreadyFollowing = false;
+ }
+ },
+ error: app.ajaxError
+ });
+
+ return alreadyFollowing;
+ }
+
+ function configureBandFollowingButton(following, bandId) {
+ var $btnFollowBand = $('div[band-id=' + bandId + ']', '#profile-bands').find('#btn-follow-band');
+ $btnFollowBand.unbind("click");
+
+ if (following) {
+ $btnFollowBand.text('UN-FOLLOW');
+ $btnFollowBand.click(function() {
+ removeFollowing(true, bandId);
+ });
+ }
+ else {
+ $btnFollowBand.text('FOLLOW');
+ $btnFollowBand.click(addBandFollowing);
+ }
+ }
+
+ /****************** FAVORITES TAB *****************/
+ function renderFavorites() {
+ $('#profile-about').hide();
+ $('#profile-history').hide();
+ $('#profile-bands').hide();
+ $('#profile-social').hide();
+ $('#profile-favorites').show();
+
+ $('.profile-nav a.active').removeClass('active');
+ $('.profile-nav a.#profile-favorites-link').addClass('active');
+
+ bindFavorites();
+ }
+
+ function bindFavorites() {
+ }
+
+ function initialize() {
+ var screenBindings = {
+ 'beforeShow': beforeShow,
+ 'afterShow': afterShow
+ };
+ app.bindScreen('profile', screenBindings);
+ }
+
+ this.initialize = initialize;
+ this.beforeShow = beforeShow;
+ this.afterShow = afterShow;
+ return this;
+ };
+
+ })(window,jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/routemap.js b/web/app/assets/javascripts/routemap.js
new file mode 100644
index 000000000..e5e3824bb
--- /dev/null
+++ b/web/app/assets/javascripts/routemap.js
@@ -0,0 +1,445 @@
+/**
+ * RouteMap holds an internal table of route patterns and method names in addition to some
+ * adding/removing/utility methods and a handler for request routing.
+ * It does not have any dependencies and is written in "plain old" JS, but it does require JS 1.8 array methods, so
+ * if the environment it will run in does not have those, the reference implementations from
+ * Mozilla should be
+ * supplied external to this library.
+ * It is designed to be used in both a browser setting and a server-side context (for example in node.js).
+ * LICENSING INFORMATION:
+ *
+ * Copyright 2011 OpenGamma Inc. and the OpenGamma group of companies
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @see OpenGamma
+ * @see Apache License, Version 2.0
+ * @see Mozilla Developer
+ * Network
+ * @name RouteMap
+ * @namespace RouteMap
+ * @author Afshin Darian
+ * @static
+ * @throws {Error} if JS 1.8 Array.prototype methods don't exist
+ */
+(function (pub, namespace) { // defaults to exports, uses window if exports does not exist
+ (function (arr, url) { // plain old JS, but needs some JS 1.8 array methods
+ if (!arr.every || !arr.filter || !arr.indexOf || !arr.map || !arr.reduce || !arr.some || !arr.forEach)
+ throw new Error('See ' + url + ' for reference versions of Array.prototype methods available in JS 1.8');
+ })([], 'https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/');
+ var routes /* internal reference to RouteMap */, active_routes = {}, added_routes = {}, flat_pages = [],
+ last = 0, current = 0, encode = encodeURIComponent, decode = decodeURIComponent, has = 'hasOwnProperty',
+ EQ = '=' /* equal string */, SL = '/' /* slash string */, PR = '#' /* default prefix string */,
+ token_exp = /\*|:|\?/, star_exp = /(^([^\*:\?]+):\*)|(^\*$)/, scalar_exp = /^:([^\*:\?]+)(\??)$/,
+ keyval_exp = /^([^\*:\?]+):(\??)$/, slash_exp = new RegExp('([^' + SL + '])$'),
+ context = typeof window !== 'undefined' ? window : {}, // where listeners reside, routes.context() overwrites it
+ /** @ignore */
+ invalid_str = function (str) {return typeof str !== 'string' || !str.length;},
+ /** @ignore */
+ fingerprint = function (rule) {return [rule.method, rule.route].join('|');},
+ /**
+ * merges one or more objects into a new object by value (nothing is a reference), useful for cloning
+ * @name RouteMap#merge
+ * @inner
+ * @function
+ * @type Object
+ * @returns {Object} a merged object
+ * @throws {TypeError} if one of the arguments is not a mergeable object (i.e. a primitive, null or array)
+ */
+ merge = function () {
+ var self = 'merge', to_string = Object.prototype.toString, clone = function (obj) {
+ return typeof obj !== 'object' || obj === null ? obj // primitives
+ : to_string.call(obj) === '[object Array]' ? obj.map(clone) // arrays
+ : merge(obj); // objects
+ };
+ return Array.prototype.reduce.call(arguments, function (acc, obj) {
+ if (!obj || typeof obj !== 'object' || to_string.call(obj) === '[object Array]')
+ throw new TypeError(self + ': ' + to_string.call(obj) + ' is not mergeable');
+ for (var key in obj) if (obj[has](key)) acc[key] = clone(obj[key]);
+ return acc;
+ }, {});
+ },
+ /**
+ * parses a path and returns a list of objects that contain argument dictionaries, methods, and raw hash values
+ * @name RouteMap#parse
+ * @inner
+ * @function
+ * @param {String} path
+ * @type Array
+ * @returns {Array} a list of parsed objects in descending order of matched hash length
+ * @throws {TypeError} if the method specified by a rule specification does not exist during parse time
+ */
+ parse = function (path) {
+ // go with the first matching page (longest) or any pages with * rules
+ var self = 'parse', pages = flat_pages.filter(function (val) { // add slash to paths so all vals match
+ return path.replace(slash_exp, '$1' + SL).indexOf(val) === 0;
+ })
+ .filter(function (page, index) {
+ return !index || active_routes[page].some(function (val) {return !!val.rules.star;});
+ });
+ return !pages.length ? [] : pages.reduce(function (acc, page) { // flatten parsed rules for all pages
+ var current_page = active_routes[page].map(function (rule_set) {
+ var args = {}, scalars = rule_set.rules.scalars, keyvals = rule_set.rules.keyvals, method,
+ // populate the current request object as a collection of keys/values and scalars
+ request = path.replace(page, '').split(SL).reduce(function (acc, val) {
+ var split = val.split(EQ), key = split[0], value = split.slice(1).join(EQ);
+ return !val.length ? acc // discard empty values, separate rest into scalars or keyvals
+ : (value ? acc.keyvals[key] = value : acc.scalars.push(val)), acc;
+ }, {keyvals: {}, scalars: []}), star, keyval,
+ keyval_keys = keyvals.reduce(function (acc, val) {return (acc[val.name] = 0) || acc;}, {}),
+ required_scalars_length = scalars.filter(function (val) {return val.required;}).length,
+ required_keyvals = keyvals.filter(function (val) {return val.required;})
+ .every(function (val) {return request.keyvals[has](val.name);});
+ // not enough parameters are supplied in the request for this rule
+ if (required_scalars_length > request.scalars.length || !required_keyvals) return 0;
+ if (!rule_set.rules.star) { // too many params are only a problem if the rule isn't a wildcard
+ if (request.scalars.length > scalars.length) return 0; // if too many scalars are supplied
+ for (keyval in request.keyvals) // if too many keyvals are supplied
+ if (request.keyvals[has](keyval) && !keyval_keys[has](keyval)) return 0;
+ }
+ request.scalars.slice(0, scalars.length) // populate args scalars
+ .forEach(function (scalar, index) {args[scalars[index].name] = decode(scalar);});
+ keyvals.forEach(function (keyval) { // populate args keyvals
+ if (request.keyvals[keyval.name]) args[keyval.name] = decode(request.keyvals[keyval.name]);
+ delete request.keyvals[keyval.name]; // remove so that * can be constructed
+ });
+ if (rule_set.rules.star) { // all unused scalars and keyvals go into the * argument (still encoded)
+ star = request.scalars.slice(scalars.length, request.scalars.length);
+ for (keyval in request.keyvals) if (request.keyvals[has](keyval))
+ star.push([keyval, request.keyvals[keyval]].join(EQ));
+ args[rule_set.rules.star] = star.join(SL);
+ }
+ try { // make sure the rule's method actually exists and can be accessed
+ method = rule_set.method.split('.').reduce(function (acc, val) {return acc[val];}, context);
+ if (typeof method !== 'function') throw new Error;
+ } catch (error) {
+ throw new TypeError(self + ': ' + rule_set.method + ' is not a function in current context');
+ }
+ return {page: page, hash: routes.hash({route: rule_set.raw}, args), method: method, args: args};
+ });
+ return acc.concat(current_page).filter(Boolean); // only return the parsed rules that matched
+ }, []).sort(function (a, b) {return b.hash.length - a.hash.length;}); // order in descending hash length
+ },
+ /**
+ * builds the internal representation of a rule based on the route definition
+ * @inner
+ * @name RouteMap#compile
+ * @function
+ * @param {String} route
+ * @throws {SyntaxError} if any portion of a rule definition follows a * directive
+ * @throws {SyntaxError} if a required scalar follows an optional scalar
+ * @throws {SyntaxError} if a rule cannot be parsed
+ * @type {Object}
+ * @returns {Object} a compiled object, for example, the rule '/foo/:id/type:?/rest:*' would return
+ * an object of the form: {
+ * page:'/foo',
+ * rules:{
+ * keyvals:[{name: 'type', required: false}],
+ * scalars:[{name: 'id', required: true}],
+ * star:'rest' // false if not defined
+ * }
+ * }
+ * @see RouteMap.add
+ * @see RouteMap.hash
+ * @see RouteMap.remove
+ */
+ compile = (function (memo) { // compile is slow so cache compiled objects in a memo
+ return function (orig) {
+ var self = 'compile', compiled, index, names = {},
+ route = orig[0] === SL ? orig : ~(index = orig.indexOf(SL)) ? orig.slice(index) : 0,
+ /** @ignore */
+ valid_name = function (name) {
+ if (names[has](name) || (names[name] = 0))
+ throw new SyntaxError(self + ': "' + name + '" is repeated in: ' + orig);
+ };
+ if (!route) throw new SyntaxError(self + ': the route ' + orig + ' was not understood');
+ if (memo[route]) return memo[route];
+ compiled = route.split(SL).reduce(function (acc, val) {
+ var rules = acc.rules, scalars = rules.scalars, keyvals = rules.keyvals;
+ if (rules.star) throw new SyntaxError(self + ': no rules can follow a * directive in: ' + orig);
+ // construct the name of the page
+ if (!~val.search(token_exp) && !scalars.length && !keyvals.length) return acc.page.push(val), acc;
+ // construct the parameters
+ if (val.match(star_exp)) return (rules.star = RegExp.$2 || RegExp.$3), valid_name(rules.star), acc;
+ if (val.match(scalar_exp)) {
+ if (acc.has_optional_scalar) // no scalars can follow optional scalars
+ throw new SyntaxError(self + ': "' + val + '" cannot follow an optional rule in: ' + orig);
+ if (!!RegExp.$2) acc.has_optional_scalar = val;
+ return scalars.push({name: RegExp.$1, required: !RegExp.$2}), valid_name(RegExp.$1), acc;
+ }
+ if (val.match(keyval_exp))
+ return keyvals.push({name: RegExp.$1, required: !RegExp.$2}), valid_name(RegExp.$1), acc;
+ throw new SyntaxError(self + ': the rule "' + val + '" was not understood in: ' + orig);
+ }, {page: [], rules: {scalars: [], keyvals: [], star: false}, has_optional_scalar: ''});
+ delete compiled.has_optional_scalar; // this is just a temporary value and should not be exposed
+ compiled.page = compiled.page.join(SL).replace(new RegExp(SL + '$'), '') || SL;
+ return memo[route] = compiled;
+ };
+ })({});
+ pub[namespace] = (routes) = { // parens around routes to satisfy JSDoc's caprice
+ /**
+ * adds a rule to the internal table of routes and methods
+ * @name RouteMap.add
+ * @function
+ * @type undefined
+ * @param {Object} rule rule specification
+ * @param {String} rule.route route pattern definition; there are three types of pattern arguments: scalars,
+ * keyvals, and stars; scalars are individual values in a URL (all URL values are separate by the
+ * '/' character), keyvals are named values, e.g. 'foo=bar', and star values are wildcards; so for
+ * example, the following pattern represents all the possible options:
+ * '/foo/:id/:sub?/attr:/subattr:?/rest:*'
the ? means that argument is
+ * optional, the star rule is named rest but it could have just simply been left as *,
+ * which means the resultant dictionary would have put the wildcard remainder into args['*']
+ * instead of args.rest; so the following URL would match the pattern above:
+ * /foo/23/45/attr=something/subattr=something_else
+ * when its method is called, it will receive this arguments dictionary:
+ * {
+ * id:'23',
+ * subid:'45',
+ * attr:'something',
+ * subattr:'something_else',
+ * rest:''
+ * }
+ * add uses {@link #compile} and does not catch any errors thrown by that function
+ * @param {String} rule.method listener method for this route
+ * @throws {TypeError} if rule.route or rule.method are not strings or empty strings
+ * @throws {Error} if rule has already been added
+ * @see RouteMap.post_add
+ */
+ add: function (rule) {
+ var self = 'add', method = rule.method, route = rule.route, compiled, id = fingerprint(rule);
+ if ([route, method].some(invalid_str))
+ throw new TypeError(self + ': rule.route and rule.method must both be non-empty strings');
+ if (added_routes[id]) throw new Error(self + ': ' + route + ' to ' + method + ' already exists');
+ compiled = compile(route);
+ added_routes[id] = true;
+ if (!active_routes[compiled.page] && (active_routes[compiled.page] = [])) // add route to list and sort
+ flat_pages = flat_pages.concat(compiled.page).sort(function (a, b) {return b.length - a.length;});
+ active_routes[compiled.page].push(routes.post_add({method: method, rules: compiled.rules, raw: route}));
+ },
+ /**
+ * overrides the context where listener methods are sought, the default scope is window
+ * (in a browser setting), returns the current context, if no scope object is passed in, just
+ * returns current context without setting context
+ * @name RouteMap.context
+ * @function
+ * @type {Object}
+ * @returns {Object} the current context within which RouteMap searches for handlers
+ * @param {Object} scope the scope within which methods for mapped routes will be looked for
+ */
+ context: function (scope) {return context = typeof scope === 'object' ? scope : context;},
+ /**
+ * returns the parsed (see {@link #parse}) currently accessed route; after listeners have finished
+ * firing, current and last are the same
+ * @name RouteMap.current
+ * @function
+ * @type Object
+ * @returns {Object} the current parsed URL object
+ * @see RouteMap.last
+ */
+ current: function () {return current ? merge(current) : null;},
+ /**
+ * this function is fired when no rule is matched by a URL, by default it does nothing, but it could be set up
+ * to handle things like 404 responses on the server-side or bad hash fragments in the browser
+ * @name RouteMap.default_handler
+ * @function
+ * @type undefined
+ */
+ default_handler: function () {},
+ /**
+ * URL grabber function, defaults to checking the URL fragment (hash); this function should be
+ * overwritten in a server-side environment; this method is called by {@link RouteMap.handler}; without
+ * window.location.hash it will return '/'
+ * @name RouteMap.get
+ * @function
+ * @returns {String} by default, this returns a subset of the URL hash (everything after the first
+ * '/' character ... if nothing follows a slash, it returns '/'); if overwritten, it
+ * must be a function that returns URL path strings (beginning with '/') to match added rules
+ * @type String
+ */
+ get: function () {
+ if (typeof window === 'undefined') return SL;
+ var hash = window.location.hash, index = hash.indexOf(SL);
+ return ~index ? hash.slice(index) : SL;
+ },
+ /**
+ * in a browser setting, it changes window.location.hash, in other settings, it should be
+ * overwritten to do something useful (if necessary); it will not throw an error if window does
+ * not exist
+ * @name RouteMap.go
+ * @function
+ * @type undefined
+ * @param {String} hash the hash fragment to go to
+ */
+ go: function (hash) {
+ if (typeof window !== 'undefined') window.location.hash = (hash.indexOf(PR) === 0 ? '' : PR) + hash;
+ },
+ /**
+ * main handler function for routing, this should be bound to hashchange events in the browser, or
+ * (in conjunction with updating {@link RouteMap.get}) used with the HTML5 history API, it detects
+ * all the matching route patterns, parses the URL parameters and fires their methods with the arguments from
+ * the parsed URL; the timing of {@link RouteMap.current} and {@link RouteMap.last} being set is as follows
+ * (pseudo-code):
+ *
+ * path: get_route // {@link RouteMap.get}
+ * parsed: parse path // {@link #parse}
+ * current: longest parsed // {@link RouteMap.current}
+ * parsed: pre_dispatch parsed // {@link RouteMap.pre_dispatch}
+ * current: longest parsed // reset current
+ * fire matched rules in parsed
+ * last: current // {@link RouteMap.last}
+ *
+ * RouteMap.handler calls {@link #parse} and does not catch any errors that function throws
+ * @name RouteMap.handler
+ * @function
+ * @type undefined
+ * @see RouteMap.pre_dispatch
+ */
+ handler: function () {
+ var url = routes.get(), parsed = parse(url), args = Array.prototype.slice.call(arguments);
+ if (!parsed.length) return routes.default_handler.apply(null, [url].concat(args));
+ current = parsed[0]; // set current to the longest hash before pre_dispatch touches it
+ parsed = routes.pre_dispatch(parsed); // pre_dispatch might change the contents of parsed
+ current = parsed[0]; // set current to the longest hash again after pre_dispatch
+ parsed.forEach(function (val) {val.method.apply(null, [val.args].concat(args));}); // fire requested methods
+ last = parsed[0];
+ },
+ /**
+ * returns a URL fragment by applying parameters to a rule; uses {@link #compile} and does not catch any errors
+ * thrown by that function
+ * @name RouteMap.hash
+ * @function
+ * @type String
+ * @param {Object} rule the rule specification; it typically looks like:
+ * {route:'/foo', method:'bar'}
but only route is strictly necessary
+ * @param {Object} params a dictionary of argument key/value pairs required by the rule
+ * @returns {String} URL fragment resulting from applying arguments to rule pattern
+ * @throws {TypeError} if a required parameter is not present
+ */
+ hash: function (rule, params) {
+ var self = 'hash', hash, compiled, params = params || {};
+ if (invalid_str(rule.route)) throw new TypeError(self + ': rule.route must be a non-empty string');
+ compiled = compile(rule.route);
+ hash = compiled.page + (compiled.page === SL ? '' : SL) + // 1. start with page, then add params
+ compiled.rules.scalars.map(function (val) { // 2. add scalar values next
+ var value = encode(params[val.name]), bad_param = params[val.name] === void 0 || invalid_str(value);
+ if (val.required && bad_param)
+ throw new TypeError(self + ': params.' + val.name + ' is undefined, route: ' + rule.route);
+ return bad_param ? 0 : value;
+ })
+ .concat(compiled.rules.keyvals.map(function (val) { // 3. then concat keyval values
+ var value = encode(params[val.name]), bad_param = params[val.name] === void 0 || invalid_str(value);
+ if (val.required && bad_param)
+ throw new TypeError(self + ': params.' + val.name + ' is undefined, route: ' + rule.route);
+ return bad_param ? 0 : val.name + EQ + value;
+ }))
+ .filter(Boolean).join(SL); // remove empty (0) values
+ if (compiled.rules.star && params[compiled.rules.star]) // 4. add star value if it exists
+ hash += (hash[hash.length - 1] === SL ? '' : SL) + params[compiled.rules.star];
+ return hash;
+ },
+ /**
+ * returns the parsed (see {@link #parse}) last accessed route; when route listeners are being called,
+ * last is the previously accessed route, after listeners have finished firing, the current parsed
+ * route replaces last's value
+ * @name RouteMap.last
+ * @function
+ * @type Object
+ * @returns {Object} the last parsed URL object, will be null on first load
+ * @see RouteMap.current
+ */
+ last: function () {return last ? merge(last) : null;},
+ /**
+ * parses a URL fragment into a data structure only if there is a route whose pattern matches the fragment
+ * @name RouteMap.parse
+ * @function
+ * @type Object
+ * @returns {Object} of the form: {page:'/foo', args:{bar:'some_value'}}
+ * only if a rule with the route: '/foo/:bar' has already been added
+ * @throws {TypeError} if hash is not a string, is empty, or does not contain a '/' character
+ * @throws {SyntaxError} if hash cannot be parsed by {@link #parse}
+ */
+ parse: function (hash) {
+ var self = 'parse', parsed, index = hash.indexOf(SL);
+ hash = ~index ? hash.slice(index) : '';
+ if (invalid_str(hash)) throw new TypeError(self + ': hash must be a string with a ' + SL + ' character');
+ if (!(parsed = parse(hash)).length) throw new SyntaxError(self + ': ' + hash + ' cannot be parsed');
+ return {page: parsed[0].page, args: parsed[0].args};
+ },
+ /**
+ * this function is called by {@link RouteMap.add}, it receives a compiled rule object, e.g. for the rule:
+ * {route:'/foo/:id/:sub?/attr:/subattr:?/rest:*', method:'console.log'}
+ * post_add would receive the following object:
+ * {
+ * method:'console.log',
+ * rules:{
+ * scalars:[{name:'id',required:true},{name:'sub',required:false}],
+ * keyvals:[{name:'attr',required:true},{name:'subattr',required:false}],
+ * star:'rest'
+ * },
+ * raw:'/foo/:id/:sub?/attr:/subattr:?/rest:*'
+ * }
+ * and it is expected to pass back an object of the same format; it can be overwritten to post-process added
+ * rules e.g. to add extra default application-wide parameters; by default, it simply returns what was passed
+ * into it
+ * @name RouteMap.post_add
+ * @function
+ * @type Object
+ * @returns {Object} the default function returns the exact object it received; a custom function needs to
+ * an object that is of the same form (but could possibly have more or fewer parameters, etc.)
+ * @param {Object} compiled the compiled rule
+ */
+ post_add: function (compiled) {return compiled;},
+ /**
+ * like {@link RouteMap.post_add} this function can be overwritten to add application-specific code into
+ * route mapping, it is called before a route begins being dispatched to all matching rules; it receives the
+ * list of matching parsed route objects ({@link #parse}) and is expected to return it; one application of this
+ * function might be to set application-wide variables like debug flags
+ * @name RouteMap.pre_dispatch
+ * @function
+ * @type Array
+ * @returns {Array} a list of the same form as the one it receives
+ * @param {Array} parsed the parsed request
+ */
+ pre_dispatch: function (parsed) {return parsed;},
+ /**
+ * if a string is passed in, it overwrites the prefix that is removed from each URL before parsing; primarily
+ * used for hashbang (#!); either way, it returns the current prefix
+ * @name RouteMap.prefix
+ * @function
+ * @type undefined
+ * @param {String} prefix (optional) the prefix string
+ */
+ prefix: function (prefix) {return PR = typeof prefix !== 'undefined' ? prefix + '' : PR;},
+ /**
+ * counterpart to {@link RouteMap.add}, removes a rule specification; * remove uses
+ * {@link #compile} and does not catch any errors thrown by that function
+ * @name RouteMap.remove
+ * @function
+ * @type undefined
+ * @param {Object} rule the rule specification that was used in {@link RouteMap.add}
+ * @throws {TypeError} if rule.route or rule.method are not strings or empty strings
+ */
+ remove: function (rule) {
+ var self = 'remove', method = rule.method, route = rule.route, compiled, id = fingerprint(rule), index;
+ if ([route, method].some(invalid_str))
+ throw new TypeError(self + ': rule.route and rule.method must both be non-empty strings');
+ if (!added_routes[id]) return;
+ compiled = compile(route);
+ delete added_routes[id];
+ active_routes[compiled.page] = active_routes[compiled.page]
+ .filter(function (rule) {return (rule.raw !== route) || (rule.method !== method);});
+ if (!active_routes[compiled.page].length && (delete active_routes[compiled.page])) // delete active route
+ if (~(index = flat_pages.indexOf(compiled.page))) flat_pages.splice(index, 1); // then flat page
+ }
+ };
+})(typeof exports === 'undefined' ? window : exports, 'RouteMap');
\ No newline at end of file
diff --git a/web/app/assets/javascripts/search.js b/web/app/assets/javascripts/search.js
new file mode 100644
index 000000000..04e35767b
--- /dev/null
+++ b/web/app/assets/javascripts/search.js
@@ -0,0 +1,138 @@
+(function(context,$) {
+
+ // NOTE - not currently used. Was hooked up in header before
+ // Jeff's new mockups moved search to sidebar and made search results
+ // a full-blown screen. This should probably be removed, along with
+ // any HTML that accompanies it. Tests too.
+
+ "use strict";
+
+ context.JK = context.JK || {};
+ context.JK.Searcher = function(app) {
+ var logger = context.JK.logger;
+
+ var searchSectionTemplate;
+ var searchItemTemplate;
+ var noResultsTemplate;
+ var usernames = ['Brian', 'David'];
+ var userids = ['1', '2'];
+
+ function events() {
+ $('.searchtextinput').keyup(handleKeyup);
+ $('.searchtextinput').focus(function(evt) {
+ var searchVal = $(this).val();
+ search(searchVal);
+ });
+ $('.searchtextinput').blur(hideSearchResults);
+ }
+
+ function templates() {
+ searchSectionTemplate = $('#template-search-section').html();
+ searchItemTemplate = $('#template-search-item').html();
+ noResultsTemplate = $('#template-search-noresults').html();
+ }
+
+ function hideSearchResults() {
+ $('.searchresults').hide();
+ }
+
+ function showSearchResults() {
+ $('.searchresults').show();
+ }
+
+ function handleKeyup(evt) {
+ if (evt.which === 27) {
+ return hideSearchResults();
+ }
+ var searchVal = $(evt.currentTarget).val();
+ search(searchVal);
+ }
+
+ function search(query) {
+ if (query.length < 2) {
+ return;
+ }
+ $.ajax({
+ type: "GET",
+ url: "/api/search?query=" + query,
+ success: searchResponse,
+ error: app.ajaxError
+ });
+ }
+
+ function searchResponse(response) {
+ ensureResultsDiv();
+ updateResultsDiv(response);
+ positionResultsDiv();
+ showSearchResults();
+ }
+
+ function ensureResultsDiv() {
+ if ($('.searchresults').length === 0) {
+ var $searchresults = $('');
+ $searchresults.addClass('searchresults');
+ $searchresults.css({position:'absolute'});
+ $('body').append($searchresults);
+ }
+ }
+
+ function updateResultsDiv(searchResults) {
+ var sections = ['musicians', 'bands', 'fans', 'recordings'];
+ var fullHtml = '';
+ $.each(sections, function() {
+ fullHtml += getSectionHtml(this, searchResults);
+ });
+ if (fullHtml === '') {
+ fullHtml += getNoResultsMessage();
+ }
+ $('.searchresults').html(fullHtml);
+ }
+
+ function getNoResultsMessage() {
+ // No replacement needed at the moment.
+ return noResultsTemplate;
+ }
+
+ function getSectionHtml(section, searchResults) {
+ if (section in searchResults && searchResults[section].length === 0) {
+ return '';
+ }
+ var items = '';
+ $.each(searchResults[section], function() {
+ items += getItemHtml(this);
+ });
+ var html = context.JK.fillTemplate(
+ searchSectionTemplate,
+ { section: section, items: items });
+ return html;
+ }
+
+ function getItemHtml(item) {
+ var replacements = {
+ id: item.id,
+ name: item.first_name + " " + item.last_name,
+ image: item.photo_url,
+ subtext: item.location
+ };
+ return context.JK.fillTemplate(
+ searchItemTemplate, replacements);
+ }
+
+ function positionResultsDiv() {
+ var bodyOffset = $('body').offset();
+ var inputOffset = $('.searchtextinput').offset();
+ var inputHeight = $('.searchtextinput').outerHeight();
+ var resultsTop = bodyOffset.top + inputOffset.top + inputHeight;
+ var resultsLeft = bodyOffset.left + inputOffset.left;
+ $('.searchresults').css({
+ top: resultsTop + 'px',
+ left: resultsLeft + 'px'});
+ }
+
+ this.initialize = function() {
+ events();
+ templates();
+ };
+ };
+
+ })(window,jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/searchResults.js b/web/app/assets/javascripts/searchResults.js
new file mode 100644
index 000000000..c67a72833
--- /dev/null
+++ b/web/app/assets/javascripts/searchResults.js
@@ -0,0 +1,131 @@
+(function(context,$) {
+
+ "use strict";
+
+ context.JK = context.JK || {};
+ context.JK.SearchResultScreen = function(app) {
+ var logger = context.JK.logger;
+
+ var instrument_logo_map = context.JK.getInstrumentIconMap24();
+
+ function beforeShow(data) {
+ var query = data.query;
+ }
+
+ function afterShow(data) {
+ }
+
+ function search(evt) {
+ evt.stopPropagation();
+
+ $('#search-results').empty();
+ var query = $('#search-input').val();
+ context.location = '#/searchResults/:' + query;
+
+ logger.debug('query=' + query);
+ if (query !== '') {
+ $('#query').html(query + "\"");
+ context.JK.search(query, app, onSearchSuccess);
+ }
+
+ else {
+ $('#result-count').html('');
+ $('#query').html('');
+ }
+
+ return false;
+ }
+
+ function onSearchSuccess(response) {
+
+ // TODO: generalize this for each search result type (band, musician, recordings, et. al.)
+ $.each(response.musicians, function(index, val) {
+ // fill in template for Connect pre-click
+ var template = $('#template-search-result').html();
+ var searchResultHtml = context.JK.fillTemplate(template, {
+ userId: val.id,
+ avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
+ profile_url: "/#/profile/" + val.id,
+ userName: val.name,
+ location: val.location,
+ instruments: getInstrumentHtml(val.instruments)
+ });
+
+ $('#search-results').append(searchResultHtml);
+
+ // fill in template for Connect post-click
+ template = $('#template-invitation-sent').html();
+ var invitationSentHtml = context.JK.fillTemplate(template, {
+ userId: val.id,
+ first_name: val.first_name,
+ profile_url: "/#/profile/" + val.id
+ });
+
+ $('#search-results').append(invitationSentHtml);
+
+ // initialize visibility of the divs
+ $('div[user-id=' + val.id + '].search-connected').hide();
+ $('div[user-id=' + val.id + '].search-result').show();
+
+ // wire up button click handler if search result is not a friend or the current user
+ if (!val.is_friend && val.id !== context.JK.currentUserId) {
+ $('div[user-id=' + val.id + ']').find('#btn-connect-friend').click(sendFriendRequest);
+ }
+ else {
+ $('div[user-id=' + val.id + ']').find('#btn-connect-friend').hide();
+ }
+ });
+
+ var resultCount = response.musicians.length;
+ $('#result-count').html(resultCount);
+
+ if (resultCount === 1) {
+ $('#result-count').append(" Result for \"");
+ }
+ else {
+ $('#result-count').append(" Results for \"");
+ }
+ }
+
+ function friendRequestCallback(userId) {
+ // toggle the pre-click and post-click divs
+ $('div[user-id=' + userId + '].search-connected').show();
+ $('div[user-id=' + userId + '].search-result').hide();
+ }
+
+ function sendFriendRequest(evt) {
+ evt.stopPropagation();
+ var userId = $(this).parent().attr('user-id');
+ context.JK.sendFriendRequest(app, userId, friendRequestCallback);
+ }
+
+ function getInstrumentHtml(instruments) {
+ var instrumentLogoHtml = '';
+ if (instruments !== undefined) {
+ for (var i=0; i < instruments.length; i++) {
+ var inst = '../assets/content/icon_instrument_default24.png';
+ if (instruments[i].instrument_id in instrument_logo_map) {
+ inst = instrument_logo_map[instruments[i].instrument_id];
+ instrumentLogoHtml += '
';
+ }
+ }
+ }
+ return instrumentLogoHtml;
+ }
+
+ function events() {
+ $('#searchForm').submit(search);
+ }
+
+ this.initialize = function() {
+ var screenBindings = {
+ 'beforeShow': beforeShow,
+ 'afterShow': afterShow
+ };
+ app.bindScreen('searchResults', screenBindings);
+ events();
+ };
+
+ };
+
+})(window,jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js
new file mode 100644
index 000000000..04db7f786
--- /dev/null
+++ b/web/app/assets/javascripts/session.js
@@ -0,0 +1,833 @@
+(function(context,$) {
+
+ "use strict";
+
+ context.JK = context.JK || {};
+ context.JK.SessionScreen = function(app) {
+ var logger = context.JK.logger;
+ var sessionModel = null;
+ var sessionId;
+ var tracks = {};
+ var myTracks = [];
+ var mixers = [];
+
+ var configureTrackDialog;
+ var addTrackDialog;
+ var addNewGearDialog;
+
+ var screenActive = false;
+
+ var currentMixerRangeMin = null;
+ var currentMixerRangeMax = null;
+
+ var lookingForMixersCount = 0;
+ var lookingForMixersTimer = null;
+ var lookingForMixers = {};
+
+ var RENDER_SESSION_DELAY = 750; // When I need to render a session, I have to wait a bit for the mixers to be there.
+
+ var defaultParticipant = {
+ tracks: [{
+ instrument_id: "unknown"
+ }],
+ user: {
+ first_name: 'Unknown',
+ last_name: 'User',
+ photo_url: null
+ }
+ };
+
+ // Be sure to copy/extend these instead of modifying in place
+ var trackVuOpts = {
+ vuType: "vertical",
+ lightCount: 13,
+ lightWidth: 3,
+ lightHeight: 17
+ };
+ // Must add faderId key to this
+ var trackFaderOpts = {
+ faderType: "vertical",
+ height: 83
+ };
+
+ // Recreate ChannelGroupIDs ENUM from C++
+ var ChannelGroupIds = {
+ "MasterGroup": 0,
+ "MonitorGroup": 1,
+ "AudioInputMusicGroup": 2,
+ "AudioInputChatGroup": 3,
+ "MediaTrackGroup": 4,
+ "StreamOutMusicGroup": 5,
+ "StreamOutChatGroup": 6,
+ "UserMusicInputGroup": 7,
+ "UserChatInputGroup": 8,
+ "PeerAudioInputMusicGroup": 9,
+ "PeerMediaTrackGroup": 10
+ };
+
+ // recreate eThresholdType enum from MixerDialog.h
+ var alert_type = {
+ 0: {"title": "", "message": ""}, // NO_EVENT,
+ 1: {"title": "", "message": ""}, // BACKEND_ERROR: generic error - eg P2P message error
+ 2: {"title": "", "message": ""}, // BACKEND_MIXER_CHANGE, - event that controls have been regenerated
+ 3: {"title": "", "message": ""}, // PACKET_JTR,
+ 4: { "title": "Packet Loss", "message": "Your network connection is currently experiencing packet loss at a rate that is too high to deliver good audio quality. For troubleshooting tips, click here." }, // PACKET_LOSS
+ 5: {"title": "", "message": ""}, // PACKET_LATE,
+ 6: {"title": "", "message": ""}, // JTR_QUEUE_DEPTH,
+ 7: {"title": "", "message": ""}, // NETWORK_JTR,
+ 8: { "title": "Session Latency", "message": "The latency of your audio device combined with your Internet connection has become high enough to impact your session quality. For troubleshooting tips, click here." }, // NETWORK_PING,
+ 9: {"title": "", "message": ""}, // BITRATE_THROTTLE_WARN,
+ 10: { "title": "Low Bandwidth", "message": "The available bandwidth on your network has become too low,and this may impact your audio quality. For troubleshooting tips, click here." }, // BANDWIDTH_LOW
+ //IO related events
+ 11: { "title": "Input Rate", "message": "The input rate of your audio device is varying too much to deliver good audio quality. For troubleshooting tips, click here." }, // INPUT_IO_RATE
+ 12: {"title": "", "message": ""}, // INPUT_IO_JTR,
+ 13: { "title": "Output Rate", "message": "The output rate of your audio device is varying too much to deliver good audio quality. For troubleshooting tips, click here." }, // OUTPUT_IO_RATE
+ 14: {"title": "", "message": ""}, // OUTPUT_IO_JTR,
+ // CPU load related
+ 15: { "title": "CPU Utilization High", "message": "The CPU of your computer is unable to keep up with the current processing load, and this may impact your audio quality. For troubleshooting tips, click here." }, // CPU_LOAD
+ 16: {"title": "", "message": ""}, // DECODE_VIOLATIONS,
+ 17: {"title": "", "message": ""} // LAST_THRESHOLD
+ };
+
+
+ function beforeShow(data) {
+ sessionId = data.id;
+ $('#session-mytracks-container').empty();
+ }
+
+ function alertCallback(type, text) {
+ if (type === 2) { // BACKEND_MIXER_CHANGE
+ sessionModel.refreshCurrentSession();
+ } else {
+ context.setTimeout(function() {
+ app.notify({
+ "title": alert_type[type].title,
+ "text": text,
+ "icon_url": "/assets/content/icon_alert_big.png"
+ }); }, 1);
+ }
+ }
+
+ function afterShow(data) {
+
+ // indicate that the screen is active, so that
+ // body-scoped drag handlers can go active
+ screenActive = true;
+
+ // Subscribe for callbacks on audio events
+ context.jamClient.RegisterVolChangeCallBack("JK.HandleVolumeChangeCallback");
+ context.jamClient.SessionRegisterCallback("JK.HandleBridgeCallback");
+ context.jamClient.SessionSetAlertCallback("JK.AlertCallback");
+
+ // If you load this page directly, the loading of the current user
+ // is happening in parallel. We can't join the session until the
+ // current user has been completely loaded. Poll for the current user
+ // before proceeding with session joining.
+ function checkForCurrentUser() {
+ if (context.JK.userMe) {
+ afterCurrentUserLoaded();
+ } else {
+ context.setTimeout(checkForCurrentUser, 100);
+ }
+ }
+ checkForCurrentUser();
+ }
+
+ function afterCurrentUserLoaded() {
+ logger.debug("afterCurrentUserLoaded");
+ // It seems the SessionModel should be a singleton.
+ // a client can only be in one session at a time,
+ // and other parts of the code want to know at any certain times
+ // about the current session, if any (for example, reconnect logic)
+ context.JK.CurrentSessionModel = sessionModel = new context.JK.SessionModel(
+ context.JK.JamServer,
+ context.jamClient
+ );
+
+ sessionModel.subscribe('sessionScreen', sessionChanged);
+ logger.debug("sessionId=" + sessionId);
+ sessionModel.joinSession(sessionId)
+ .fail(function(xhr, textStatus, errorMessage) {
+ if(xhr.status == 404) {
+ // we tried to join the session, but it's already gone. kick user back to join session screen
+ context.window.location = "#/findSession";
+ app.notify(
+ { title: "Unable to Join Session",
+ text: "The session you attempted to join is over."
+ },
+ { no_cancel: true });
+ }else {
+ app.ajaxError(xhr, textStatus, errorMessage);
+ }
+ });
+ }
+
+ function beforeHide(data) {
+ // track that the screen is inactive, to disable body-level handlers
+ screenActive = false;
+ sessionModel.leaveCurrentSession()
+ .fail(app.ajaxError);
+ }
+
+ function sessionChanged() {
+ logger.debug("sessionChanged()");
+
+ // TODO - in the specific case of a user changing their tracks using the configureTrack dialog,
+ // this event appears to fire before the underlying mixers have updated. I have no event to
+ // know definitively when the underlying mixers are up to date, so for now, we just delay slightly.
+ // This obviously has the possibility of introducing time-based bugs.
+ context.setTimeout(renderSession, RENDER_SESSION_DELAY);
+ }
+
+ /**
+ * the mixers object is a list. In order to find one by key,
+ * you must iterate. Convenience method to locate a particular
+ * mixer by id.
+ */
+ function getMixer(mixerId) {
+ var foundMixer = null;
+ $.each(mixers, function(index, mixer) {
+ if (mixer.id === mixerId) {
+ foundMixer = mixer;
+ }
+ });
+ return foundMixer;
+ }
+
+ function renderSession() {
+ $('#session-mytracks-container').empty();
+ $('.session-track').remove(); // Remove previous tracks
+ var $voiceChat = $('#voice-chat');
+ $voiceChat.hide();
+ _updateMixers();
+ _renderTracks();
+ _wireTopVolume();
+ _wireTopMix();
+ _addVoiceChat();
+ _initDialogs();
+ if ($('.session-livetracks .track').length === 0) {
+ $('.session-livetracks .when-empty').show();
+ }
+ }
+
+ function _initDialogs() {
+ logger.debug("Calling _initDialogs");
+ configureTrackDialog.initialize();
+ addTrackDialog.initialize();
+ addNewGearDialog.initialize();
+ }
+
+ // Get the latest list of underlying audio mixer channels
+ function _updateMixers() {
+ var mixerIds = context.jamClient.SessionGetIDs();
+ var holder = $.extend(true, {}, {mixers: context.jamClient.SessionGetControlState(mixerIds)});
+ mixers = holder.mixers;
+ // Always add a hard-coded simplified 'mixer' for the L2M mix
+ var l2m_mixer = {
+ id: '__L2M__',
+ range_low: -80,
+ range_high: 20,
+ volume_left: context.jamClient.SessionGetMasterLocalMix()
+ };
+ mixers.push(l2m_mixer);
+ }
+
+ // TODO FIXME - This needs to support multiple tracks for an individual
+ // client id and group.
+ function _mixerForClientId(clientId, groupIds, usedMixers) {
+ var foundMixer = null;
+ $.each(mixers, function(index, mixer) {
+ if (mixer.client_id === clientId) {
+ for (var i=0; i 20) {
+ lookingForMixersCount = 0;
+ lookingForMixers = {};
+ context.clearTimeout(lookingForMixersTimer);
+ lookingForMixersTimer = null;
+ }
+ }
+
+ // Given a mixerID and a value between 0.0-1.0,
+ // light up the proper VU lights.
+ function _updateVU(mixerId, value) {
+
+ // Special-case for mono tracks. If mono, and it's a _vul id,
+ // update both sides, otherwise do nothing.
+ // If it's a stereo track, just do the normal thing.
+ var selector;
+ var pureMixerId = mixerId.replace("_vul", "");
+ pureMixerId = pureMixerId.replace("_vur", "");
+ var mixer = getMixer(pureMixerId);
+ if (mixer) {
+ if (!(mixer.stereo)) { // mono track
+ if (mixerId.substr(-4) === "_vul") {
+ // Do the left
+ selector = '#tracks [mixer-id="' + pureMixerId + '_vul"]';
+ context.JK.VuHelpers.updateVU(selector, value);
+ // Do the right
+ selector = '#tracks [mixer-id="' + pureMixerId + '_vur"]';
+ context.JK.VuHelpers.updateVU(selector, value);
+ } // otherwise, it's a mono track, _vur event - ignore.
+ } else { // stereo track
+ selector = '#tracks [mixer-id="' + mixerId + '"]';
+ context.JK.VuHelpers.updateVU(selector, value);
+ }
+ }
+ }
+
+ function _addTrack(index, trackData) {
+ var parentSelector = '#session-mytracks-container';
+ var $destination = $(parentSelector);
+ if (trackData.clientId !== app.clientId) {
+ parentSelector = '#session-livetracks-container';
+ $destination = $(parentSelector);
+ $('.session-livetracks .when-empty').hide();
+ }
+ var template = $('#template-session-track').html();
+ var newTrack = context.JK.fillTemplate(template, trackData);
+ $destination.append(newTrack);
+
+ // Render VU meters and gain fader
+ var trackSelector = parentSelector + ' .session-track[track-id="' + trackData.trackId + '"]';
+ var gainPercent = trackData.gainPercent || 0;
+ connectTrackToMixer(trackSelector, trackData.clientId, trackData.mixerId, gainPercent);
+
+ var $closeButton = $('#div-track-close', 'div[track-id="' + trackData.trackId + '"]');
+ if (index === 0) {
+ $closeButton.hide();
+ }
+ else {
+ $closeButton.click(deleteTrack);
+ }
+
+ var $trackSettings = $('div[mixer-id="' + trackData.mixerId + '"].track-icon-settings');
+ $trackSettings.click(function() {
+ // call this to initialize Voice Chat tab
+ configureTrackDialog.showVoiceChatPanel(true);
+ configureTrackDialog.showMusicAudioPanel(true);
+ });
+
+ tracks[trackData.trackId] = new context.JK.SessionTrack(trackData.clientId);
+ }
+
+ /**
+ * Will be called when fader changes. The fader id (provided at subscribe time),
+ * the new value (0-100) and whether the fader is still being dragged are passed.
+ */
+ function faderChanged(faderId, newValue, dragging) {
+ var mixerIds = faderId.split(',');
+ $.each(mixerIds, function(i,v) {
+ var broadcast = !(dragging); // If fader is still dragging, don't broadcast
+ fillTrackVolumeObject(v, broadcast);
+ setMixerVolume(v, newValue);
+ });
+ }
+
+ function handleVolumeChangeCallback(mixerId, isLeft, value) {
+ // Visually update mixer
+ // There is no need to actually set the back-end mixer value as the
+ // back-end will already have updated the audio mixer directly prior to sending
+ // me this event. I simply need to visually show the new fader position.
+ // TODO: Use mixer's range
+ var faderValue = percentFromMixerValue(-80, 20, value);
+ context.JK.FaderHelpers.setFaderValue(mixerId, faderValue);
+ }
+
+ function handleBridgeCallback() {
+ var eventName = null;
+ var mixerId = null;
+ var value = null;
+ var tuples = arguments.length / 3;
+ for (var i=0; i
+*/
+var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y0){for(var af=0;af0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad "Hey Jon"
+ context.JK.fillTemplate = function(template, vals) {
+ for(var val in vals)
+ template=template.replace(new RegExp('{'+val+'}','g'), vals[val]);
+ return template;
+ };
+
+ context.JK.resolveAvatarUrl = function(photo_url) {
+ return photo_url ? photo_url : "/assets/shared/avatar_generic.png";
+ };
+
+ context.JK.getInstrumentIconMap24 = function() {
+ return instrumentIconMap24;
+ };
+
+ context.JK.getInstrumentIconMap45 = function() {
+ return instrumentIconMap45;
+ };
+
+ context.JK.getInstrumentIcon24 = function(instrument) {
+ if (instrument in instrumentIconMap24) {
+ return instrumentIconMap24[instrument];
+ }
+
+ return instrumentIconMap24["default"];
+ };
+
+ context.JK.getInstrumentIcon45 = function(instrument) {
+ if (instrument in instrumentIconMap45) {
+ return instrumentIconMap45[instrument];
+ }
+
+ return instrumentIconMap45["default"];
+ };
+
+ context.JK.listInstruments = function(app, callback) {
+ var url = "/api/instruments";
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ url: url,
+ success: function(response) {
+ callback(response);
+ },
+ error: app.ajaxError
+ });
+ };
+
+ context.JK.showErrorDialog = function(app, msg, title) {
+ app.layout.showDialog('error-dialog');
+ $('#error-msg', 'div[layout-id="error-dialog"]').html(msg);
+ $('#error-summary', 'div[layout-id="error-dialog"]').html(title);
+ }
+
+ // TODO: figure out how to handle this in layout.js for layered popups
+ context.JK.showOverlay = function() {
+ $('.dialog-overlay').show();
+ }
+
+ context.JK.hideOverlay = function() {
+ $('.dialog-overlay').hide();
+ }
+
+ /*
+ * Loads a listbox or dropdown with the values in input_array, setting the option value
+ * to the id_field and the option text to text_field. It will preselect the option with
+ * value equal to selected_id.
+ */
+ context.JK.loadOptions = function(templateHtml, listbox_id, input_array, id_field, text_field, selected_id) {
+ $.each(input_array, function(index, val) {
+ var isSelected = "";
+ if (val[id_field] === selected_id) {
+ isSelected = "selected";
+ }
+ var html = context.JK.fillTemplate(templateHtml, {
+ value: val[id_field],
+ label: val[text_field],
+ selected: isSelected
+ });
+
+ listbox_id.append(html);
+ });
+ }
+
+ context.JK.trimString = function(str) {
+ return str.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+ };
+
+ context.JK.padString = function(str, max) {
+ var retVal = '' + str;
+ while (retVal.length < max) {
+ retVal = '0' + retVal;
+ }
+
+ return retVal;
+ }
+
+ context.JK.formatDate = function(dateString) {
+ var date = new Date(dateString);
+ return date.getFullYear() + "-" + context.JK.padString(date.getMonth()+1, 2) + "-" + context.JK.padString(date.getDate(), 2) + " @ " + date.toLocaleTimeString();
+ }
+
+ context.JK.search = function(query, app, callback) {
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ contentType: 'application/json',
+ url: "/api/search?query=" + query,
+ processData: false,
+ success: function(response) {
+ callback(response);
+ },
+ error: app.ajaxError
+ });
+ };
+
+ context.JK.sendFriendRequest = function(app, userId, callback) {
+ var url = "/api/users/" + context.JK.currentUserId + "/friend_requests";
+ $.ajax({
+ type: "POST",
+ dataType: "json",
+ contentType: 'application/json',
+ url: url,
+ data: '{"friend_id":"' + userId + '"}',
+ processData: false,
+ success: function(response) {
+ callback(userId);
+ },
+ error: app.ajaxError
+ });
+ };
+
+ /*
+ * Get the length of a dictionary
+ */
+ context.JK.dlen = function(d) {
+ var count = 0;
+ for (var i in d) {
+ if (d.hasOwnProperty(i)) {
+ count++;
+ }
+ }
+ return count;
+ };
+
+ /**
+ * Finds the first error associated with the field.
+ * @param fieldName the name of the field
+ * @param errors_data response from a 422 response in ajax
+ * @returns null if no error for the field name, or the 1st error associated with that field
+ */
+ context.JK.get_first_error = function(fieldName, errors_data) {
+ var errors = errors_data["errors"];
+ if(errors == null) return null;
+
+ if(errors[fieldName] && errors[fieldName].length > 0) {
+ return errors[fieldName][0]
+ }
+ else {
+ return null;
+ }
+ }
+
+ /**
+ * Returns a ul with an li per field name.
+ * @param fieldName the name of the field
+ * @param errors_data error data return by a 422 ajax response
+ * @returns null if no error for the field name; otherwise a ul/li
+ */
+ context.JK.format_errors = function(fieldName, errors_data) {
+ var errors = errors_data["errors"];
+ if(errors == null) return null;
+
+ var field_errors = errors[fieldName];
+ if(field_errors == null) {
+ return null;
+ }
+
+ var ul = $('
')
+
+ $.each(field_errors, function(index, item) {
+ ul.append(context.JK.fillTemplate("- {message}
", {message: item}))
+ })
+
+ return ul;
+ }
+
+
+ /**
+ * Way to verify that a number of parallel tasks have all completed.
+ * Provide a function to evaluate completion, and a callback to
+ * invoke when that function evaluates to true.
+ * NOTE: this does not pause execution, it simply ensures that
+ * when the test function evaluates to true, the callback will
+ * be invoked.
+ */
+ context.JK.joinCalls = function(completionTestFunction, callback, interval) {
+ function doneYet() {
+ if (completionTestFunction()) {
+ callback();
+ } else {
+ context.setTimeout(doneYet, interval);
+ }
+ }
+ doneYet();
+ };
+
+ /**
+ * Returns 'MacOSX' if the os appears to be macintosh,
+ * 'Win32' if the os appears to be windows,
+ * 'Unix' if the OS appears to be linux,
+ * and null if unknown
+ * @returns {*}
+ */
+ context.JK.detectOS = function() {
+ if(!navigator.platform) { return null; }
+
+ if (navigator.platform.toLowerCase().indexOf( 'mac' ) !== -1) {
+ return "MacOSX";
+ }
+ if (navigator.platform.toLowerCase().indexOf( 'win' ) !== -1 ) {
+ return "Win32"
+ }
+ if (navigator.platform.toLowerCase().indexOf('linux') !== -1 ) {
+ return "Unix"
+ }
+
+ return null;
+ }
+
+ context.JK.popExternalLinks = function() {
+ // Allow any a link with a rel="external" attribute to launch
+ // the link in the default browser, using jamClient:
+ $('a[rel="external"]').click(function(evt) {
+ evt.preventDefault();
+ var href = $(this).attr("href");
+ if (href) {
+ // make absolute if not already
+ if(href.indexOf('http') != 0 && href.indexOf('mailto') != 0) {
+ href = window.location.protocol + '//' + window.location.host + href;
+ }
+
+ context.jamClient.OpenSystemBrowser(href);
+ }
+ return false;
+ });
+ }
+
+ /*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Copyright (C) Paul Johnston 1999 - 2000.
+ * Updated by Greg Holt 2000 - 2001.
+ * See http://pajhome.org.uk/site/legal.html for details.
+ */
+
+ /*
+ * Convert a 32-bit number to a hex string with ls-byte first
+ */
+ var hex_chr = "0123456789abcdef";
+ function rhex(num) {
+ var str, j;
+ str = "";
+ for(j=0; j<=3; j++) {
+ str += hex_chr.charAt((num >> (j * 8 + 4)) & 0x0F) +
+ hex_chr.charAt((num >> (j * 8)) & 0x0F);
+ }
+ return str;
+ }
+
+ /*
+ * Convert a string to a sequence of 16-word blocks, stored as an array.
+ * Append padding bits and the length, as described in the MD5 standard.
+ */
+ function str2blks_MD5(str) {
+ var nblk, blks, i;
+ nblk = ((str.length + 8) >> 6) + 1;
+ blks = new Array(nblk * 16);
+ for(i = 0; i < nblk * 16; i++) blks[i] = 0;
+ for(i = 0; i < str.length; i++)
+ blks[i >> 2] |= str.charCodeAt(i) << ((i % 4) * 8);
+ blks[i >> 2] |= 0x80 << ((i % 4) * 8);
+ blks[nblk * 16 - 2] = str.length * 8;
+ return blks;
+ }
+
+ /*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+ function add(x, y)
+ {
+ var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+ var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+ return (msw << 16) | (lsw & 0xFFFF);
+ }
+
+ /*
+ * Bitwise rotate a 32-bit number to the left
+ */
+ function rol(num, cnt)
+ {
+ return (num << cnt) | (num >>> (32 - cnt));
+ }
+
+ /*
+ * These functions implement the basic operation for each round of the
+ * algorithm.
+ */
+ function cmn(q, a, b, x, s, t)
+ {
+ return add(rol(add(add(a, q), add(x, t)), s), b);
+ }
+ function ff(a, b, c, d, x, s, t)
+ {
+ return cmn((b & c) | ((~b) & d), a, b, x, s, t);
+ }
+ function gg(a, b, c, d, x, s, t)
+ {
+ return cmn((b & d) | (c & (~d)), a, b, x, s, t);
+ }
+ function hh(a, b, c, d, x, s, t)
+ {
+ return cmn(b ^ c ^ d, a, b, x, s, t);
+ }
+ function ii(a, b, c, d, x, s, t)
+ {
+ return cmn(c ^ (b | (~d)), a, b, x, s, t);
+ }
+
+ /*
+ * Take a string and return the hex representation of its MD5.
+ */
+ context.JK.calcMD5 = function(str) {
+ var x, a, b, c, d, i,
+ olda, oldb, oldc, oldd;
+ x = str2blks_MD5(str);
+ a = 1732584193;
+ b = -271733879;
+ c = -1732584194;
+ d = 271733878;
+
+ for(i = 0; i < x.length; i += 16)
+ {
+ olda = a;
+ oldb = b;
+ oldc = c;
+ oldd = d;
+
+ a = ff(a, b, c, d, x[i+ 0], 7 , -680876936);
+ d = ff(d, a, b, c, x[i+ 1], 12, -389564586);
+ c = ff(c, d, a, b, x[i+ 2], 17, 606105819);
+ b = ff(b, c, d, a, x[i+ 3], 22, -1044525330);
+ a = ff(a, b, c, d, x[i+ 4], 7 , -176418897);
+ d = ff(d, a, b, c, x[i+ 5], 12, 1200080426);
+ c = ff(c, d, a, b, x[i+ 6], 17, -1473231341);
+ b = ff(b, c, d, a, x[i+ 7], 22, -45705983);
+ a = ff(a, b, c, d, x[i+ 8], 7 , 1770035416);
+ d = ff(d, a, b, c, x[i+ 9], 12, -1958414417);
+ c = ff(c, d, a, b, x[i+10], 17, -42063);
+ b = ff(b, c, d, a, x[i+11], 22, -1990404162);
+ a = ff(a, b, c, d, x[i+12], 7 , 1804603682);
+ d = ff(d, a, b, c, x[i+13], 12, -40341101);
+ c = ff(c, d, a, b, x[i+14], 17, -1502002290);
+ b = ff(b, c, d, a, x[i+15], 22, 1236535329);
+
+ a = gg(a, b, c, d, x[i+ 1], 5 , -165796510);
+ d = gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
+ c = gg(c, d, a, b, x[i+11], 14, 643717713);
+ b = gg(b, c, d, a, x[i+ 0], 20, -373897302);
+ a = gg(a, b, c, d, x[i+ 5], 5 , -701558691);
+ d = gg(d, a, b, c, x[i+10], 9 , 38016083);
+ c = gg(c, d, a, b, x[i+15], 14, -660478335);
+ b = gg(b, c, d, a, x[i+ 4], 20, -405537848);
+ a = gg(a, b, c, d, x[i+ 9], 5 , 568446438);
+ d = gg(d, a, b, c, x[i+14], 9 , -1019803690);
+ c = gg(c, d, a, b, x[i+ 3], 14, -187363961);
+ b = gg(b, c, d, a, x[i+ 8], 20, 1163531501);
+ a = gg(a, b, c, d, x[i+13], 5 , -1444681467);
+ d = gg(d, a, b, c, x[i+ 2], 9 , -51403784);
+ c = gg(c, d, a, b, x[i+ 7], 14, 1735328473);
+ b = gg(b, c, d, a, x[i+12], 20, -1926607734);
+
+ a = hh(a, b, c, d, x[i+ 5], 4 , -378558);
+ d = hh(d, a, b, c, x[i+ 8], 11, -2022574463);
+ c = hh(c, d, a, b, x[i+11], 16, 1839030562);
+ b = hh(b, c, d, a, x[i+14], 23, -35309556);
+ a = hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
+ d = hh(d, a, b, c, x[i+ 4], 11, 1272893353);
+ c = hh(c, d, a, b, x[i+ 7], 16, -155497632);
+ b = hh(b, c, d, a, x[i+10], 23, -1094730640);
+ a = hh(a, b, c, d, x[i+13], 4 , 681279174);
+ d = hh(d, a, b, c, x[i+ 0], 11, -358537222);
+ c = hh(c, d, a, b, x[i+ 3], 16, -722521979);
+ b = hh(b, c, d, a, x[i+ 6], 23, 76029189);
+ a = hh(a, b, c, d, x[i+ 9], 4 , -640364487);
+ d = hh(d, a, b, c, x[i+12], 11, -421815835);
+ c = hh(c, d, a, b, x[i+15], 16, 530742520);
+ b = hh(b, c, d, a, x[i+ 2], 23, -995338651);
+
+ a = ii(a, b, c, d, x[i+ 0], 6 , -198630844);
+ d = ii(d, a, b, c, x[i+ 7], 10, 1126891415);
+ c = ii(c, d, a, b, x[i+14], 15, -1416354905);
+ b = ii(b, c, d, a, x[i+ 5], 21, -57434055);
+ a = ii(a, b, c, d, x[i+12], 6 , 1700485571);
+ d = ii(d, a, b, c, x[i+ 3], 10, -1894986606);
+ c = ii(c, d, a, b, x[i+10], 15, -1051523);
+ b = ii(b, c, d, a, x[i+ 1], 21, -2054922799);
+ a = ii(a, b, c, d, x[i+ 8], 6 , 1873313359);
+ d = ii(d, a, b, c, x[i+15], 10, -30611744);
+ c = ii(c, d, a, b, x[i+ 6], 15, -1560198380);
+ b = ii(b, c, d, a, x[i+13], 21, 1309151649);
+ a = ii(a, b, c, d, x[i+ 4], 6 , -145523070);
+ d = ii(d, a, b, c, x[i+11], 10, -1120210379);
+ c = ii(c, d, a, b, x[i+ 2], 15, 718787259);
+ b = ii(b, c, d, a, x[i+ 9], 21, -343485551);
+
+ a = add(a, olda);
+ b = add(b, oldb);
+ c = add(c, oldc);
+ d = add(d, oldd);
+ }
+ return rhex(a) + rhex(b) + rhex(c) + rhex(d);
+ };
+
+ })(window,jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/vuHelpers.js b/web/app/assets/javascripts/vuHelpers.js
new file mode 100644
index 000000000..c63567321
--- /dev/null
+++ b/web/app/assets/javascripts/vuHelpers.js
@@ -0,0 +1,89 @@
+/**
+* Functions related to VU meters.
+* These functions are intimately tied to the markup defined in the
+* VU templates in _vu_meters.html.erb
+*/
+(function(context, $) {
+
+ "use strict";
+
+ context.JK = context.JK || {};
+
+ // As these are helper functions, just have a single
+ // static object with functions. Each function should
+ // take all necessary arguments to complete its work.
+ context.JK.VuHelpers = {
+
+ /**
+ * Render a VU meter into the provided selector.
+ * vuType can be either "horizontal" or "vertical"
+ */
+ renderVU: function(selector, userOptions) {
+ /**
+ * The default options for rendering a VU
+ */
+ var renderVUDefaults = {
+ vuType: "vertical",
+ lightCount: 12,
+ lightWidth: 3,
+ lightHeight: 17
+ };
+
+ var options = $.extend({}, renderVUDefaults, userOptions);
+ var templateSelector = "#template-vu-v";
+ if (options.vuType === "horizontal") {
+ templateSelector = "#template-vu-h";
+ }
+ var templateSource = $(templateSelector).html();
+ $(selector).empty();
+
+ $(selector).html(context._.template(templateSource, options, {variable: 'data'}));
+ },
+
+ /**
+ * Given a selector representing a container for a VU meter and
+ * a value between 0.0 and 1.0, light the appropriate lights.
+ */
+ updateVU: function (selector, value) {
+ // There are 13 VU lights. Figure out how many to
+ // light based on the incoming value.
+ var countSelector = 'tr';
+ var horizontal = ($('table.horizontal', selector).length);
+ if (horizontal) {
+ countSelector = 'td';
+ }
+
+ var lightCount = $(countSelector, selector).length;
+ var i = 0;
+ var state = 'on';
+ var lights = Math.round(value * lightCount);
+ var redSwitch = Math.round(lightCount * 0.6666667);
+
+ var $light = null;
+ var colorClass = 'vu-green-';
+ var lightSelectorPrefix = selector + ' td.vu';
+ var thisLightSelector = null;
+
+ // Remove all light classes from all lights
+ var allLightsSelector = selector + ' td.vulight';
+ $(allLightsSelector).removeClass('vu-green-off vu-green-on vu-red-off vu-red-on');
+
+ // Set the lights
+ for (i=0; i= redSwitch) {
+ colorClass = 'vu-red-';
+ }
+ if (i >= lights) {
+ state = 'off';
+ }
+ thisLightSelector = lightSelectorPrefix + i;
+ $light = $(thisLightSelector);
+ $light.addClass(colorClass + state);
+ }
+ }
+
+ };
+
+})(window, jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/web_socket.js b/web/app/assets/javascripts/web_socket.js
new file mode 100644
index 000000000..06cc5d027
--- /dev/null
+++ b/web/app/assets/javascripts/web_socket.js
@@ -0,0 +1,391 @@
+// Copyright: Hiroshi Ichikawa ] [-s ] -u -i [-a]')
+ xml.argument('foo=etch.dyndns.org:4442')
+ xml.argument('bar=etch.dyndns.org:4442')
+ xml.argument("-uhttp://www.jamkazam.com#{isp_scoring_path}")
+ xml.argument("-i#{params[:isp]}")
+ xml.argument('-a')
+ end
+ xml.update(:check => 'background')
+ end
+ send_data jnlp, :type=>"application/x-java-jnlp-file"
+ end
+
+ def isp
+ @isps = {
+ 'tw' => ['Time Warner', 'tw.jpg'],
+ 'vz' => ['Verizon', 'vz.png'],
+ 'att' => ['AT&T', 'att.png'],
+ 'cc' => ['Comcast', 'cc.png'],
+ 'other' => ['Other', 'other.jpg']
+ }
+ render :layout => "landing"
+ end
+
+ private
+
+ def correct_user
+ @user = User.find(params[:id])
+ redirect_to(root_url) unless current_user?(@user)
+ end
+
+ def admin_user
+ redirect_to(root_url) unless current_user.admin?
+ end
+
+ # the User Model expects instruments in a different format than the form submits it
+ # so we have to fix it up.
+ def fixup_instruments(original_instruments)
+ # if an instrument is selected by the user in the form, it'll show up in this array
+ instruments = []
+
+ # ok, sweep through all the fields submitted, looking for selected instruments.
+ # also, make up priority because we don't ask for it (but users can fix it later on their profile)
+ priority = 0
+ unless original_instruments == nil
+ original_instruments.each do |key, value|
+ if !value["selected"].nil?
+ instruments << { :instrument_id => key, :proficiency_level => value["proficiency"].to_i, :priority => priority }
+ priority = priority + 1
+ end
+ end
+ end
+
+ return instruments
+ end
+
+ # the User Model expects instruments in a different format than the form submits it
+ # so we have to fix it up.
+ def fixup_birthday(month, day, year)
+ if month.blank? || day.blank? || year.blank?
+ # invalid birthdate, so return nil
+ return nil
+ end
+
+ return Date.new(year.to_i, month.to_i, day.to_i)
+ end
+
+ def load_invited_user(params)
+ # check if this an anonymous request, or result of invitation code
+ invitation_code = params[:invitation_code]
+
+ invited_user = nil
+ unless invitation_code.nil?
+ # we only want to find invitations that have not been accepted
+ invited_user = InvitedUser.find_by_invitation_code(invitation_code)
+ end
+ return invited_user
+ end
+
+ def load_location(remote_ip, location = nil)
+ @location = location
+
+ if @location.nil?
+ @location = MaxMindManager.lookup(remote_ip)
+ end
+
+ @location[:country] = "US" if @location[:country].nil?
+
+ # right now we only accept US signups for beta
+ @countries = MaxMindManager.countries()
+ # populate regions based on current country
+ @regions = MaxMindManager.regions(@location[:country])
+ @cities = @location[:state].nil? ? [] : MaxMindManager.cities(@location[:country], @location[:state])
+ end
+
+ def load_postback(invited_user)
+ if invited_user.nil?
+ signup_path
+ else
+ signup_path + "?invitation_code=" + invited_user.invitation_code
+ end
+ end
+end
diff --git a/web/app/helpers/application_helper.rb b/web/app/helpers/application_helper.rb
new file mode 100644
index 000000000..3330b45ab
--- /dev/null
+++ b/web/app/helpers/application_helper.rb
@@ -0,0 +1,16 @@
+module ApplicationHelper
+
+ # Returns the full title on a per-page basis.
+ def full_title(page_title)
+ base_title = "JamKazam"
+ if page_title.empty?
+ base_title
+ else
+ "#{base_title} | #{page_title}"
+ end
+ end
+
+ def self.base_uri(request)
+ (request.ssl? ? "https://" : "http://") + request.host_with_port
+ end
+end
diff --git a/web/app/helpers/meta_helper.rb b/web/app/helpers/meta_helper.rb
new file mode 100644
index 000000000..0ba8cb259
--- /dev/null
+++ b/web/app/helpers/meta_helper.rb
@@ -0,0 +1,7 @@
+module MetaHelper
+
+ def version()
+ "web=#{::JamWeb::VERSION} lib=#{JamRuby::VERSION} db=#{JamDb::VERSION} pb=#{Jampb::VERSION}"
+ end
+
+end
diff --git a/web/app/helpers/sessions_helper.rb b/web/app/helpers/sessions_helper.rb
new file mode 100644
index 000000000..72e8618a6
--- /dev/null
+++ b/web/app/helpers/sessions_helper.rb
@@ -0,0 +1,68 @@
+module SessionsHelper
+
+ def sign_in(user)
+ set_remember_token(user)
+ self.current_user = user
+ end
+
+ def set_remember_token(user)
+ if @session_only_cookie
+ cookies.delete(:remember_token)
+ cookies[:remember_token] = user.remember_token
+ else
+ cookies[:remember_token] = {
+ :value => user.remember_token,
+ :expires => 20.years.from_now.utc
+ }
+ end
+ end
+
+ def signed_in?
+ !current_user.nil?
+ end
+
+ def current_user=(user)
+ @current_user = user
+ end
+
+ def current_user
+ @current_user ||= User.find_by_remember_token(cookies[:remember_token])
+ end
+
+ def current_user?(user)
+ user == current_user
+ end
+
+ def signed_in_user
+ unless signed_in?
+ store_location
+ redirect_to signin_url, notice: "Please sign in."
+ end
+ end
+
+
+ def api_signed_in_user
+ unless signed_in?
+ render :json => {}, :status => 403
+ end
+ end
+
+ def sign_out
+ current_user = nil
+ cookies.delete(:remember_token)
+ end
+
+ def redirect_back_or(default)
+ redirect_to(session[:return_to] || default)
+ session.delete(:return_to)
+ end
+
+ def store_location
+ session[:return_to] = request.url
+ end
+
+ def jkclient_agent?
+ request.env['HTTP_USER_AGENT'] =~ /JamKazam/
+ end
+
+end
diff --git a/web/app/helpers/static_pages_helper.rb b/web/app/helpers/static_pages_helper.rb
new file mode 100644
index 000000000..2d63e79e6
--- /dev/null
+++ b/web/app/helpers/static_pages_helper.rb
@@ -0,0 +1,2 @@
+module StaticPagesHelper
+end
diff --git a/web/app/helpers/users_helper.rb b/web/app/helpers/users_helper.rb
new file mode 100644
index 000000000..b3edd0a32
--- /dev/null
+++ b/web/app/helpers/users_helper.rb
@@ -0,0 +1,12 @@
+module UsersHelper
+
+ # Returns the Gravatar (http://gravatar.com/) for the given user.
+ def gravatar_for(user, options = { size: 50, hclass: "gravatar" })
+ gravatar_id = Digest::MD5::hexdigest(user.email.downcase)
+ size = options[:size]
+ hclass = options[:hclass]
+ gravatar =
+ gravatar_url = "https://secure.gravatar.com/avatar/#{gravatar_id}?s=#{size}"
+ image_tag(gravatar_url, alt: "#{user.first_name} #{user.last_name}", class: "#{hclass}")
+ end
+end
diff --git a/web/app/mailers/.gitkeep b/web/app/mailers/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/app/responders/api_responder.rb b/web/app/responders/api_responder.rb
new file mode 100644
index 000000000..64df5fd69
--- /dev/null
+++ b/web/app/responders/api_responder.rb
@@ -0,0 +1,16 @@
+class ApiResponder < ActionController::Responder
+ def to_format
+ case
+ when has_errors?
+ logger.debug("REST API entity has error: #{resource.errors.inspect}")
+ controller.response.status = :unprocessable_entity
+ when post?
+ logger.debug("REST API post")
+ controller.response.status = :created
+ end
+
+ default_render
+ rescue ActionView::MissingTemplate => e
+ api_behavior(e)
+ end
+end
diff --git a/web/app/views/api_bands/create.rabl b/web/app/views/api_bands/create.rabl
new file mode 100644
index 000000000..86df71066
--- /dev/null
+++ b/web/app/views/api_bands/create.rabl
@@ -0,0 +1,3 @@
+object @band
+
+extends "api_bands/show"
\ No newline at end of file
diff --git a/web/app/views/api_bands/follower_index.rabl b/web/app/views/api_bands/follower_index.rabl
new file mode 100644
index 000000000..5cb70590c
--- /dev/null
+++ b/web/app/views/api_bands/follower_index.rabl
@@ -0,0 +1,21 @@
+collection @band.followers
+
+node :user_id do |follower|
+ follower.id
+end
+
+node :name do |follower|
+ follower.name
+end
+
+node :location do |follower|
+ follower.location
+end
+
+node :musician do |follower|
+ follower.musician
+end
+
+node :photo_url do |follower|
+ follower.photo_url
+end
diff --git a/web/app/views/api_bands/index.rabl b/web/app/views/api_bands/index.rabl
new file mode 100644
index 000000000..74531e3ae
--- /dev/null
+++ b/web/app/views/api_bands/index.rabl
@@ -0,0 +1,4 @@
+collection @bands
+
+# do not retrieve all child collections when showing a list of bands
+attributes :id, :name, :city, :state, :country, :photo_url, :logo_url
\ No newline at end of file
diff --git a/web/app/views/api_bands/invitation_create.rabl b/web/app/views/api_bands/invitation_create.rabl
new file mode 100644
index 000000000..1cc5c9bde
--- /dev/null
+++ b/web/app/views/api_bands/invitation_create.rabl
@@ -0,0 +1,3 @@
+object @invitation
+
+extends "api_bands/invitation_show"
\ No newline at end of file
diff --git a/web/app/views/api_bands/invitation_index.rabl b/web/app/views/api_bands/invitation_index.rabl
new file mode 100644
index 000000000..2e12df14a
--- /dev/null
+++ b/web/app/views/api_bands/invitation_index.rabl
@@ -0,0 +1,3 @@
+object @invitations
+
+extends "api_bands/invitation_show"
\ No newline at end of file
diff --git a/web/app/views/api_bands/invitation_show.rabl b/web/app/views/api_bands/invitation_show.rabl
new file mode 100644
index 000000000..ffb49a994
--- /dev/null
+++ b/web/app/views/api_bands/invitation_show.rabl
@@ -0,0 +1,15 @@
+object @invitation
+
+attributes :id, :accepted
+
+node :sender do |i|
+ { :id => i.sender.id, :name => i.sender.name }
+end
+
+node :recipient do |i|
+ { :id => i.receiver.id, :name => i.receiver.name }
+end
+
+node :band do |i|
+ { :id => i.band.id, :name => i.band.name }
+end
\ No newline at end of file
diff --git a/web/app/views/api_bands/liker_index.rabl b/web/app/views/api_bands/liker_index.rabl
new file mode 100644
index 000000000..9750b6e33
--- /dev/null
+++ b/web/app/views/api_bands/liker_index.rabl
@@ -0,0 +1,31 @@
+object @band.likers
+
+attributes :liker_id => :user_id
+
+node :first_name do |liker|
+ liker.user.first_name
+end
+
+node :last_name do |liker|
+ liker.user.last_name
+end
+
+node :city do |liker|
+ liker.user.city
+end
+
+node :state do |liker|
+ liker.user.state
+end
+
+node :country do |liker|
+ liker.user.country
+end
+
+node :musician do |liker|
+ liker.user.musician
+end
+
+node :photo_url do |liker|
+ liker.user.photo_url
+end
\ No newline at end of file
diff --git a/web/app/views/api_bands/recording_create.rabl b/web/app/views/api_bands/recording_create.rabl
new file mode 100644
index 000000000..4aeb0e520
--- /dev/null
+++ b/web/app/views/api_bands/recording_create.rabl
@@ -0,0 +1,3 @@
+object @recording
+
+extends "api_bands/recording_show"
\ No newline at end of file
diff --git a/web/app/views/api_bands/recording_index.rabl b/web/app/views/api_bands/recording_index.rabl
new file mode 100644
index 000000000..153606970
--- /dev/null
+++ b/web/app/views/api_bands/recording_index.rabl
@@ -0,0 +1,12 @@
+collection @recordings
+
+attributes :id, :description, :public
+
+node :genres do |recording|
+ unless recording.genres.nil? || recording.genres.size == 0
+ child :genres => :genres do
+ attributes :id, :description
+ #partial('api_genres/index', :object => recording.genres)
+ end
+ end
+end
\ No newline at end of file
diff --git a/web/app/views/api_bands/recording_show.rabl b/web/app/views/api_bands/recording_show.rabl
new file mode 100644
index 000000000..4936e763d
--- /dev/null
+++ b/web/app/views/api_bands/recording_show.rabl
@@ -0,0 +1,10 @@
+object @recording
+
+attributes :id, :description, :public
+
+unless @recording.genres.nil? || @recording.genres.size == 0
+ child :genres => :genres do
+ attributes :id, :description
+ #partial('api_genres/index', :object => @recording.genres)
+ end
+end
\ No newline at end of file
diff --git a/web/app/views/api_bands/recording_update.rabl b/web/app/views/api_bands/recording_update.rabl
new file mode 100644
index 000000000..4aeb0e520
--- /dev/null
+++ b/web/app/views/api_bands/recording_update.rabl
@@ -0,0 +1,3 @@
+object @recording
+
+extends "api_bands/recording_show"
\ No newline at end of file
diff --git a/web/app/views/api_bands/show.rabl b/web/app/views/api_bands/show.rabl
new file mode 100644
index 000000000..fc4b171d9
--- /dev/null
+++ b/web/app/views/api_bands/show.rabl
@@ -0,0 +1,25 @@
+object @band
+
+attributes :id, :name, :city, :state, :country, :website, :biography, :photo_url, :logo_url, :liker_count, :follower_count, :recording_count, :session_count
+
+unless @band.users.nil? || @band.users.size == 0
+ child :users => :musicians do
+ attributes :id, :first_name, :last_name, :photo_url
+
+ # TODO: figure out how to omit empty arrays
+ node :instruments do |user|
+ unless user.instruments.nil? || user.instruments.size == 0
+ child :musician_instruments => :instruments do
+ attributes :instrument_id, :description, :proficiency_level, :priority
+ end
+ end
+ end
+ end
+end
+
+unless @band.genres.nil? || @band.genres.size == 0
+ child :genres => :genres do
+ attributes :id, :description
+ #partial('api_genres/index', :object => @band.genres)
+ end
+end
diff --git a/web/app/views/api_bands/update.rabl b/web/app/views/api_bands/update.rabl
new file mode 100644
index 000000000..86df71066
--- /dev/null
+++ b/web/app/views/api_bands/update.rabl
@@ -0,0 +1,3 @@
+object @band
+
+extends "api_bands/show"
\ No newline at end of file
diff --git a/web/app/views/api_claimed_recordings/index.rabl b/web/app/views/api_claimed_recordings/index.rabl
new file mode 100644
index 000000000..276a551ec
--- /dev/null
+++ b/web/app/views/api_claimed_recordings/index.rabl
@@ -0,0 +1,3 @@
+object @claimed_recordings
+
+extends "api_claimed_recordings/show"
\ No newline at end of file
diff --git a/web/app/views/api_claimed_recordings/show.rabl b/web/app/views/api_claimed_recordings/show.rabl
new file mode 100644
index 000000000..b9dd7af6f
--- /dev/null
+++ b/web/app/views/api_claimed_recordings/show.rabl
@@ -0,0 +1,29 @@
+# I'm not sure this is right at all. The idea is to bring in all the stuff you would need to play the tracks.
+# I don't think I need to include URLs since that's handled by syncing. This is jsut to make the metadata
+# depictable.
+
+object @claimed_recording
+
+attributes :id, :name, :is_public, :is_downloadable
+
+child(:recording => :recording) {
+ attributes :id, :created_at, :duration
+ child(:band => :band) {
+ attributes :id, :name
+ }
+
+ child(:mixes => :mixes) {
+ attributes :id, :url, :is_completed
+ }
+}
+
+child(:recorded_tracks => :recorded_tracks) {
+ attributes :id, :fully_uploaded, :url
+ child(:instrument => :instrument) {
+ attributes :id, :description
+ }
+ child(:user => :user) {
+ attributes :id, :email, :first_name, :last_name, :city, :state, :country, :photo_url
+ }
+}
+
diff --git a/web/app/views/api_genres/index.rabl b/web/app/views/api_genres/index.rabl
new file mode 100644
index 000000000..6fbde2f77
--- /dev/null
+++ b/web/app/views/api_genres/index.rabl
@@ -0,0 +1,3 @@
+object @genres
+
+extends "api_genres/show"
diff --git a/web/app/views/api_genres/show.rabl b/web/app/views/api_genres/show.rabl
new file mode 100644
index 000000000..bfd9107b4
--- /dev/null
+++ b/web/app/views/api_genres/show.rabl
@@ -0,0 +1,3 @@
+object @genre
+
+attributes :id, :description
diff --git a/web/app/views/api_instruments/index.rabl b/web/app/views/api_instruments/index.rabl
new file mode 100644
index 000000000..26f2348aa
--- /dev/null
+++ b/web/app/views/api_instruments/index.rabl
@@ -0,0 +1,3 @@
+object @instruments
+
+extends "api_instruments/show"
diff --git a/web/app/views/api_instruments/show.rabl b/web/app/views/api_instruments/show.rabl
new file mode 100644
index 000000000..8fe354804
--- /dev/null
+++ b/web/app/views/api_instruments/show.rabl
@@ -0,0 +1,3 @@
+object @instrument
+
+attributes :id, :description, :popularity
diff --git a/web/app/views/api_invitations/create.rabl b/web/app/views/api_invitations/create.rabl
new file mode 100644
index 000000000..3831ae78e
--- /dev/null
+++ b/web/app/views/api_invitations/create.rabl
@@ -0,0 +1,3 @@
+object @invitation
+
+extends "api_invitations/invitation"
diff --git a/web/app/views/api_invitations/index.rabl b/web/app/views/api_invitations/index.rabl
new file mode 100644
index 000000000..5f0a35545
--- /dev/null
+++ b/web/app/views/api_invitations/index.rabl
@@ -0,0 +1,3 @@
+object @invitations
+
+extends "api_invitations/invitation"
diff --git a/web/app/views/api_invitations/invitation.rabl b/web/app/views/api_invitations/invitation.rabl
new file mode 100644
index 000000000..95f472afd
--- /dev/null
+++ b/web/app/views/api_invitations/invitation.rabl
@@ -0,0 +1,21 @@
+object @invitation
+
+attributes :id, :join_request_id
+
+child(:sender => :sender) {
+ attributes :id, :name
+}
+
+child(:receiver => :receiver) {
+ attributes :id, :name
+}
+
+child(:music_session) {
+ attributes :id, :description
+}
+
+child(:join_request) {
+ attributes :id
+}
+
+
diff --git a/web/app/views/api_invitations/show.rabl b/web/app/views/api_invitations/show.rabl
new file mode 100644
index 000000000..3831ae78e
--- /dev/null
+++ b/web/app/views/api_invitations/show.rabl
@@ -0,0 +1,3 @@
+object @invitation
+
+extends "api_invitations/invitation"
diff --git a/web/app/views/api_invited_users/create.rabl b/web/app/views/api_invited_users/create.rabl
new file mode 100644
index 000000000..e62c95f69
--- /dev/null
+++ b/web/app/views/api_invited_users/create.rabl
@@ -0,0 +1,3 @@
+object @invited_user
+
+extends "api_invited_users/invited_user"
diff --git a/web/app/views/api_invited_users/index.rabl b/web/app/views/api_invited_users/index.rabl
new file mode 100644
index 000000000..cca853fd4
--- /dev/null
+++ b/web/app/views/api_invited_users/index.rabl
@@ -0,0 +1,3 @@
+object @invited_users
+
+extends "api_invited_users/invited_user"
diff --git a/web/app/views/api_invited_users/invited_user.rabl b/web/app/views/api_invited_users/invited_user.rabl
new file mode 100644
index 000000000..3bce327fa
--- /dev/null
+++ b/web/app/views/api_invited_users/invited_user.rabl
@@ -0,0 +1,3 @@
+object @invited_user
+
+attributes :id, :created_at, :updated_at, :email, :note, :accepted
\ No newline at end of file
diff --git a/web/app/views/api_invited_users/show.rabl b/web/app/views/api_invited_users/show.rabl
new file mode 100644
index 000000000..e62c95f69
--- /dev/null
+++ b/web/app/views/api_invited_users/show.rabl
@@ -0,0 +1,3 @@
+object @invited_user
+
+extends "api_invited_users/invited_user"
diff --git a/web/app/views/api_join_requests/create.rabl b/web/app/views/api_join_requests/create.rabl
new file mode 100644
index 000000000..0c3111a5f
--- /dev/null
+++ b/web/app/views/api_join_requests/create.rabl
@@ -0,0 +1,3 @@
+object @join_request
+
+extends "api_join_requests/join_request"
diff --git a/web/app/views/api_join_requests/index.rabl b/web/app/views/api_join_requests/index.rabl
new file mode 100644
index 000000000..ae5bf1f59
--- /dev/null
+++ b/web/app/views/api_join_requests/index.rabl
@@ -0,0 +1,3 @@
+object @join_requests
+
+extends "api_join_requests/join_request"
diff --git a/web/app/views/api_join_requests/join_request.rabl b/web/app/views/api_join_requests/join_request.rabl
new file mode 100644
index 000000000..a879ee6f2
--- /dev/null
+++ b/web/app/views/api_join_requests/join_request.rabl
@@ -0,0 +1,11 @@
+object @join_request
+
+attributes :id, :text
+attributes :music_session_id => :music_session
+
+child(:user => :user) {
+ attributes :id, :name
+}
+
+
+
diff --git a/web/app/views/api_join_requests/show.rabl b/web/app/views/api_join_requests/show.rabl
new file mode 100644
index 000000000..0c3111a5f
--- /dev/null
+++ b/web/app/views/api_join_requests/show.rabl
@@ -0,0 +1,3 @@
+object @join_request
+
+extends "api_join_requests/join_request"
diff --git a/web/app/views/api_music_sessions/create.rabl b/web/app/views/api_music_sessions/create.rabl
new file mode 100644
index 000000000..e34b6943d
--- /dev/null
+++ b/web/app/views/api_music_sessions/create.rabl
@@ -0,0 +1,3 @@
+object @music_session
+
+extends "api_music_sessions/show"
\ No newline at end of file
diff --git a/web/app/views/api_music_sessions/index.rabl b/web/app/views/api_music_sessions/index.rabl
new file mode 100644
index 000000000..4b7420de3
--- /dev/null
+++ b/web/app/views/api_music_sessions/index.rabl
@@ -0,0 +1,3 @@
+object @music_sessions
+
+extends "api_music_sessions/show"
diff --git a/web/app/views/api_music_sessions/member_show.rabl b/web/app/views/api_music_sessions/member_show.rabl
new file mode 100644
index 000000000..a6023dd1e
--- /dev/null
+++ b/web/app/views/api_music_sessions/member_show.rabl
@@ -0,0 +1,3 @@
+object @connection
+
+attributes :ip_address, :client_id => :id
diff --git a/web/app/views/api_music_sessions/participant_show.rabl b/web/app/views/api_music_sessions/participant_show.rabl
new file mode 100644
index 000000000..cbbf29c87
--- /dev/null
+++ b/web/app/views/api_music_sessions/participant_show.rabl
@@ -0,0 +1,11 @@
+object @connection
+
+attributes :ip_address, :client_id
+attribute :aasm_state => :connection_state
+
+node(:user_id, :if => lambda { |connection| connection.user.friends?(current_user) }) do |connection|
+ connection.user_id
+end
+child(:tracks => :tracks) {
+ attributes :id, :instrument_id, :sound
+}
\ No newline at end of file
diff --git a/web/app/views/api_music_sessions/show.rabl b/web/app/views/api_music_sessions/show.rabl
new file mode 100644
index 000000000..b9670496e
--- /dev/null
+++ b/web/app/views/api_music_sessions/show.rabl
@@ -0,0 +1,34 @@
+object @music_session
+
+attributes :id, :description, :musician_access, :approval_required, :fan_access, :fan_chat, :band_id, :user_id
+
+node :genres do |item|
+ item.genres.map(&:description)
+end
+
+child(:connections => :participants) {
+ collection @music_sessions, :object_root => false
+ attributes :ip_address, :client_id
+
+ node :user do |connection|
+ { :id => connection.user.id, :photo_url => connection.user.photo_url, :name => connection.user.name, :is_friend => connection.user.friends?(current_user), :connection_state => connection.aasm_state }
+ end
+
+ child(:tracks => :tracks) {
+ attributes :id, :connection_id, :instrument_id, :sound
+ }
+}
+
+child({:invitations => :invitations}) {
+ attributes :id, :sender_id, :receiver_id
+}
+
+# only show join_requests if the current_user is in the session
+node(:join_requests, :if => lambda { |music_session| music_session.users.exists?(current_user) } ) do |music_session|
+ child(:join_requests => :join_requests) {
+ attributes :id, :text
+ child(:user => :user) {
+ attributes :id, :name
+ }
+ }
+end
diff --git a/web/app/views/api_music_sessions/track_create.rabl b/web/app/views/api_music_sessions/track_create.rabl
new file mode 100644
index 000000000..1f086e30b
--- /dev/null
+++ b/web/app/views/api_music_sessions/track_create.rabl
@@ -0,0 +1,3 @@
+object @track
+
+extends "api_music_sessions/track_show"
\ No newline at end of file
diff --git a/web/app/views/api_music_sessions/track_index.rabl b/web/app/views/api_music_sessions/track_index.rabl
new file mode 100644
index 000000000..cbb27355e
--- /dev/null
+++ b/web/app/views/api_music_sessions/track_index.rabl
@@ -0,0 +1,3 @@
+object @tracks
+
+extends "api_music_sessions/track_show"
\ No newline at end of file
diff --git a/web/app/views/api_music_sessions/track_show.rabl b/web/app/views/api_music_sessions/track_show.rabl
new file mode 100644
index 000000000..c460b0085
--- /dev/null
+++ b/web/app/views/api_music_sessions/track_show.rabl
@@ -0,0 +1,3 @@
+object @track
+
+attributes :id, :connection_id, :instrument_id, :sound
\ No newline at end of file
diff --git a/web/app/views/api_music_sessions/track_update.rabl b/web/app/views/api_music_sessions/track_update.rabl
new file mode 100644
index 000000000..1f086e30b
--- /dev/null
+++ b/web/app/views/api_music_sessions/track_update.rabl
@@ -0,0 +1,3 @@
+object @track
+
+extends "api_music_sessions/track_show"
\ No newline at end of file
diff --git a/web/app/views/api_search/index.rabl b/web/app/views/api_search/index.rabl
new file mode 100644
index 000000000..1bcb83003
--- /dev/null
+++ b/web/app/views/api_search/index.rabl
@@ -0,0 +1,43 @@
+object @search
+
+unless @search.bands.nil? || @search.bands.size == 0
+ child(:bands => :bands) {
+ attributes :id, :name, :location, :photo_url, :logo_url
+ }
+end
+
+unless @search.musicians.nil? || @search.musicians.size == 0
+ child(:musicians => :musicians) {
+ attributes :id, :first_name, :last_name, :name, :location, :photo_url
+
+ node :is_friend do |musician|
+ musician.friends?(current_user)
+ end
+
+ child :musician_instruments => :instruments do
+ attributes :instrument_id, :description, :proficiency_level, :priority
+ end
+ }
+end
+
+unless @search.fans.nil? || @search.fans.size == 0
+ child(:fans => :fans) {
+ attributes :id, :first_name, :last_name, :name, :location, :photo_url
+
+ node :is_friend do |fan|
+ fan.friends?(current_user)
+ end
+ }
+end
+
+unless @search.recordings.nil? || @search.recordings.size == 0
+ child(:recordings => :recordings) {
+ attributes :id, :name
+ }
+end
+
+unless @search.friends.nil? || @search.friends.size == 0
+ child(:friends => :friends) {
+ attributes :id, :first_name, :last_name, :name, :location, :email, :online, :photo_url, :musician
+ }
+end
diff --git a/web/app/views/api_users/band_following_index.rabl b/web/app/views/api_users/band_following_index.rabl
new file mode 100644
index 000000000..0e49c2b49
--- /dev/null
+++ b/web/app/views/api_users/band_following_index.rabl
@@ -0,0 +1,21 @@
+collection @user.band_followings
+
+node :band_id do |following|
+ following.id
+end
+
+node :name do |following|
+ following.name
+end
+
+node :location do |following|
+ following.location
+end
+
+node :photo_url do |following|
+ following.photo_url
+end
+
+node :logo_url do |following|
+ following.logo_url
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/band_following_show.rabl b/web/app/views/api_users/band_following_show.rabl
new file mode 100644
index 000000000..ad7786535
--- /dev/null
+++ b/web/app/views/api_users/band_following_show.rabl
@@ -0,0 +1,3 @@
+object @following
+
+attributes :id, :band_id, :follower_id
\ No newline at end of file
diff --git a/web/app/views/api_users/band_index.rabl b/web/app/views/api_users/band_index.rabl
new file mode 100644
index 000000000..6ac9c409c
--- /dev/null
+++ b/web/app/views/api_users/band_index.rabl
@@ -0,0 +1,12 @@
+collection @bands
+
+# do not retrieve all child collections when showing a list of bands
+attributes :id, :name, :location, :photo_url, :logo_url
+
+node :genres do |band|
+ unless band.genres.nil? || band.genres.size == 0
+ child :genres => :genres do
+ attributes :id, :description
+ end
+ end
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/band_invitation_index.rabl b/web/app/views/api_users/band_invitation_index.rabl
new file mode 100644
index 000000000..a385b6d03
--- /dev/null
+++ b/web/app/views/api_users/band_invitation_index.rabl
@@ -0,0 +1,3 @@
+object @invitations
+
+extends "api_users/band_invitation_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/band_invitation_show.rabl b/web/app/views/api_users/band_invitation_show.rabl
new file mode 100644
index 000000000..ffb49a994
--- /dev/null
+++ b/web/app/views/api_users/band_invitation_show.rabl
@@ -0,0 +1,15 @@
+object @invitation
+
+attributes :id, :accepted
+
+node :sender do |i|
+ { :id => i.sender.id, :name => i.sender.name }
+end
+
+node :recipient do |i|
+ { :id => i.receiver.id, :name => i.receiver.name }
+end
+
+node :band do |i|
+ { :id => i.band.id, :name => i.band.name }
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/band_invitation_update.rabl b/web/app/views/api_users/band_invitation_update.rabl
new file mode 100644
index 000000000..68a2acead
--- /dev/null
+++ b/web/app/views/api_users/band_invitation_update.rabl
@@ -0,0 +1,3 @@
+object @invitation
+
+extends "api_users/band_invitation_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/band_like_index.rabl b/web/app/views/api_users/band_like_index.rabl
new file mode 100644
index 000000000..7283388cd
--- /dev/null
+++ b/web/app/views/api_users/band_like_index.rabl
@@ -0,0 +1,27 @@
+object @user.band_likes
+
+attributes :band_id
+
+node :name do |like|
+ like.band.name
+end
+
+node :city do |like|
+ like.band.city
+end
+
+node :state do |like|
+ like.band.state
+end
+
+node :country do |like|
+ like.band.country
+end
+
+node :photo_url do |like|
+ like.band.photo_url
+end
+
+node :logo_url do |like|
+ like.band.logo_url
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/create.rabl b/web/app/views/api_users/create.rabl
new file mode 100644
index 000000000..e7df79f18
--- /dev/null
+++ b/web/app/views/api_users/create.rabl
@@ -0,0 +1,3 @@
+object @user
+
+extends "api_users/show"
\ No newline at end of file
diff --git a/web/app/views/api_users/favorite_create.rabl b/web/app/views/api_users/favorite_create.rabl
new file mode 100644
index 000000000..4e83898ba
--- /dev/null
+++ b/web/app/views/api_users/favorite_create.rabl
@@ -0,0 +1,3 @@
+object @user.favorites
+
+extends "api_users/favorite_index"
\ No newline at end of file
diff --git a/web/app/views/api_users/favorite_index.rabl b/web/app/views/api_users/favorite_index.rabl
new file mode 100644
index 000000000..8c5da0be7
--- /dev/null
+++ b/web/app/views/api_users/favorite_index.rabl
@@ -0,0 +1,11 @@
+object @user.favorites
+
+attributes :recording_id
+
+node :description do |favorite|
+ favorite.recording.description
+end
+
+node :public do |favorite|
+ favorite.recording.public
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/follower_index.rabl b/web/app/views/api_users/follower_index.rabl
new file mode 100644
index 000000000..418c61503
--- /dev/null
+++ b/web/app/views/api_users/follower_index.rabl
@@ -0,0 +1,21 @@
+collection @user.followers
+
+node :user_id do |follower|
+ follower.id
+end
+
+node :name do |follower|
+ follower.name
+end
+
+node :location do |follower|
+ follower.location
+end
+
+node :musician do |follower|
+ follower.musician
+end
+
+node :photo_url do |follower|
+ follower.photo_url
+end
diff --git a/web/app/views/api_users/following_create.rabl b/web/app/views/api_users/following_create.rabl
new file mode 100644
index 000000000..c95a073e0
--- /dev/null
+++ b/web/app/views/api_users/following_create.rabl
@@ -0,0 +1,3 @@
+object @user.followings
+
+extends "api_users/following_index"
\ No newline at end of file
diff --git a/web/app/views/api_users/following_index.rabl b/web/app/views/api_users/following_index.rabl
new file mode 100644
index 000000000..4c7941f2f
--- /dev/null
+++ b/web/app/views/api_users/following_index.rabl
@@ -0,0 +1,21 @@
+collection @user.followings
+
+node :user_id do |following|
+ following.id
+end
+
+node :name do |following|
+ following.name
+end
+
+node :location do |following|
+ following.location
+end
+
+node :musician do |following|
+ following.musician
+end
+
+node :photo_url do |following|
+ following.photo_url
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/following_show.rabl b/web/app/views/api_users/following_show.rabl
new file mode 100644
index 000000000..fff81526b
--- /dev/null
+++ b/web/app/views/api_users/following_show.rabl
@@ -0,0 +1,3 @@
+object @following
+
+attributes :id, :user_id, :follower_id
\ No newline at end of file
diff --git a/web/app/views/api_users/friend_index.rabl b/web/app/views/api_users/friend_index.rabl
new file mode 100644
index 000000000..40eb8fd7c
--- /dev/null
+++ b/web/app/views/api_users/friend_index.rabl
@@ -0,0 +1,3 @@
+object @user.friends
+
+attributes :id, :first_name, :last_name, :name, :location, :city, :state, :country, :email, :online, :photo_url
\ No newline at end of file
diff --git a/web/app/views/api_users/friend_request_create.rabl b/web/app/views/api_users/friend_request_create.rabl
new file mode 100644
index 000000000..6f79cfc24
--- /dev/null
+++ b/web/app/views/api_users/friend_request_create.rabl
@@ -0,0 +1,3 @@
+object @friend_request
+
+extends "api_users/friend_request_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/friend_request_index.rabl b/web/app/views/api_users/friend_request_index.rabl
new file mode 100644
index 000000000..5d5261574
--- /dev/null
+++ b/web/app/views/api_users/friend_request_index.rabl
@@ -0,0 +1,3 @@
+object @friend_requests
+
+extends "api_users/friend_request_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/friend_request_show.rabl b/web/app/views/api_users/friend_request_show.rabl
new file mode 100644
index 000000000..a0bb6df49
--- /dev/null
+++ b/web/app/views/api_users/friend_request_show.rabl
@@ -0,0 +1,3 @@
+object @friend_request
+
+attributes :id, :user_id, :friend_id, :status, :message, :created_at
\ No newline at end of file
diff --git a/web/app/views/api_users/friend_request_update.rabl b/web/app/views/api_users/friend_request_update.rabl
new file mode 100644
index 000000000..6f79cfc24
--- /dev/null
+++ b/web/app/views/api_users/friend_request_update.rabl
@@ -0,0 +1,3 @@
+object @friend_request
+
+extends "api_users/friend_request_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/friend_show.rabl b/web/app/views/api_users/friend_show.rabl
new file mode 100644
index 000000000..27bb3275e
--- /dev/null
+++ b/web/app/views/api_users/friend_show.rabl
@@ -0,0 +1,3 @@
+object @friend
+
+attributes :id, :user_id, :friend_id
\ No newline at end of file
diff --git a/web/app/views/api_users/index.rabl b/web/app/views/api_users/index.rabl
new file mode 100644
index 000000000..8f9bbf9a7
--- /dev/null
+++ b/web/app/views/api_users/index.rabl
@@ -0,0 +1,4 @@
+collection @users
+
+# do not retrieve all child collections when showing a list of users
+attributes :id, :first_name, :last_name, :name, :city, :state, :country, :email, :online, :musician, :photo_url
\ No newline at end of file
diff --git a/web/app/views/api_users/like_create.rabl b/web/app/views/api_users/like_create.rabl
new file mode 100644
index 000000000..426460cc7
--- /dev/null
+++ b/web/app/views/api_users/like_create.rabl
@@ -0,0 +1,3 @@
+object @user.likes
+
+extends "api_users/like_index"
\ No newline at end of file
diff --git a/web/app/views/api_users/like_index.rabl b/web/app/views/api_users/like_index.rabl
new file mode 100644
index 000000000..1976ef29f
--- /dev/null
+++ b/web/app/views/api_users/like_index.rabl
@@ -0,0 +1,31 @@
+object @user.likes
+
+attributes :user_id
+
+node :first_name do |like|
+ like.user.first_name
+end
+
+node :last_name do |like|
+ like.user.last_name
+end
+
+node :city do |like|
+ like.user.city
+end
+
+node :state do |like|
+ like.user.state
+end
+
+node :country do |like|
+ like.user.country
+end
+
+node :musician do |like|
+ like.user.musician
+end
+
+node :photo_url do |like|
+ like.user.photo_url
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/liker_index.rabl b/web/app/views/api_users/liker_index.rabl
new file mode 100644
index 000000000..cbdf608bc
--- /dev/null
+++ b/web/app/views/api_users/liker_index.rabl
@@ -0,0 +1,31 @@
+object @user.likers
+
+attributes :liker_id => :user_id
+
+node :first_name do |liker|
+ liker.user.first_name
+end
+
+node :last_name do |liker|
+ liker.user.last_name
+end
+
+node :city do |liker|
+ liker.user.city
+end
+
+node :state do |liker|
+ liker.user.state
+end
+
+node :country do |liker|
+ liker.user.country
+end
+
+node :musician do |liker|
+ liker.user.musician
+end
+
+node :photo_url do |liker|
+ liker.user.photo_url
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/notification_index.rabl b/web/app/views/api_users/notification_index.rabl
new file mode 100644
index 000000000..23f80c077
--- /dev/null
+++ b/web/app/views/api_users/notification_index.rabl
@@ -0,0 +1,7 @@
+collection @notifications
+
+attributes :description, :source_user_id, :target_user_id, :session_id, :recording_id, :invitation_id, :join_request_id, :friend_request_id, :formatted_msg, :created_at, :photo_url
+
+node :notification_id do |n|
+ n.id
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/recording_create.rabl b/web/app/views/api_users/recording_create.rabl
new file mode 100644
index 000000000..8d8826efe
--- /dev/null
+++ b/web/app/views/api_users/recording_create.rabl
@@ -0,0 +1,3 @@
+object @recording
+
+extends "api_users/recording_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/recording_index.rabl b/web/app/views/api_users/recording_index.rabl
new file mode 100644
index 000000000..d0bf502d6
--- /dev/null
+++ b/web/app/views/api_users/recording_index.rabl
@@ -0,0 +1,12 @@
+collection @recordings
+
+attributes :id, :description, :public, :favorite_count
+
+node :genres do |recording|
+ unless recording.genres.nil? || recording.genres.size == 0
+ child :genres => :genres do
+ attributes :id, :description
+ #partial('api_genres/index', :object => recording.genres)
+ end
+ end
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/recording_show.rabl b/web/app/views/api_users/recording_show.rabl
new file mode 100644
index 000000000..f0248d79c
--- /dev/null
+++ b/web/app/views/api_users/recording_show.rabl
@@ -0,0 +1,12 @@
+object @recording
+
+attributes :id, :description, :public, :favorite_count
+
+unless @recording.genres.nil? || @recording.genres.size == 0
+ child :genres => :genres do
+ attributes :id, :description
+ #partial('api_genres/index', :object => @band.genres)
+ end
+end
+
+#TODO: show the Users that have added this Recording as a Favorite ONLY IF the owning user has "Better Analytics service level"
\ No newline at end of file
diff --git a/web/app/views/api_users/recording_update.rabl b/web/app/views/api_users/recording_update.rabl
new file mode 100644
index 000000000..8d8826efe
--- /dev/null
+++ b/web/app/views/api_users/recording_update.rabl
@@ -0,0 +1,3 @@
+object @recording
+
+extends "api_users/recording_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/session_history_index.rabl b/web/app/views/api_users/session_history_index.rabl
new file mode 100644
index 000000000..4ba35abc2
--- /dev/null
+++ b/web/app/views/api_users/session_history_index.rabl
@@ -0,0 +1,7 @@
+object @session_history
+
+attributes :music_session_id, :user_id, :description, :band_id, :genres
+
+child :music_session_user_histories => :participants do
+ attributes :client_id, :user_id
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/session_user_history_index.rabl b/web/app/views/api_users/session_user_history_index.rabl
new file mode 100644
index 000000000..73b769c16
--- /dev/null
+++ b/web/app/views/api_users/session_user_history_index.rabl
@@ -0,0 +1,3 @@
+object @session_user_history
+
+attributes :music_session_id, :user_id, :client_id
\ No newline at end of file
diff --git a/web/app/views/api_users/show.rabl b/web/app/views/api_users/show.rabl
new file mode 100644
index 000000000..09a5bb4bf
--- /dev/null
+++ b/web/app/views/api_users/show.rabl
@@ -0,0 +1,31 @@
+object @user
+
+attributes :id, :first_name, :last_name, :name, :city, :state, :country, :location, :online, :photo_url, :musician, :gender, :birth_date, :internet_service_provider, :friend_count, :liker_count, :like_count, :band_like_count, :follower_count, :following_count, :band_following_count, :recording_count, :session_count
+
+# give back more info if the user being fetched is yourself
+if @user == current_user
+ attributes :email, :original_fpfile, :cropped_fpfile, :crop_selection, :session_settings
+end
+
+unless @user.friends.nil? || @user.friends.size == 0
+ child :friends => :friends do
+ attributes :id, :first_name, :last_name, :online
+ end
+end
+
+unless @user.bands.nil? || @user.bands.size == 0
+ child :band_musicians => :bands do
+ attributes :id, :name, :admin, :photo_url, :logo_url
+
+ child :genres => :genres do
+ attributes :id, :description
+ #partial('api_genres/index', :object => @user.bands.genres)
+ end
+ end
+end
+
+unless @user.instruments.nil? || @user.instruments.size == 0
+ child :musician_instruments => :instruments do
+ attributes :description, :proficiency_level, :priority, :instrument_id
+ end
+end
diff --git a/web/app/views/api_users/signup_confirm.rabl b/web/app/views/api_users/signup_confirm.rabl
new file mode 100644
index 000000000..e7df79f18
--- /dev/null
+++ b/web/app/views/api_users/signup_confirm.rabl
@@ -0,0 +1,3 @@
+object @user
+
+extends "api_users/show"
\ No newline at end of file
diff --git a/web/app/views/api_users/update.rabl b/web/app/views/api_users/update.rabl
new file mode 100644
index 000000000..e7df79f18
--- /dev/null
+++ b/web/app/views/api_users/update.rabl
@@ -0,0 +1,3 @@
+object @user
+
+extends "api_users/show"
\ No newline at end of file
diff --git a/web/app/views/artifacts/versioncheck.html.erb b/web/app/views/artifacts/versioncheck.html.erb
new file mode 100644
index 000000000..417e14a28
--- /dev/null
+++ b/web/app/views/artifacts/versioncheck.html.erb
@@ -0,0 +1,10 @@
+
+
+
+ <%= image_tag "logo.png" %>
+ New version available
+
+ Version <%= @artifact.version %> is now released on http://jamkazam.com
+ Please download directly from here.
+
diff --git a/web/app/views/clients/_account.html.erb b/web/app/views/clients/_account.html.erb
new file mode 100644
index 000000000..0bd1a893c
--- /dev/null
+++ b/web/app/views/clients/_account.html.erb
@@ -0,0 +1,111 @@
+
+
+
+
+
+ my account
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_account_audio_profile.html.erb b/web/app/views/clients/_account_audio_profile.html.erb
new file mode 100644
index 000000000..236bd2c8b
--- /dev/null
+++ b/web/app/views/clients/_account_audio_profile.html.erb
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+ my account
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_account_identity.html.erb b/web/app/views/clients/_account_identity.html.erb
new file mode 100644
index 000000000..f99233cce
--- /dev/null
+++ b/web/app/views/clients/_account_identity.html.erb
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+ my account
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_account_profile.html.erb b/web/app/views/clients/_account_profile.html.erb
new file mode 100644
index 000000000..bbd0e8be7
--- /dev/null
+++ b/web/app/views/clients/_account_profile.html.erb
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+ my account
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_account_profile_avatar.html.erb b/web/app/views/clients/_account_profile_avatar.html.erb
new file mode 100644
index 000000000..57ff42942
--- /dev/null
+++ b/web/app/views/clients/_account_profile_avatar.html.erb
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+ my account
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_addNewGear.html.erb b/web/app/views/clients/_addNewGear.html.erb
new file mode 100644
index 000000000..462040b57
--- /dev/null
+++ b/web/app/views/clients/_addNewGear.html.erb
@@ -0,0 +1,16 @@
+
+
+
+ <%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :class => 'content-icon' } %>
+ add new audio gear
+
+
+ To add a new audio device, you must exit your current session and test the device using the JamKazam automated test feature.
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_addTrack.html.erb b/web/app/views/clients/_addTrack.html.erb
new file mode 100644
index 000000000..596b2884a
--- /dev/null
+++ b/web/app/views/clients/_addTrack.html.erb
@@ -0,0 +1,63 @@
+
+
+
+ <%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :class => 'content-icon' } %>
+ add a track
+
+
+
+ Use arrow buttons to assign audio inputs to this new track, and choose what instrument you are playing on this track. Please note that you may only use one audio device for all audio inputs and outputs. If you don't see an audio device you think should be listed view this help topic to understand why.
+
+
+
+
+
+
+ Unused Inputs:
+
+
+
+
+
+
+
+
+ 
+
+
+ 
+
+
+
+
+
+
+ Track 2 Input:
+
+
+
+
+
+
+
+ Track 2 Instrument:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_bands.html.erb b/web/app/views/clients/_bands.html.erb
new file mode 100644
index 000000000..8505890b1
--- /dev/null
+++ b/web/app/views/clients/_bands.html.erb
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+ bands
+ <%= render "screen_navigation" %>
+
+ This feature not yet implemented
+
diff --git a/web/app/views/clients/_banner.html.erb b/web/app/views/clients/_banner.html.erb
new file mode 100644
index 000000000..9a932e3a9
--- /dev/null
+++ b/web/app/views/clients/_banner.html.erb
@@ -0,0 +1,18 @@
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_client_update.html.erb b/web/app/views/clients/_client_update.html.erb
new file mode 100644
index 000000000..7861217b0
--- /dev/null
+++ b/web/app/views/clients/_client_update.html.erb
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_configureTrack.html.erb b/web/app/views/clients/_configureTrack.html.erb
new file mode 100644
index 000000000..b05eddd01
--- /dev/null
+++ b/web/app/views/clients/_configureTrack.html.erb
@@ -0,0 +1,184 @@
+
+
+
+ <%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :class => 'content-icon' } %>
+ configure tracks
+
+
+
+ Music Audio
+ Voice Chat
+
+
+
+
+
+
+
+
+
+
+
+
+ Audio Device:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Unused Inputs:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Track 1 Input:
+
+
+
+
+
+
+ Track 1 Instrument:
+
+
+
+
+
+
+
+
+
+
+ Track 2 Input:
+
+
+
+
+
+
+ Track 2 Instrument:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Unused Outputs:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Session Audio Output:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CANCEL
+ UPDATE SETTINGS
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_createSession.html.erb b/web/app/views/clients/_createSession.html.erb
new file mode 100644
index 000000000..97336c799
--- /dev/null
+++ b/web/app/views/clients/_createSession.html.erb
@@ -0,0 +1,185 @@
+
+
+
+
+
+
+<%= render "friendSelector" %>
+<%= render "invitation" %>
+
+
+
+
+
+
diff --git a/web/app/views/clients/_error.html.erb b/web/app/views/clients/_error.html.erb
new file mode 100644
index 000000000..f1c131e73
--- /dev/null
+++ b/web/app/views/clients/_error.html.erb
@@ -0,0 +1,15 @@
+
+
+
+ <%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :class => 'content-icon' } %>
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_faders.html.erb b/web/app/views/clients/_faders.html.erb
new file mode 100644
index 000000000..fd4a33046
--- /dev/null
+++ b/web/app/views/clients/_faders.html.erb
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_feed.html.erb b/web/app/views/clients/_feed.html.erb
new file mode 100644
index 000000000..5f09c1720
--- /dev/null
+++ b/web/app/views/clients/_feed.html.erb
@@ -0,0 +1,12 @@
+
+
+
+
+
+ feed
+ <%= render "screen_navigation" %>
+
+ This feature not yet implemented
+
diff --git a/web/app/views/clients/_findSession.html.erb b/web/app/views/clients/_findSession.html.erb
new file mode 100644
index 000000000..47d32b786
--- /dev/null
+++ b/web/app/views/clients/_findSession.html.erb
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+ find a session
+
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_footer.html.erb b/web/app/views/clients/_footer.html.erb
new file mode 100644
index 000000000..adb4012d0
--- /dev/null
+++ b/web/app/views/clients/_footer.html.erb
@@ -0,0 +1,14 @@
+
+
+
diff --git a/web/app/views/clients/_friendSelector.html.erb b/web/app/views/clients/_friendSelector.html.erb
new file mode 100644
index 000000000..159f9a49f
--- /dev/null
+++ b/web/app/views/clients/_friendSelector.html.erb
@@ -0,0 +1,27 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_ftue.html.erb b/web/app/views/clients/_ftue.html.erb
new file mode 100644
index 000000000..3a1e5b1db
--- /dev/null
+++ b/web/app/views/clients/_ftue.html.erb
@@ -0,0 +1,276 @@
+
+
+
+ audio gear setup
+
+
+
+
+
+
+
+
+ Please identify which of the three types of audio gear below you
+ are going to use with the JamKazam service, and click one to
+ watch a video on how to navigate this initial setup and testing
+ process. After watching the video, click the 'NEXT' button to
+ get started. If you don't have your audio gear handy now, click
+ Cancel.
+
+
+
+ -
+ AUDIO DEVICE WITH PORTS FOR INSTRUMENT OR MIC INPUT JACKS
+ <%= image_tag "content/audio_capture_ftue.png", {:width => 243, :height => 70} %>
+
+ -
+ USB MICROPHONE
+ <%= image_tag "content/microphone_ftue.png", {:width => 70, :height => 113} %>
+
+ -
+ COMPUTER'S BUILT-IN MIC & SPEAKERS/HEADPHONES
+ <%= image_tag "content/computer_ftue.png", {:width => 118, :height => 105} %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_genreSelector.html.erb b/web/app/views/clients/_genreSelector.html.erb
new file mode 100644
index 000000000..d63a04089
--- /dev/null
+++ b/web/app/views/clients/_genreSelector.html.erb
@@ -0,0 +1,3 @@
+
diff --git a/web/app/views/clients/_header.html.erb b/web/app/views/clients/_header.html.erb
new file mode 100644
index 000000000..e61a45c46
--- /dev/null
+++ b/web/app/views/clients/_header.html.erb
@@ -0,0 +1,85 @@
+
+
+
diff --git a/web/app/views/clients/_home.html.erb b/web/app/views/clients/_home.html.erb
new file mode 100644
index 000000000..1ae839f61
--- /dev/null
+++ b/web/app/views/clients/_home.html.erb
@@ -0,0 +1,72 @@
+
+
+ <% if @nativeClient %>
+
+
+ create session
+
+
+
+
+ find session
+
+
+
+
+ profile
+
+
+
+
+ feed
+
+
+
+
+ account
+
+
+
+
+ <% else %>
+
+
+ feed
+
+
+
+
+ bands
+
+
+
+
+ musicians
+
+
+
+
+ profile
+
+
+
+
+ account
+
+
+
+
+ <% end %>
+
+
diff --git a/web/app/views/clients/_invitation.html.erb b/web/app/views/clients/_invitation.html.erb
new file mode 100644
index 000000000..5e80baacc
--- /dev/null
+++ b/web/app/views/clients/_invitation.html.erb
@@ -0,0 +1,28 @@
+
+
diff --git a/web/app/views/clients/_musicians.html.erb b/web/app/views/clients/_musicians.html.erb
new file mode 100644
index 000000000..4a6eac046
--- /dev/null
+++ b/web/app/views/clients/_musicians.html.erb
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+ musicians
+ <%= render "screen_navigation" %>
+
+ This feature not yet implemented
+
diff --git a/web/app/views/clients/_notify.html.erb b/web/app/views/clients/_notify.html.erb
new file mode 100644
index 000000000..d865136cf
--- /dev/null
+++ b/web/app/views/clients/_notify.html.erb
@@ -0,0 +1,15 @@
+
+
diff --git a/web/app/views/clients/_overlay_small.html.erb b/web/app/views/clients/_overlay_small.html.erb
new file mode 100644
index 000000000..199712e10
--- /dev/null
+++ b/web/app/views/clients/_overlay_small.html.erb
@@ -0,0 +1,18 @@
+
\ No newline at end of file
diff --git a/web/app/views/clients/_profile.html.erb b/web/app/views/clients/_profile.html.erb
new file mode 100644
index 000000000..70ec227df
--- /dev/null
+++ b/web/app/views/clients/_profile.html.erb
@@ -0,0 +1,126 @@
+
+
+
+
+
+ musician profile
+
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_screen_navigation.html.erb b/web/app/views/clients/_screen_navigation.html.erb
new file mode 100644
index 000000000..230e076a6
--- /dev/null
+++ b/web/app/views/clients/_screen_navigation.html.erb
@@ -0,0 +1,6 @@
+
+
diff --git a/web/app/views/clients/_searchResults.html.erb b/web/app/views/clients/_searchResults.html.erb
new file mode 100644
index 000000000..3d68961a1
--- /dev/null
+++ b/web/app/views/clients/_searchResults.html.erb
@@ -0,0 +1,51 @@
+
+
+
+
+ search results
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_session.html.erb b/web/app/views/clients/_session.html.erb
new file mode 100644
index 000000000..af1489925
--- /dev/null
+++ b/web/app/views/clients/_session.html.erb
@@ -0,0 +1,180 @@
+
+
+
+
+ session
+ <%= render "screen_navigation" %>
+
+
+
+
+
+ <%= image_tag "content/icon_resync.png", {:align => "texttop", :height => 14, :width => 12} %>
+ RESYNC
+
+
+ <%= image_tag "content/icon_settings_sm.png", {:align => "texttop", :height => 12, :width => 12} %>
+ SETTINGS
+
+
+ <%= image_tag "content/icon_share.png", {:align => "texttop", :height => 12, :width => 12} %>
+ SHARE
+
+
+
+
+ VOLUME:
+
+
+
+
+
+ MIX:
+ others
+
+ me
+
+
+
+ X LEAVE
+
+
+
+
+
+
+
+
+
+
+
+
+ my tracks
+
+
+
+
+
+
+
+
+
+
+ live tracks
+
+
+
+
+ No Live Tracks:
+ Invite Other Musicians to
+ Add Live Tracks
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%= render "configureTrack" %>
+<%= render "addTrack" %>
+<%= render "addNewGear" %>
+<%= render "error" %>
+<%= render "sessionSettings" %>
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_sessionList.html.erb b/web/app/views/clients/_sessionList.html.erb
new file mode 100644
index 000000000..451bb286c
--- /dev/null
+++ b/web/app/views/clients/_sessionList.html.erb
@@ -0,0 +1,14 @@
+<%= title %>
+
+
+
+ GENRE
+ DESCRIPTION
+ MUSICIANS
+ AUDIENCE
+ LATENCY
+ LISTEN
+ JOIN
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_sessionSettings.html.erb b/web/app/views/clients/_sessionSettings.html.erb
new file mode 100644
index 000000000..6dbc3d68e
--- /dev/null
+++ b/web/app/views/clients/_sessionSettings.html.erb
@@ -0,0 +1,75 @@
+
+
+
+
+
+ <%= image_tag "content/icon_settings_lg.png",
+ {:width => 18, :height => 18, :class => "content-icon"} %>
+ update session settings
+
+
+
+
+
+
+
+
+
+
' + f(s, this.data[i], v) + '
');
+ div.mouseover(mOver(i));
+ div.click(mClick(i));
+ this.container.append(div);
+ }
+ this.enabled = true;
+ this.container.show();
+ },
+
+ processResponse: function (text) {
+ var response;
+ try {
+ response = eval('(' + text + ')');
+ } catch (err) { return; }
+ if (!$.isArray(response.data)) { response.data = []; }
+ if (!this.options.noCache) {
+ this.cachedResponse[response.query] = response;
+ if (response.suggestions.length === 0) { this.badQueries.push(response.query); }
+ }
+ if (response.query === this.getQuery(this.currentValue)) {
+ this.suggestions = response.suggestions;
+ this.data = response.data;
+ this.suggest();
+ }
+ },
+
+ activate: function (index) {
+ var divs, activeItem;
+ divs = this.container.children();
+ // Clear previous selection:
+ if (this.selectedIndex !== -1 && divs.length > this.selectedIndex) {
+ $(divs.get(this.selectedIndex)).removeClass();
+ }
+ this.selectedIndex = index;
+ if (this.selectedIndex !== -1 && divs.length > this.selectedIndex) {
+ activeItem = divs.get(this.selectedIndex);
+ $(activeItem).addClass('selected');
+ }
+ return activeItem;
+ },
+
+ deactivate: function (div, index) {
+ div.className = '';
+ if (this.selectedIndex === index) { this.selectedIndex = -1; }
+ },
+
+ select: function (i) {
+ var selectedValue, f;
+ selectedValue = this.suggestions[i];
+ if (selectedValue) {
+ this.el.val(selectedValue);
+ if (this.options.autoSubmit) {
+ f = this.el.parents('form');
+ if (f.length > 0) { f.get(0).submit(); }
+ }
+ this.ignoreValueChange = true;
+ this.hide();
+ this.onSelect(i);
+ }
+ },
+
+ change: function (i) {
+ var selectedValue, fn, me;
+ me = this;
+ selectedValue = this.suggestions[i];
+ if (selectedValue) {
+ var s, d;
+ s = me.suggestions[i];
+ d = me.data[i];
+ me.el.val(me.getValue(s));
+ }
+ else {
+ s = '';
+ d = -1;
+ }
+
+ fn = me.options.onChange;
+ if ($.isFunction(fn)) { fn(s, d, me.el); }
+ },
+
+ moveUp: function () {
+ if (this.selectedIndex === -1) { return; }
+ if (this.selectedIndex === 0) {
+ this.container.children().get(0).className = '';
+ this.selectedIndex = -1;
+ this.el.val(this.currentValue);
+ return;
+ }
+ this.adjustScroll(this.selectedIndex - 1);
+ },
+
+ moveDown: function () {
+ if (this.selectedIndex === (this.suggestions.length - 1)) { return; }
+ this.adjustScroll(this.selectedIndex + 1);
+ },
+
+ adjustScroll: function (i) {
+ var activeItem, offsetTop, upperBound, lowerBound;
+ activeItem = this.activate(i);
+ offsetTop = activeItem.offsetTop;
+ upperBound = this.container.scrollTop();
+ lowerBound = upperBound + this.options.maxHeight - 25;
+ if (offsetTop < upperBound) {
+ this.container.scrollTop(offsetTop);
+ } else if (offsetTop > lowerBound) {
+ this.container.scrollTop(offsetTop - this.options.maxHeight + 25);
+ }
+ this.el.val(this.getValue(this.suggestions[i]));
+ },
+
+ onSelect: function (i) {
+ var me, fn, s, d;
+ me = this;
+ fn = me.options.onSelect;
+ s = me.suggestions[i];
+ d = me.data[i];
+ me.el.val(me.getValue(s));
+ if ($.isFunction(fn)) { fn(s, d, me.el); }
+ },
+
+ getValue: function (value) {
+ var del, currVal, arr, me;
+ me = this;
+ del = me.options.delimiter;
+ if (!del) { return value; }
+ currVal = me.currentValue;
+ arr = currVal.split(del);
+ if (arr.length === 1) { return value; }
+ return currVal.substr(0, currVal.length - arr[arr.length - 1].length) + value;
+ }
+
+ };
+
+} (jQuery));
diff --git a/web/app/assets/javascripts/jquery.formToObject.js b/web/app/assets/javascripts/jquery.formToObject.js
new file mode 100644
index 000000000..e50881c72
--- /dev/null
+++ b/web/app/assets/javascripts/jquery.formToObject.js
@@ -0,0 +1,110 @@
+(function($) {
+
+ /**
+ * Go through the current JQuery match, and build a
+ * javascript object based on the name attributes of
+ * child elements. This is intended to be used for forms
+ * with inputs: var jsObj = $('#myform').formToObject();
+ *
+ * Using dots in the name attributes will build nested
+ * structures into the resulting object:
+ *
+ *
+ * returns
+ * { foo: { bar:"x" } }
+ *
+ * The same name appearing twice will be returned as an array:
+ *
+ *
+ *
+ * returns
+ * { foo: ['a','b'] }
+ *
+ * Checkboxes and Radio inputs which are not checked will not
+ * appear at all, nor will any inputs which are disabled.
+ *
+ * Form fields which are optional can be omitted from the resulting
+ * object by providing a value for that field of "__OMIT__".
+ *
+ */
+ "use strict";
+
+ $.fn.formToObject = function() {
+ // don't want to depend on other libs. Provide our own size to check
+ // length of an associative array:
+ function _size(obj) {
+ var key, size=0;
+ for (key in obj) {
+ if (obj.hasOwnProperty(key)) size++;
+ }
+ return size;
+ }
+
+ var formObject = {},
+ a = this.serializeArray();
+
+ $.each(a, function() {
+ var data = $('[name="' + this.name + '"]').first().data(),
+ current = formObject,
+ childKey,
+ path = this.name.split('.'),
+ key = path.pop(),
+ val = (data && data.parseInt !== undefined && data.parseInt) ? parseInt(this.value, 10) : (
+ (this.value.toLowerCase() == 'true') ? true : (
+ (this.value.toLowerCase() == 'false') ? false : (
+ (this.value.toLowerCase() == 'null') ? null : (
+ (typeof this.value == 'undefined') ? '' : this.value
+ )
+ )
+ )
+ );
+
+ while (path.length > 0) {
+ // Shift the front element from path into childKey
+ childKey = path.shift();
+ if (!(childKey in current)) {
+ current[childKey] = {};
+ }
+ // Move down and start working with the child object
+ current = current[childKey];
+ }
+
+ // We're at the right level in hierarchy. Define property next.
+ if (key in current) { // already exists.
+ if ($.isPlainObject(current[key])) { // about to overwrite obj with property!
+ throw "Can't overwrite named structure";
+ }
+ if (!current[key].push) { // convert property to array
+ current[key] = [current[key]];
+ }
+ current[key].push(val);
+ } else { // doesn't exist. Just set.
+ if (val !== '__OMIT__') {
+ current[key] = val;
+ }
+ }
+ });
+
+ // Trim any keys who hold nothing but empty objects: {}
+
+ var removeEmptyObjects = function(o) {
+ var k;
+ var trimlist = [];
+ for (k in o) {
+ if ($.isPlainObject(o[k])) { // recurse: deep first
+ removeEmptyObjects(o[k]);
+ }
+ if ($.isPlainObject(o[k]) && _size(o[k]) === 0) {
+ trimlist.push(k);
+ }
+ }
+ $.each(trimlist, function() {
+ delete o[this];
+ });
+ };
+
+ removeEmptyObjects(formObject);
+ return (_size(formObject) === 0) ? null : formObject;
+ };
+
+})(jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/jquery.hoverIntent.js b/web/app/assets/javascripts/jquery.hoverIntent.js
new file mode 100644
index 000000000..3dcff261f
--- /dev/null
+++ b/web/app/assets/javascripts/jquery.hoverIntent.js
@@ -0,0 +1,106 @@
+/**
+* hoverIntent is similar to jQuery's built-in "hover" function except that
+* instead of firing the onMouseOver event immediately, hoverIntent checks
+* to see if the user's mouse has slowed down (beneath the sensitivity
+* threshold) before firing the onMouseOver event.
+*
+* hoverIntent r6 // 2011.02.26 // jQuery 1.5.1+
+* RouteMap holds an internal table of route patterns and method names in addition to some + * adding/removing/utility methods and a handler for request routing.
+ *It does not have any dependencies and is written in "plain old" JS, but it does require JS 1.8 array methods, so + * if the environment it will run in does not have those, the reference implementations from + * Mozilla should be + * supplied external to this library.
+ *It is designed to be used in both a browser setting and a server-side context (for example in node.js).
+ * LICENSING INFORMATION: + *+ * @see OpenGamma + * @see Apache License, Version 2.0 + * @see Mozilla Developer + * Network + * @name RouteMap + * @namespace RouteMap + * @author Afshin Darian + * @static + * @throws {Error} if JS 1.8 Array.prototype methods don't exist + */ +(function (pub, namespace) { // defaults to exports, uses window if exports does not exist + (function (arr, url) { // plain old JS, but needs some JS 1.8 array methods + if (!arr.every || !arr.filter || !arr.indexOf || !arr.map || !arr.reduce || !arr.some || !arr.forEach) + throw new Error('See ' + url + ' for reference versions of Array.prototype methods available in JS 1.8'); + })([], 'https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/'); + var routes /* internal reference to RouteMap */, active_routes = {}, added_routes = {}, flat_pages = [], + last = 0, current = 0, encode = encodeURIComponent, decode = decodeURIComponent, has = 'hasOwnProperty', + EQ = '=' /* equal string */, SL = '/' /* slash string */, PR = '#' /* default prefix string */, + token_exp = /\*|:|\?/, star_exp = /(^([^\*:\?]+):\*)|(^\*$)/, scalar_exp = /^:([^\*:\?]+)(\??)$/, + keyval_exp = /^([^\*:\?]+):(\??)$/, slash_exp = new RegExp('([^' + SL + '])$'), + context = typeof window !== 'undefined' ? window : {}, // where listeners reside, routes.context() overwrites it + /** @ignore */ + invalid_str = function (str) {return typeof str !== 'string' || !str.length;}, + /** @ignore */ + fingerprint = function (rule) {return [rule.method, rule.route].join('|');}, + /** + * merges one or more objects into a new object by value (nothing is a reference), useful for cloning + * @name RouteMap#merge + * @inner + * @function + * @type Object + * @returns {Object} a merged object + * @throws {TypeError} if one of the arguments is not a mergeable object (i.e. a primitive, null or array) + */ + merge = function () { + var self = 'merge', to_string = Object.prototype.toString, clone = function (obj) { + return typeof obj !== 'object' || obj === null ? obj // primitives + : to_string.call(obj) === '[object Array]' ? obj.map(clone) // arrays + : merge(obj); // objects + }; + return Array.prototype.reduce.call(arguments, function (acc, obj) { + if (!obj || typeof obj !== 'object' || to_string.call(obj) === '[object Array]') + throw new TypeError(self + ': ' + to_string.call(obj) + ' is not mergeable'); + for (var key in obj) if (obj[has](key)) acc[key] = clone(obj[key]); + return acc; + }, {}); + }, + /** + * parses a path and returns a list of objects that contain argument dictionaries, methods, and raw hash values + * @name RouteMap#parse + * @inner + * @function + * @param {String} path + * @type Array + * @returns {Array} a list of parsed objects in descending order of matched hash length + * @throws {TypeError} if the method specified by a rule specification does not exist during parse time + */ + parse = function (path) { + // go with the first matching page (longest) or any pages with * rules + var self = 'parse', pages = flat_pages.filter(function (val) { // add slash to paths so all vals match + return path.replace(slash_exp, '$1' + SL).indexOf(val) === 0; + }) + .filter(function (page, index) { + return !index || active_routes[page].some(function (val) {return !!val.rules.star;}); + }); + return !pages.length ? [] : pages.reduce(function (acc, page) { // flatten parsed rules for all pages + var current_page = active_routes[page].map(function (rule_set) { + var args = {}, scalars = rule_set.rules.scalars, keyvals = rule_set.rules.keyvals, method, + // populate the current request object as a collection of keys/values and scalars + request = path.replace(page, '').split(SL).reduce(function (acc, val) { + var split = val.split(EQ), key = split[0], value = split.slice(1).join(EQ); + return !val.length ? acc // discard empty values, separate rest into scalars or keyvals + : (value ? acc.keyvals[key] = value : acc.scalars.push(val)), acc; + }, {keyvals: {}, scalars: []}), star, keyval, + keyval_keys = keyvals.reduce(function (acc, val) {return (acc[val.name] = 0) || acc;}, {}), + required_scalars_length = scalars.filter(function (val) {return val.required;}).length, + required_keyvals = keyvals.filter(function (val) {return val.required;}) + .every(function (val) {return request.keyvals[has](val.name);}); + // not enough parameters are supplied in the request for this rule + if (required_scalars_length > request.scalars.length || !required_keyvals) return 0; + if (!rule_set.rules.star) { // too many params are only a problem if the rule isn't a wildcard + if (request.scalars.length > scalars.length) return 0; // if too many scalars are supplied + for (keyval in request.keyvals) // if too many keyvals are supplied + if (request.keyvals[has](keyval) && !keyval_keys[has](keyval)) return 0; + } + request.scalars.slice(0, scalars.length) // populate args scalars + .forEach(function (scalar, index) {args[scalars[index].name] = decode(scalar);}); + keyvals.forEach(function (keyval) { // populate args keyvals + if (request.keyvals[keyval.name]) args[keyval.name] = decode(request.keyvals[keyval.name]); + delete request.keyvals[keyval.name]; // remove so that * can be constructed + }); + if (rule_set.rules.star) { // all unused scalars and keyvals go into the * argument (still encoded) + star = request.scalars.slice(scalars.length, request.scalars.length); + for (keyval in request.keyvals) if (request.keyvals[has](keyval)) + star.push([keyval, request.keyvals[keyval]].join(EQ)); + args[rule_set.rules.star] = star.join(SL); + } + try { // make sure the rule's method actually exists and can be accessed + method = rule_set.method.split('.').reduce(function (acc, val) {return acc[val];}, context); + if (typeof method !== 'function') throw new Error; + } catch (error) { + throw new TypeError(self + ': ' + rule_set.method + ' is not a function in current context'); + } + return {page: page, hash: routes.hash({route: rule_set.raw}, args), method: method, args: args}; + }); + return acc.concat(current_page).filter(Boolean); // only return the parsed rules that matched + }, []).sort(function (a, b) {return b.hash.length - a.hash.length;}); // order in descending hash length + }, + /** + * builds the internal representation of a rule based on the route definition + * @inner + * @name RouteMap#compile + * @function + * @param {String} route + * @throws {SyntaxError} if any portion of a rule definition follows a+ * Copyright 2011 OpenGamma Inc. and the OpenGamma group of companies + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *
* directive
+ * @throws {SyntaxError} if a required scalar follows an optional scalar
+ * @throws {SyntaxError} if a rule cannot be parsed
+ * @type {Object}
+ * @returns {Object} a compiled object, for example, the rule '/foo/:id/type:?/rest:*' would return
+ * an object of the form: {
+ * page:'/foo',
+ * rules:{
+ * keyvals:[{name: 'type', required: false}],
+ * scalars:[{name: 'id', required: true}],
+ * star:'rest' // false if not defined
+ * }
+ * }
+ * @see RouteMap.add
+ * @see RouteMap.hash
+ * @see RouteMap.remove
+ */
+ compile = (function (memo) { // compile is slow so cache compiled objects in a memo
+ return function (orig) {
+ var self = 'compile', compiled, index, names = {},
+ route = orig[0] === SL ? orig : ~(index = orig.indexOf(SL)) ? orig.slice(index) : 0,
+ /** @ignore */
+ valid_name = function (name) {
+ if (names[has](name) || (names[name] = 0))
+ throw new SyntaxError(self + ': "' + name + '" is repeated in: ' + orig);
+ };
+ if (!route) throw new SyntaxError(self + ': the route ' + orig + ' was not understood');
+ if (memo[route]) return memo[route];
+ compiled = route.split(SL).reduce(function (acc, val) {
+ var rules = acc.rules, scalars = rules.scalars, keyvals = rules.keyvals;
+ if (rules.star) throw new SyntaxError(self + ': no rules can follow a * directive in: ' + orig);
+ // construct the name of the page
+ if (!~val.search(token_exp) && !scalars.length && !keyvals.length) return acc.page.push(val), acc;
+ // construct the parameters
+ if (val.match(star_exp)) return (rules.star = RegExp.$2 || RegExp.$3), valid_name(rules.star), acc;
+ if (val.match(scalar_exp)) {
+ if (acc.has_optional_scalar) // no scalars can follow optional scalars
+ throw new SyntaxError(self + ': "' + val + '" cannot follow an optional rule in: ' + orig);
+ if (!!RegExp.$2) acc.has_optional_scalar = val;
+ return scalars.push({name: RegExp.$1, required: !RegExp.$2}), valid_name(RegExp.$1), acc;
+ }
+ if (val.match(keyval_exp))
+ return keyvals.push({name: RegExp.$1, required: !RegExp.$2}), valid_name(RegExp.$1), acc;
+ throw new SyntaxError(self + ': the rule "' + val + '" was not understood in: ' + orig);
+ }, {page: [], rules: {scalars: [], keyvals: [], star: false}, has_optional_scalar: ''});
+ delete compiled.has_optional_scalar; // this is just a temporary value and should not be exposed
+ compiled.page = compiled.page.join(SL).replace(new RegExp(SL + '$'), '') || SL;
+ return memo[route] = compiled;
+ };
+ })({});
+ pub[namespace] = (routes) = { // parens around routes to satisfy JSDoc's caprice
+ /**
+ * adds a rule to the internal table of routes and methods
+ * @name RouteMap.add
+ * @function
+ * @type undefined
+ * @param {Object} rule rule specification
+ * @param {String} rule.route route pattern definition; there are three types of pattern arguments: scalars,
+ * keyvals, and stars; scalars are individual values in a URL (all URL values are separate by the
+ * '/' character), keyvals are named values, e.g. 'foo=bar', and star values are wildcards; so for
+ * example, the following pattern represents all the possible options:
+ * '/foo/:id/:sub?/attr:/subattr:?/rest:*'
the ? means that argument is
+ * optional, the star rule is named rest but it could have just simply been left as *,
+ * which means the resultant dictionary would have put the wildcard remainder into args['*']
+ * instead of args.rest; so the following URL would match the pattern above:
+ * /foo/23/45/attr=something/subattr=something_else
+ * when its method is called, it will receive this arguments dictionary:
+ * {
+ * id:'23',
+ * subid:'45',
+ * attr:'something',
+ * subattr:'something_else',
+ * rest:''
+ * }
+ * add uses {@link #compile} and does not catch any errors thrown by that function
+ * @param {String} rule.method listener method for this route
+ * @throws {TypeError} if rule.route or rule.method are not strings or empty strings
+ * @throws {Error} if rule has already been added
+ * @see RouteMap.post_add
+ */
+ add: function (rule) {
+ var self = 'add', method = rule.method, route = rule.route, compiled, id = fingerprint(rule);
+ if ([route, method].some(invalid_str))
+ throw new TypeError(self + ': rule.route and rule.method must both be non-empty strings');
+ if (added_routes[id]) throw new Error(self + ': ' + route + ' to ' + method + ' already exists');
+ compiled = compile(route);
+ added_routes[id] = true;
+ if (!active_routes[compiled.page] && (active_routes[compiled.page] = [])) // add route to list and sort
+ flat_pages = flat_pages.concat(compiled.page).sort(function (a, b) {return b.length - a.length;});
+ active_routes[compiled.page].push(routes.post_add({method: method, rules: compiled.rules, raw: route}));
+ },
+ /**
+ * overrides the context where listener methods are sought, the default scope is window
+ * (in a browser setting), returns the current context, if no scope object is passed in, just
+ * returns current context without setting context
+ * @name RouteMap.context
+ * @function
+ * @type {Object}
+ * @returns {Object} the current context within which RouteMap searches for handlers
+ * @param {Object} scope the scope within which methods for mapped routes will be looked for
+ */
+ context: function (scope) {return context = typeof scope === 'object' ? scope : context;},
+ /**
+ * returns the parsed (see {@link #parse}) currently accessed route; after listeners have finished
+ * firing, current and last are the same
+ * @name RouteMap.current
+ * @function
+ * @type Object
+ * @returns {Object} the current parsed URL object
+ * @see RouteMap.last
+ */
+ current: function () {return current ? merge(current) : null;},
+ /**
+ * this function is fired when no rule is matched by a URL, by default it does nothing, but it could be set up
+ * to handle things like 404 responses on the server-side or bad hash fragments in the browser
+ * @name RouteMap.default_handler
+ * @function
+ * @type undefined
+ */
+ default_handler: function () {},
+ /**
+ * URL grabber function, defaults to checking the URL fragment (hash); this function should be
+ * overwritten in a server-side environment; this method is called by {@link RouteMap.handler}; without
+ * window.location.hash it will return '/'
+ * @name RouteMap.get
+ * @function
+ * @returns {String} by default, this returns a subset of the URL hash (everything after the first
+ * '/' character ... if nothing follows a slash, it returns '/'); if overwritten, it
+ * must be a function that returns URL path strings (beginning with '/') to match added rules
+ * @type String
+ */
+ get: function () {
+ if (typeof window === 'undefined') return SL;
+ var hash = window.location.hash, index = hash.indexOf(SL);
+ return ~index ? hash.slice(index) : SL;
+ },
+ /**
+ * in a browser setting, it changes window.location.hash, in other settings, it should be
+ * overwritten to do something useful (if necessary); it will not throw an error if window does
+ * not exist
+ * @name RouteMap.go
+ * @function
+ * @type undefined
+ * @param {String} hash the hash fragment to go to
+ */
+ go: function (hash) {
+ if (typeof window !== 'undefined') window.location.hash = (hash.indexOf(PR) === 0 ? '' : PR) + hash;
+ },
+ /**
+ * main handler function for routing, this should be bound to hashchange events in the browser, or
+ * (in conjunction with updating {@link RouteMap.get}) used with the HTML5 history API, it detects
+ * all the matching route patterns, parses the URL parameters and fires their methods with the arguments from
+ * the parsed URL; the timing of {@link RouteMap.current} and {@link RouteMap.last} being set is as follows
+ * (pseudo-code):
+ *
+ * path: get_route // {@link RouteMap.get}
+ * parsed: parse path // {@link #parse}
+ * current: longest parsed // {@link RouteMap.current}
+ * parsed: pre_dispatch parsed // {@link RouteMap.pre_dispatch}
+ * current: longest parsed // reset current
+ * fire matched rules in parsed
+ * last: current // {@link RouteMap.last}
+ *
+ * RouteMap.handler calls {@link #parse} and does not catch any errors that function throws
+ * @name RouteMap.handler
+ * @function
+ * @type undefined
+ * @see RouteMap.pre_dispatch
+ */
+ handler: function () {
+ var url = routes.get(), parsed = parse(url), args = Array.prototype.slice.call(arguments);
+ if (!parsed.length) return routes.default_handler.apply(null, [url].concat(args));
+ current = parsed[0]; // set current to the longest hash before pre_dispatch touches it
+ parsed = routes.pre_dispatch(parsed); // pre_dispatch might change the contents of parsed
+ current = parsed[0]; // set current to the longest hash again after pre_dispatch
+ parsed.forEach(function (val) {val.method.apply(null, [val.args].concat(args));}); // fire requested methods
+ last = parsed[0];
+ },
+ /**
+ * returns a URL fragment by applying parameters to a rule; uses {@link #compile} and does not catch any errors
+ * thrown by that function
+ * @name RouteMap.hash
+ * @function
+ * @type String
+ * @param {Object} rule the rule specification; it typically looks like:
+ * {route:'/foo', method:'bar'}
but only route is strictly necessary
+ * @param {Object} params a dictionary of argument key/value pairs required by the rule
+ * @returns {String} URL fragment resulting from applying arguments to rule pattern
+ * @throws {TypeError} if a required parameter is not present
+ */
+ hash: function (rule, params) {
+ var self = 'hash', hash, compiled, params = params || {};
+ if (invalid_str(rule.route)) throw new TypeError(self + ': rule.route must be a non-empty string');
+ compiled = compile(rule.route);
+ hash = compiled.page + (compiled.page === SL ? '' : SL) + // 1. start with page, then add params
+ compiled.rules.scalars.map(function (val) { // 2. add scalar values next
+ var value = encode(params[val.name]), bad_param = params[val.name] === void 0 || invalid_str(value);
+ if (val.required && bad_param)
+ throw new TypeError(self + ': params.' + val.name + ' is undefined, route: ' + rule.route);
+ return bad_param ? 0 : value;
+ })
+ .concat(compiled.rules.keyvals.map(function (val) { // 3. then concat keyval values
+ var value = encode(params[val.name]), bad_param = params[val.name] === void 0 || invalid_str(value);
+ if (val.required && bad_param)
+ throw new TypeError(self + ': params.' + val.name + ' is undefined, route: ' + rule.route);
+ return bad_param ? 0 : val.name + EQ + value;
+ }))
+ .filter(Boolean).join(SL); // remove empty (0) values
+ if (compiled.rules.star && params[compiled.rules.star]) // 4. add star value if it exists
+ hash += (hash[hash.length - 1] === SL ? '' : SL) + params[compiled.rules.star];
+ return hash;
+ },
+ /**
+ * returns the parsed (see {@link #parse}) last accessed route; when route listeners are being called,
+ * last is the previously accessed route, after listeners have finished firing, the current parsed
+ * route replaces last's value
+ * @name RouteMap.last
+ * @function
+ * @type Object
+ * @returns {Object} the last parsed URL object, will be null on first load
+ * @see RouteMap.current
+ */
+ last: function () {return last ? merge(last) : null;},
+ /**
+ * parses a URL fragment into a data structure only if there is a route whose pattern matches the fragment
+ * @name RouteMap.parse
+ * @function
+ * @type Object
+ * @returns {Object} of the form: {page:'/foo', args:{bar:'some_value'}}
+ * only if a rule with the route: '/foo/:bar' has already been added
+ * @throws {TypeError} if hash is not a string, is empty, or does not contain a '/' character
+ * @throws {SyntaxError} if hash cannot be parsed by {@link #parse}
+ */
+ parse: function (hash) {
+ var self = 'parse', parsed, index = hash.indexOf(SL);
+ hash = ~index ? hash.slice(index) : '';
+ if (invalid_str(hash)) throw new TypeError(self + ': hash must be a string with a ' + SL + ' character');
+ if (!(parsed = parse(hash)).length) throw new SyntaxError(self + ': ' + hash + ' cannot be parsed');
+ return {page: parsed[0].page, args: parsed[0].args};
+ },
+ /**
+ * this function is called by {@link RouteMap.add}, it receives a compiled rule object, e.g. for the rule:
+ * {route:'/foo/:id/:sub?/attr:/subattr:?/rest:*', method:'console.log'}
+ * post_add would receive the following object:
+ * {
+ * method:'console.log',
+ * rules:{
+ * scalars:[{name:'id',required:true},{name:'sub',required:false}],
+ * keyvals:[{name:'attr',required:true},{name:'subattr',required:false}],
+ * star:'rest'
+ * },
+ * raw:'/foo/:id/:sub?/attr:/subattr:?/rest:*'
+ * }
+ * and it is expected to pass back an object of the same format; it can be overwritten to post-process added
+ * rules e.g. to add extra default application-wide parameters; by default, it simply returns what was passed
+ * into it
+ * @name RouteMap.post_add
+ * @function
+ * @type Object
+ * @returns {Object} the default function returns the exact object it received; a custom function needs to
+ * an object that is of the same form (but could possibly have more or fewer parameters, etc.)
+ * @param {Object} compiled the compiled rule
+ */
+ post_add: function (compiled) {return compiled;},
+ /**
+ * like {@link RouteMap.post_add} this function can be overwritten to add application-specific code into
+ * route mapping, it is called before a route begins being dispatched to all matching rules; it receives the
+ * list of matching parsed route objects ({@link #parse}) and is expected to return it; one application of this
+ * function might be to set application-wide variables like debug flags
+ * @name RouteMap.pre_dispatch
+ * @function
+ * @type Array
+ * @returns {Array} a list of the same form as the one it receives
+ * @param {Array} parsed the parsed request
+ */
+ pre_dispatch: function (parsed) {return parsed;},
+ /**
+ * if a string is passed in, it overwrites the prefix that is removed from each URL before parsing; primarily
+ * used for hashbang (#!); either way, it returns the current prefix
+ * @name RouteMap.prefix
+ * @function
+ * @type undefined
+ * @param {String} prefix (optional) the prefix string
+ */
+ prefix: function (prefix) {return PR = typeof prefix !== 'undefined' ? prefix + '' : PR;},
+ /**
+ * counterpart to {@link RouteMap.add}, removes a rule specification; * remove uses
+ * {@link #compile} and does not catch any errors thrown by that function
+ * @name RouteMap.remove
+ * @function
+ * @type undefined
+ * @param {Object} rule the rule specification that was used in {@link RouteMap.add}
+ * @throws {TypeError} if rule.route or rule.method are not strings or empty strings
+ */
+ remove: function (rule) {
+ var self = 'remove', method = rule.method, route = rule.route, compiled, id = fingerprint(rule), index;
+ if ([route, method].some(invalid_str))
+ throw new TypeError(self + ': rule.route and rule.method must both be non-empty strings');
+ if (!added_routes[id]) return;
+ compiled = compile(route);
+ delete added_routes[id];
+ active_routes[compiled.page] = active_routes[compiled.page]
+ .filter(function (rule) {return (rule.raw !== route) || (rule.method !== method);});
+ if (!active_routes[compiled.page].length && (delete active_routes[compiled.page])) // delete active route
+ if (~(index = flat_pages.indexOf(compiled.page))) flat_pages.splice(index, 1); // then flat page
+ }
+ };
+})(typeof exports === 'undefined' ? window : exports, 'RouteMap');
\ No newline at end of file
diff --git a/web/app/assets/javascripts/search.js b/web/app/assets/javascripts/search.js
new file mode 100644
index 000000000..04e35767b
--- /dev/null
+++ b/web/app/assets/javascripts/search.js
@@ -0,0 +1,138 @@
+(function(context,$) {
+
+ // NOTE - not currently used. Was hooked up in header before
+ // Jeff's new mockups moved search to sidebar and made search results
+ // a full-blown screen. This should probably be removed, along with
+ // any HTML that accompanies it. Tests too.
+
+ "use strict";
+
+ context.JK = context.JK || {};
+ context.JK.Searcher = function(app) {
+ var logger = context.JK.logger;
+
+ var searchSectionTemplate;
+ var searchItemTemplate;
+ var noResultsTemplate;
+ var usernames = ['Brian', 'David'];
+ var userids = ['1', '2'];
+
+ function events() {
+ $('.searchtextinput').keyup(handleKeyup);
+ $('.searchtextinput').focus(function(evt) {
+ var searchVal = $(this).val();
+ search(searchVal);
+ });
+ $('.searchtextinput').blur(hideSearchResults);
+ }
+
+ function templates() {
+ searchSectionTemplate = $('#template-search-section').html();
+ searchItemTemplate = $('#template-search-item').html();
+ noResultsTemplate = $('#template-search-noresults').html();
+ }
+
+ function hideSearchResults() {
+ $('.searchresults').hide();
+ }
+
+ function showSearchResults() {
+ $('.searchresults').show();
+ }
+
+ function handleKeyup(evt) {
+ if (evt.which === 27) {
+ return hideSearchResults();
+ }
+ var searchVal = $(evt.currentTarget).val();
+ search(searchVal);
+ }
+
+ function search(query) {
+ if (query.length < 2) {
+ return;
+ }
+ $.ajax({
+ type: "GET",
+ url: "/api/search?query=" + query,
+ success: searchResponse,
+ error: app.ajaxError
+ });
+ }
+
+ function searchResponse(response) {
+ ensureResultsDiv();
+ updateResultsDiv(response);
+ positionResultsDiv();
+ showSearchResults();
+ }
+
+ function ensureResultsDiv() {
+ if ($('.searchresults').length === 0) {
+ var $searchresults = $('');
+ $searchresults.addClass('searchresults');
+ $searchresults.css({position:'absolute'});
+ $('body').append($searchresults);
+ }
+ }
+
+ function updateResultsDiv(searchResults) {
+ var sections = ['musicians', 'bands', 'fans', 'recordings'];
+ var fullHtml = '';
+ $.each(sections, function() {
+ fullHtml += getSectionHtml(this, searchResults);
+ });
+ if (fullHtml === '') {
+ fullHtml += getNoResultsMessage();
+ }
+ $('.searchresults').html(fullHtml);
+ }
+
+ function getNoResultsMessage() {
+ // No replacement needed at the moment.
+ return noResultsTemplate;
+ }
+
+ function getSectionHtml(section, searchResults) {
+ if (section in searchResults && searchResults[section].length === 0) {
+ return '';
+ }
+ var items = '';
+ $.each(searchResults[section], function() {
+ items += getItemHtml(this);
+ });
+ var html = context.JK.fillTemplate(
+ searchSectionTemplate,
+ { section: section, items: items });
+ return html;
+ }
+
+ function getItemHtml(item) {
+ var replacements = {
+ id: item.id,
+ name: item.first_name + " " + item.last_name,
+ image: item.photo_url,
+ subtext: item.location
+ };
+ return context.JK.fillTemplate(
+ searchItemTemplate, replacements);
+ }
+
+ function positionResultsDiv() {
+ var bodyOffset = $('body').offset();
+ var inputOffset = $('.searchtextinput').offset();
+ var inputHeight = $('.searchtextinput').outerHeight();
+ var resultsTop = bodyOffset.top + inputOffset.top + inputHeight;
+ var resultsLeft = bodyOffset.left + inputOffset.left;
+ $('.searchresults').css({
+ top: resultsTop + 'px',
+ left: resultsLeft + 'px'});
+ }
+
+ this.initialize = function() {
+ events();
+ templates();
+ };
+ };
+
+ })(window,jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/searchResults.js b/web/app/assets/javascripts/searchResults.js
new file mode 100644
index 000000000..c67a72833
--- /dev/null
+++ b/web/app/assets/javascripts/searchResults.js
@@ -0,0 +1,131 @@
+(function(context,$) {
+
+ "use strict";
+
+ context.JK = context.JK || {};
+ context.JK.SearchResultScreen = function(app) {
+ var logger = context.JK.logger;
+
+ var instrument_logo_map = context.JK.getInstrumentIconMap24();
+
+ function beforeShow(data) {
+ var query = data.query;
+ }
+
+ function afterShow(data) {
+ }
+
+ function search(evt) {
+ evt.stopPropagation();
+
+ $('#search-results').empty();
+ var query = $('#search-input').val();
+ context.location = '#/searchResults/:' + query;
+
+ logger.debug('query=' + query);
+ if (query !== '') {
+ $('#query').html(query + "\"");
+ context.JK.search(query, app, onSearchSuccess);
+ }
+
+ else {
+ $('#result-count').html('');
+ $('#query').html('');
+ }
+
+ return false;
+ }
+
+ function onSearchSuccess(response) {
+
+ // TODO: generalize this for each search result type (band, musician, recordings, et. al.)
+ $.each(response.musicians, function(index, val) {
+ // fill in template for Connect pre-click
+ var template = $('#template-search-result').html();
+ var searchResultHtml = context.JK.fillTemplate(template, {
+ userId: val.id,
+ avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
+ profile_url: "/#/profile/" + val.id,
+ userName: val.name,
+ location: val.location,
+ instruments: getInstrumentHtml(val.instruments)
+ });
+
+ $('#search-results').append(searchResultHtml);
+
+ // fill in template for Connect post-click
+ template = $('#template-invitation-sent').html();
+ var invitationSentHtml = context.JK.fillTemplate(template, {
+ userId: val.id,
+ first_name: val.first_name,
+ profile_url: "/#/profile/" + val.id
+ });
+
+ $('#search-results').append(invitationSentHtml);
+
+ // initialize visibility of the divs
+ $('div[user-id=' + val.id + '].search-connected').hide();
+ $('div[user-id=' + val.id + '].search-result').show();
+
+ // wire up button click handler if search result is not a friend or the current user
+ if (!val.is_friend && val.id !== context.JK.currentUserId) {
+ $('div[user-id=' + val.id + ']').find('#btn-connect-friend').click(sendFriendRequest);
+ }
+ else {
+ $('div[user-id=' + val.id + ']').find('#btn-connect-friend').hide();
+ }
+ });
+
+ var resultCount = response.musicians.length;
+ $('#result-count').html(resultCount);
+
+ if (resultCount === 1) {
+ $('#result-count').append(" Result for \"");
+ }
+ else {
+ $('#result-count').append(" Results for \"");
+ }
+ }
+
+ function friendRequestCallback(userId) {
+ // toggle the pre-click and post-click divs
+ $('div[user-id=' + userId + '].search-connected').show();
+ $('div[user-id=' + userId + '].search-result').hide();
+ }
+
+ function sendFriendRequest(evt) {
+ evt.stopPropagation();
+ var userId = $(this).parent().attr('user-id');
+ context.JK.sendFriendRequest(app, userId, friendRequestCallback);
+ }
+
+ function getInstrumentHtml(instruments) {
+ var instrumentLogoHtml = '';
+ if (instruments !== undefined) {
+ for (var i=0; i < instruments.length; i++) {
+ var inst = '../assets/content/icon_instrument_default24.png';
+ if (instruments[i].instrument_id in instrument_logo_map) {
+ inst = instrument_logo_map[instruments[i].instrument_id];
+ instrumentLogoHtml += ' ';
+ }
+ }
+ }
+ return instrumentLogoHtml;
+ }
+
+ function events() {
+ $('#searchForm').submit(search);
+ }
+
+ this.initialize = function() {
+ var screenBindings = {
+ 'beforeShow': beforeShow,
+ 'afterShow': afterShow
+ };
+ app.bindScreen('searchResults', screenBindings);
+ events();
+ };
+
+ };
+
+})(window,jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js
new file mode 100644
index 000000000..04db7f786
--- /dev/null
+++ b/web/app/assets/javascripts/session.js
@@ -0,0 +1,833 @@
+(function(context,$) {
+
+ "use strict";
+
+ context.JK = context.JK || {};
+ context.JK.SessionScreen = function(app) {
+ var logger = context.JK.logger;
+ var sessionModel = null;
+ var sessionId;
+ var tracks = {};
+ var myTracks = [];
+ var mixers = [];
+
+ var configureTrackDialog;
+ var addTrackDialog;
+ var addNewGearDialog;
+
+ var screenActive = false;
+
+ var currentMixerRangeMin = null;
+ var currentMixerRangeMax = null;
+
+ var lookingForMixersCount = 0;
+ var lookingForMixersTimer = null;
+ var lookingForMixers = {};
+
+ var RENDER_SESSION_DELAY = 750; // When I need to render a session, I have to wait a bit for the mixers to be there.
+
+ var defaultParticipant = {
+ tracks: [{
+ instrument_id: "unknown"
+ }],
+ user: {
+ first_name: 'Unknown',
+ last_name: 'User',
+ photo_url: null
+ }
+ };
+
+ // Be sure to copy/extend these instead of modifying in place
+ var trackVuOpts = {
+ vuType: "vertical",
+ lightCount: 13,
+ lightWidth: 3,
+ lightHeight: 17
+ };
+ // Must add faderId key to this
+ var trackFaderOpts = {
+ faderType: "vertical",
+ height: 83
+ };
+
+ // Recreate ChannelGroupIDs ENUM from C++
+ var ChannelGroupIds = {
+ "MasterGroup": 0,
+ "MonitorGroup": 1,
+ "AudioInputMusicGroup": 2,
+ "AudioInputChatGroup": 3,
+ "MediaTrackGroup": 4,
+ "StreamOutMusicGroup": 5,
+ "StreamOutChatGroup": 6,
+ "UserMusicInputGroup": 7,
+ "UserChatInputGroup": 8,
+ "PeerAudioInputMusicGroup": 9,
+ "PeerMediaTrackGroup": 10
+ };
+
+ // recreate eThresholdType enum from MixerDialog.h
+ var alert_type = {
+ 0: {"title": "", "message": ""}, // NO_EVENT,
+ 1: {"title": "", "message": ""}, // BACKEND_ERROR: generic error - eg P2P message error
+ 2: {"title": "", "message": ""}, // BACKEND_MIXER_CHANGE, - event that controls have been regenerated
+ 3: {"title": "", "message": ""}, // PACKET_JTR,
+ 4: { "title": "Packet Loss", "message": "Your network connection is currently experiencing packet loss at a rate that is too high to deliver good audio quality. For troubleshooting tips, click here." }, // PACKET_LOSS
+ 5: {"title": "", "message": ""}, // PACKET_LATE,
+ 6: {"title": "", "message": ""}, // JTR_QUEUE_DEPTH,
+ 7: {"title": "", "message": ""}, // NETWORK_JTR,
+ 8: { "title": "Session Latency", "message": "The latency of your audio device combined with your Internet connection has become high enough to impact your session quality. For troubleshooting tips, click here." }, // NETWORK_PING,
+ 9: {"title": "", "message": ""}, // BITRATE_THROTTLE_WARN,
+ 10: { "title": "Low Bandwidth", "message": "The available bandwidth on your network has become too low,and this may impact your audio quality. For troubleshooting tips, click here." }, // BANDWIDTH_LOW
+ //IO related events
+ 11: { "title": "Input Rate", "message": "The input rate of your audio device is varying too much to deliver good audio quality. For troubleshooting tips, click here." }, // INPUT_IO_RATE
+ 12: {"title": "", "message": ""}, // INPUT_IO_JTR,
+ 13: { "title": "Output Rate", "message": "The output rate of your audio device is varying too much to deliver good audio quality. For troubleshooting tips, click here." }, // OUTPUT_IO_RATE
+ 14: {"title": "", "message": ""}, // OUTPUT_IO_JTR,
+ // CPU load related
+ 15: { "title": "CPU Utilization High", "message": "The CPU of your computer is unable to keep up with the current processing load, and this may impact your audio quality. For troubleshooting tips, click here." }, // CPU_LOAD
+ 16: {"title": "", "message": ""}, // DECODE_VIOLATIONS,
+ 17: {"title": "", "message": ""} // LAST_THRESHOLD
+ };
+
+
+ function beforeShow(data) {
+ sessionId = data.id;
+ $('#session-mytracks-container').empty();
+ }
+
+ function alertCallback(type, text) {
+ if (type === 2) { // BACKEND_MIXER_CHANGE
+ sessionModel.refreshCurrentSession();
+ } else {
+ context.setTimeout(function() {
+ app.notify({
+ "title": alert_type[type].title,
+ "text": text,
+ "icon_url": "/assets/content/icon_alert_big.png"
+ }); }, 1);
+ }
+ }
+
+ function afterShow(data) {
+
+ // indicate that the screen is active, so that
+ // body-scoped drag handlers can go active
+ screenActive = true;
+
+ // Subscribe for callbacks on audio events
+ context.jamClient.RegisterVolChangeCallBack("JK.HandleVolumeChangeCallback");
+ context.jamClient.SessionRegisterCallback("JK.HandleBridgeCallback");
+ context.jamClient.SessionSetAlertCallback("JK.AlertCallback");
+
+ // If you load this page directly, the loading of the current user
+ // is happening in parallel. We can't join the session until the
+ // current user has been completely loaded. Poll for the current user
+ // before proceeding with session joining.
+ function checkForCurrentUser() {
+ if (context.JK.userMe) {
+ afterCurrentUserLoaded();
+ } else {
+ context.setTimeout(checkForCurrentUser, 100);
+ }
+ }
+ checkForCurrentUser();
+ }
+
+ function afterCurrentUserLoaded() {
+ logger.debug("afterCurrentUserLoaded");
+ // It seems the SessionModel should be a singleton.
+ // a client can only be in one session at a time,
+ // and other parts of the code want to know at any certain times
+ // about the current session, if any (for example, reconnect logic)
+ context.JK.CurrentSessionModel = sessionModel = new context.JK.SessionModel(
+ context.JK.JamServer,
+ context.jamClient
+ );
+
+ sessionModel.subscribe('sessionScreen', sessionChanged);
+ logger.debug("sessionId=" + sessionId);
+ sessionModel.joinSession(sessionId)
+ .fail(function(xhr, textStatus, errorMessage) {
+ if(xhr.status == 404) {
+ // we tried to join the session, but it's already gone. kick user back to join session screen
+ context.window.location = "#/findSession";
+ app.notify(
+ { title: "Unable to Join Session",
+ text: "The session you attempted to join is over."
+ },
+ { no_cancel: true });
+ }else {
+ app.ajaxError(xhr, textStatus, errorMessage);
+ }
+ });
+ }
+
+ function beforeHide(data) {
+ // track that the screen is inactive, to disable body-level handlers
+ screenActive = false;
+ sessionModel.leaveCurrentSession()
+ .fail(app.ajaxError);
+ }
+
+ function sessionChanged() {
+ logger.debug("sessionChanged()");
+
+ // TODO - in the specific case of a user changing their tracks using the configureTrack dialog,
+ // this event appears to fire before the underlying mixers have updated. I have no event to
+ // know definitively when the underlying mixers are up to date, so for now, we just delay slightly.
+ // This obviously has the possibility of introducing time-based bugs.
+ context.setTimeout(renderSession, RENDER_SESSION_DELAY);
+ }
+
+ /**
+ * the mixers object is a list. In order to find one by key,
+ * you must iterate. Convenience method to locate a particular
+ * mixer by id.
+ */
+ function getMixer(mixerId) {
+ var foundMixer = null;
+ $.each(mixers, function(index, mixer) {
+ if (mixer.id === mixerId) {
+ foundMixer = mixer;
+ }
+ });
+ return foundMixer;
+ }
+
+ function renderSession() {
+ $('#session-mytracks-container').empty();
+ $('.session-track').remove(); // Remove previous tracks
+ var $voiceChat = $('#voice-chat');
+ $voiceChat.hide();
+ _updateMixers();
+ _renderTracks();
+ _wireTopVolume();
+ _wireTopMix();
+ _addVoiceChat();
+ _initDialogs();
+ if ($('.session-livetracks .track').length === 0) {
+ $('.session-livetracks .when-empty').show();
+ }
+ }
+
+ function _initDialogs() {
+ logger.debug("Calling _initDialogs");
+ configureTrackDialog.initialize();
+ addTrackDialog.initialize();
+ addNewGearDialog.initialize();
+ }
+
+ // Get the latest list of underlying audio mixer channels
+ function _updateMixers() {
+ var mixerIds = context.jamClient.SessionGetIDs();
+ var holder = $.extend(true, {}, {mixers: context.jamClient.SessionGetControlState(mixerIds)});
+ mixers = holder.mixers;
+ // Always add a hard-coded simplified 'mixer' for the L2M mix
+ var l2m_mixer = {
+ id: '__L2M__',
+ range_low: -80,
+ range_high: 20,
+ volume_left: context.jamClient.SessionGetMasterLocalMix()
+ };
+ mixers.push(l2m_mixer);
+ }
+
+ // TODO FIXME - This needs to support multiple tracks for an individual
+ // client id and group.
+ function _mixerForClientId(clientId, groupIds, usedMixers) {
+ var foundMixer = null;
+ $.each(mixers, function(index, mixer) {
+ if (mixer.client_id === clientId) {
+ for (var i=0; i 20) {
+ lookingForMixersCount = 0;
+ lookingForMixers = {};
+ context.clearTimeout(lookingForMixersTimer);
+ lookingForMixersTimer = null;
+ }
+ }
+
+ // Given a mixerID and a value between 0.0-1.0,
+ // light up the proper VU lights.
+ function _updateVU(mixerId, value) {
+
+ // Special-case for mono tracks. If mono, and it's a _vul id,
+ // update both sides, otherwise do nothing.
+ // If it's a stereo track, just do the normal thing.
+ var selector;
+ var pureMixerId = mixerId.replace("_vul", "");
+ pureMixerId = pureMixerId.replace("_vur", "");
+ var mixer = getMixer(pureMixerId);
+ if (mixer) {
+ if (!(mixer.stereo)) { // mono track
+ if (mixerId.substr(-4) === "_vul") {
+ // Do the left
+ selector = '#tracks [mixer-id="' + pureMixerId + '_vul"]';
+ context.JK.VuHelpers.updateVU(selector, value);
+ // Do the right
+ selector = '#tracks [mixer-id="' + pureMixerId + '_vur"]';
+ context.JK.VuHelpers.updateVU(selector, value);
+ } // otherwise, it's a mono track, _vur event - ignore.
+ } else { // stereo track
+ selector = '#tracks [mixer-id="' + mixerId + '"]';
+ context.JK.VuHelpers.updateVU(selector, value);
+ }
+ }
+ }
+
+ function _addTrack(index, trackData) {
+ var parentSelector = '#session-mytracks-container';
+ var $destination = $(parentSelector);
+ if (trackData.clientId !== app.clientId) {
+ parentSelector = '#session-livetracks-container';
+ $destination = $(parentSelector);
+ $('.session-livetracks .when-empty').hide();
+ }
+ var template = $('#template-session-track').html();
+ var newTrack = context.JK.fillTemplate(template, trackData);
+ $destination.append(newTrack);
+
+ // Render VU meters and gain fader
+ var trackSelector = parentSelector + ' .session-track[track-id="' + trackData.trackId + '"]';
+ var gainPercent = trackData.gainPercent || 0;
+ connectTrackToMixer(trackSelector, trackData.clientId, trackData.mixerId, gainPercent);
+
+ var $closeButton = $('#div-track-close', 'div[track-id="' + trackData.trackId + '"]');
+ if (index === 0) {
+ $closeButton.hide();
+ }
+ else {
+ $closeButton.click(deleteTrack);
+ }
+
+ var $trackSettings = $('div[mixer-id="' + trackData.mixerId + '"].track-icon-settings');
+ $trackSettings.click(function() {
+ // call this to initialize Voice Chat tab
+ configureTrackDialog.showVoiceChatPanel(true);
+ configureTrackDialog.showMusicAudioPanel(true);
+ });
+
+ tracks[trackData.trackId] = new context.JK.SessionTrack(trackData.clientId);
+ }
+
+ /**
+ * Will be called when fader changes. The fader id (provided at subscribe time),
+ * the new value (0-100) and whether the fader is still being dragged are passed.
+ */
+ function faderChanged(faderId, newValue, dragging) {
+ var mixerIds = faderId.split(',');
+ $.each(mixerIds, function(i,v) {
+ var broadcast = !(dragging); // If fader is still dragging, don't broadcast
+ fillTrackVolumeObject(v, broadcast);
+ setMixerVolume(v, newValue);
+ });
+ }
+
+ function handleVolumeChangeCallback(mixerId, isLeft, value) {
+ // Visually update mixer
+ // There is no need to actually set the back-end mixer value as the
+ // back-end will already have updated the audio mixer directly prior to sending
+ // me this event. I simply need to visually show the new fader position.
+ // TODO: Use mixer's range
+ var faderValue = percentFromMixerValue(-80, 20, value);
+ context.JK.FaderHelpers.setFaderValue(mixerId, faderValue);
+ }
+
+ function handleBridgeCallback() {
+ var eventName = null;
+ var mixerId = null;
+ var value = null;
+ var tuples = arguments.length / 3;
+ for (var i=0; i
+*/
+var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y0){for(var af=0;af0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad "Hey Jon"
+ context.JK.fillTemplate = function(template, vals) {
+ for(var val in vals)
+ template=template.replace(new RegExp('{'+val+'}','g'), vals[val]);
+ return template;
+ };
+
+ context.JK.resolveAvatarUrl = function(photo_url) {
+ return photo_url ? photo_url : "/assets/shared/avatar_generic.png";
+ };
+
+ context.JK.getInstrumentIconMap24 = function() {
+ return instrumentIconMap24;
+ };
+
+ context.JK.getInstrumentIconMap45 = function() {
+ return instrumentIconMap45;
+ };
+
+ context.JK.getInstrumentIcon24 = function(instrument) {
+ if (instrument in instrumentIconMap24) {
+ return instrumentIconMap24[instrument];
+ }
+
+ return instrumentIconMap24["default"];
+ };
+
+ context.JK.getInstrumentIcon45 = function(instrument) {
+ if (instrument in instrumentIconMap45) {
+ return instrumentIconMap45[instrument];
+ }
+
+ return instrumentIconMap45["default"];
+ };
+
+ context.JK.listInstruments = function(app, callback) {
+ var url = "/api/instruments";
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ url: url,
+ success: function(response) {
+ callback(response);
+ },
+ error: app.ajaxError
+ });
+ };
+
+ context.JK.showErrorDialog = function(app, msg, title) {
+ app.layout.showDialog('error-dialog');
+ $('#error-msg', 'div[layout-id="error-dialog"]').html(msg);
+ $('#error-summary', 'div[layout-id="error-dialog"]').html(title);
+ }
+
+ // TODO: figure out how to handle this in layout.js for layered popups
+ context.JK.showOverlay = function() {
+ $('.dialog-overlay').show();
+ }
+
+ context.JK.hideOverlay = function() {
+ $('.dialog-overlay').hide();
+ }
+
+ /*
+ * Loads a listbox or dropdown with the values in input_array, setting the option value
+ * to the id_field and the option text to text_field. It will preselect the option with
+ * value equal to selected_id.
+ */
+ context.JK.loadOptions = function(templateHtml, listbox_id, input_array, id_field, text_field, selected_id) {
+ $.each(input_array, function(index, val) {
+ var isSelected = "";
+ if (val[id_field] === selected_id) {
+ isSelected = "selected";
+ }
+ var html = context.JK.fillTemplate(templateHtml, {
+ value: val[id_field],
+ label: val[text_field],
+ selected: isSelected
+ });
+
+ listbox_id.append(html);
+ });
+ }
+
+ context.JK.trimString = function(str) {
+ return str.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+ };
+
+ context.JK.padString = function(str, max) {
+ var retVal = '' + str;
+ while (retVal.length < max) {
+ retVal = '0' + retVal;
+ }
+
+ return retVal;
+ }
+
+ context.JK.formatDate = function(dateString) {
+ var date = new Date(dateString);
+ return date.getFullYear() + "-" + context.JK.padString(date.getMonth()+1, 2) + "-" + context.JK.padString(date.getDate(), 2) + " @ " + date.toLocaleTimeString();
+ }
+
+ context.JK.search = function(query, app, callback) {
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ contentType: 'application/json',
+ url: "/api/search?query=" + query,
+ processData: false,
+ success: function(response) {
+ callback(response);
+ },
+ error: app.ajaxError
+ });
+ };
+
+ context.JK.sendFriendRequest = function(app, userId, callback) {
+ var url = "/api/users/" + context.JK.currentUserId + "/friend_requests";
+ $.ajax({
+ type: "POST",
+ dataType: "json",
+ contentType: 'application/json',
+ url: url,
+ data: '{"friend_id":"' + userId + '"}',
+ processData: false,
+ success: function(response) {
+ callback(userId);
+ },
+ error: app.ajaxError
+ });
+ };
+
+ /*
+ * Get the length of a dictionary
+ */
+ context.JK.dlen = function(d) {
+ var count = 0;
+ for (var i in d) {
+ if (d.hasOwnProperty(i)) {
+ count++;
+ }
+ }
+ return count;
+ };
+
+ /**
+ * Finds the first error associated with the field.
+ * @param fieldName the name of the field
+ * @param errors_data response from a 422 response in ajax
+ * @returns null if no error for the field name, or the 1st error associated with that field
+ */
+ context.JK.get_first_error = function(fieldName, errors_data) {
+ var errors = errors_data["errors"];
+ if(errors == null) return null;
+
+ if(errors[fieldName] && errors[fieldName].length > 0) {
+ return errors[fieldName][0]
+ }
+ else {
+ return null;
+ }
+ }
+
+ /**
+ * Returns a ul with an li per field name.
+ * @param fieldName the name of the field
+ * @param errors_data error data return by a 422 ajax response
+ * @returns null if no error for the field name; otherwise a ul/li
+ */
+ context.JK.format_errors = function(fieldName, errors_data) {
+ var errors = errors_data["errors"];
+ if(errors == null) return null;
+
+ var field_errors = errors[fieldName];
+ if(field_errors == null) {
+ return null;
+ }
+
+ var ul = $('
')
+
+ $.each(field_errors, function(index, item) {
+ ul.append(context.JK.fillTemplate("- {message}
", {message: item}))
+ })
+
+ return ul;
+ }
+
+
+ /**
+ * Way to verify that a number of parallel tasks have all completed.
+ * Provide a function to evaluate completion, and a callback to
+ * invoke when that function evaluates to true.
+ * NOTE: this does not pause execution, it simply ensures that
+ * when the test function evaluates to true, the callback will
+ * be invoked.
+ */
+ context.JK.joinCalls = function(completionTestFunction, callback, interval) {
+ function doneYet() {
+ if (completionTestFunction()) {
+ callback();
+ } else {
+ context.setTimeout(doneYet, interval);
+ }
+ }
+ doneYet();
+ };
+
+ /**
+ * Returns 'MacOSX' if the os appears to be macintosh,
+ * 'Win32' if the os appears to be windows,
+ * 'Unix' if the OS appears to be linux,
+ * and null if unknown
+ * @returns {*}
+ */
+ context.JK.detectOS = function() {
+ if(!navigator.platform) { return null; }
+
+ if (navigator.platform.toLowerCase().indexOf( 'mac' ) !== -1) {
+ return "MacOSX";
+ }
+ if (navigator.platform.toLowerCase().indexOf( 'win' ) !== -1 ) {
+ return "Win32"
+ }
+ if (navigator.platform.toLowerCase().indexOf('linux') !== -1 ) {
+ return "Unix"
+ }
+
+ return null;
+ }
+
+ context.JK.popExternalLinks = function() {
+ // Allow any a link with a rel="external" attribute to launch
+ // the link in the default browser, using jamClient:
+ $('a[rel="external"]').click(function(evt) {
+ evt.preventDefault();
+ var href = $(this).attr("href");
+ if (href) {
+ // make absolute if not already
+ if(href.indexOf('http') != 0 && href.indexOf('mailto') != 0) {
+ href = window.location.protocol + '//' + window.location.host + href;
+ }
+
+ context.jamClient.OpenSystemBrowser(href);
+ }
+ return false;
+ });
+ }
+
+ /*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Copyright (C) Paul Johnston 1999 - 2000.
+ * Updated by Greg Holt 2000 - 2001.
+ * See http://pajhome.org.uk/site/legal.html for details.
+ */
+
+ /*
+ * Convert a 32-bit number to a hex string with ls-byte first
+ */
+ var hex_chr = "0123456789abcdef";
+ function rhex(num) {
+ var str, j;
+ str = "";
+ for(j=0; j<=3; j++) {
+ str += hex_chr.charAt((num >> (j * 8 + 4)) & 0x0F) +
+ hex_chr.charAt((num >> (j * 8)) & 0x0F);
+ }
+ return str;
+ }
+
+ /*
+ * Convert a string to a sequence of 16-word blocks, stored as an array.
+ * Append padding bits and the length, as described in the MD5 standard.
+ */
+ function str2blks_MD5(str) {
+ var nblk, blks, i;
+ nblk = ((str.length + 8) >> 6) + 1;
+ blks = new Array(nblk * 16);
+ for(i = 0; i < nblk * 16; i++) blks[i] = 0;
+ for(i = 0; i < str.length; i++)
+ blks[i >> 2] |= str.charCodeAt(i) << ((i % 4) * 8);
+ blks[i >> 2] |= 0x80 << ((i % 4) * 8);
+ blks[nblk * 16 - 2] = str.length * 8;
+ return blks;
+ }
+
+ /*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+ function add(x, y)
+ {
+ var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+ var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+ return (msw << 16) | (lsw & 0xFFFF);
+ }
+
+ /*
+ * Bitwise rotate a 32-bit number to the left
+ */
+ function rol(num, cnt)
+ {
+ return (num << cnt) | (num >>> (32 - cnt));
+ }
+
+ /*
+ * These functions implement the basic operation for each round of the
+ * algorithm.
+ */
+ function cmn(q, a, b, x, s, t)
+ {
+ return add(rol(add(add(a, q), add(x, t)), s), b);
+ }
+ function ff(a, b, c, d, x, s, t)
+ {
+ return cmn((b & c) | ((~b) & d), a, b, x, s, t);
+ }
+ function gg(a, b, c, d, x, s, t)
+ {
+ return cmn((b & d) | (c & (~d)), a, b, x, s, t);
+ }
+ function hh(a, b, c, d, x, s, t)
+ {
+ return cmn(b ^ c ^ d, a, b, x, s, t);
+ }
+ function ii(a, b, c, d, x, s, t)
+ {
+ return cmn(c ^ (b | (~d)), a, b, x, s, t);
+ }
+
+ /*
+ * Take a string and return the hex representation of its MD5.
+ */
+ context.JK.calcMD5 = function(str) {
+ var x, a, b, c, d, i,
+ olda, oldb, oldc, oldd;
+ x = str2blks_MD5(str);
+ a = 1732584193;
+ b = -271733879;
+ c = -1732584194;
+ d = 271733878;
+
+ for(i = 0; i < x.length; i += 16)
+ {
+ olda = a;
+ oldb = b;
+ oldc = c;
+ oldd = d;
+
+ a = ff(a, b, c, d, x[i+ 0], 7 , -680876936);
+ d = ff(d, a, b, c, x[i+ 1], 12, -389564586);
+ c = ff(c, d, a, b, x[i+ 2], 17, 606105819);
+ b = ff(b, c, d, a, x[i+ 3], 22, -1044525330);
+ a = ff(a, b, c, d, x[i+ 4], 7 , -176418897);
+ d = ff(d, a, b, c, x[i+ 5], 12, 1200080426);
+ c = ff(c, d, a, b, x[i+ 6], 17, -1473231341);
+ b = ff(b, c, d, a, x[i+ 7], 22, -45705983);
+ a = ff(a, b, c, d, x[i+ 8], 7 , 1770035416);
+ d = ff(d, a, b, c, x[i+ 9], 12, -1958414417);
+ c = ff(c, d, a, b, x[i+10], 17, -42063);
+ b = ff(b, c, d, a, x[i+11], 22, -1990404162);
+ a = ff(a, b, c, d, x[i+12], 7 , 1804603682);
+ d = ff(d, a, b, c, x[i+13], 12, -40341101);
+ c = ff(c, d, a, b, x[i+14], 17, -1502002290);
+ b = ff(b, c, d, a, x[i+15], 22, 1236535329);
+
+ a = gg(a, b, c, d, x[i+ 1], 5 , -165796510);
+ d = gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
+ c = gg(c, d, a, b, x[i+11], 14, 643717713);
+ b = gg(b, c, d, a, x[i+ 0], 20, -373897302);
+ a = gg(a, b, c, d, x[i+ 5], 5 , -701558691);
+ d = gg(d, a, b, c, x[i+10], 9 , 38016083);
+ c = gg(c, d, a, b, x[i+15], 14, -660478335);
+ b = gg(b, c, d, a, x[i+ 4], 20, -405537848);
+ a = gg(a, b, c, d, x[i+ 9], 5 , 568446438);
+ d = gg(d, a, b, c, x[i+14], 9 , -1019803690);
+ c = gg(c, d, a, b, x[i+ 3], 14, -187363961);
+ b = gg(b, c, d, a, x[i+ 8], 20, 1163531501);
+ a = gg(a, b, c, d, x[i+13], 5 , -1444681467);
+ d = gg(d, a, b, c, x[i+ 2], 9 , -51403784);
+ c = gg(c, d, a, b, x[i+ 7], 14, 1735328473);
+ b = gg(b, c, d, a, x[i+12], 20, -1926607734);
+
+ a = hh(a, b, c, d, x[i+ 5], 4 , -378558);
+ d = hh(d, a, b, c, x[i+ 8], 11, -2022574463);
+ c = hh(c, d, a, b, x[i+11], 16, 1839030562);
+ b = hh(b, c, d, a, x[i+14], 23, -35309556);
+ a = hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
+ d = hh(d, a, b, c, x[i+ 4], 11, 1272893353);
+ c = hh(c, d, a, b, x[i+ 7], 16, -155497632);
+ b = hh(b, c, d, a, x[i+10], 23, -1094730640);
+ a = hh(a, b, c, d, x[i+13], 4 , 681279174);
+ d = hh(d, a, b, c, x[i+ 0], 11, -358537222);
+ c = hh(c, d, a, b, x[i+ 3], 16, -722521979);
+ b = hh(b, c, d, a, x[i+ 6], 23, 76029189);
+ a = hh(a, b, c, d, x[i+ 9], 4 , -640364487);
+ d = hh(d, a, b, c, x[i+12], 11, -421815835);
+ c = hh(c, d, a, b, x[i+15], 16, 530742520);
+ b = hh(b, c, d, a, x[i+ 2], 23, -995338651);
+
+ a = ii(a, b, c, d, x[i+ 0], 6 , -198630844);
+ d = ii(d, a, b, c, x[i+ 7], 10, 1126891415);
+ c = ii(c, d, a, b, x[i+14], 15, -1416354905);
+ b = ii(b, c, d, a, x[i+ 5], 21, -57434055);
+ a = ii(a, b, c, d, x[i+12], 6 , 1700485571);
+ d = ii(d, a, b, c, x[i+ 3], 10, -1894986606);
+ c = ii(c, d, a, b, x[i+10], 15, -1051523);
+ b = ii(b, c, d, a, x[i+ 1], 21, -2054922799);
+ a = ii(a, b, c, d, x[i+ 8], 6 , 1873313359);
+ d = ii(d, a, b, c, x[i+15], 10, -30611744);
+ c = ii(c, d, a, b, x[i+ 6], 15, -1560198380);
+ b = ii(b, c, d, a, x[i+13], 21, 1309151649);
+ a = ii(a, b, c, d, x[i+ 4], 6 , -145523070);
+ d = ii(d, a, b, c, x[i+11], 10, -1120210379);
+ c = ii(c, d, a, b, x[i+ 2], 15, 718787259);
+ b = ii(b, c, d, a, x[i+ 9], 21, -343485551);
+
+ a = add(a, olda);
+ b = add(b, oldb);
+ c = add(c, oldc);
+ d = add(d, oldd);
+ }
+ return rhex(a) + rhex(b) + rhex(c) + rhex(d);
+ };
+
+ })(window,jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/vuHelpers.js b/web/app/assets/javascripts/vuHelpers.js
new file mode 100644
index 000000000..c63567321
--- /dev/null
+++ b/web/app/assets/javascripts/vuHelpers.js
@@ -0,0 +1,89 @@
+/**
+* Functions related to VU meters.
+* These functions are intimately tied to the markup defined in the
+* VU templates in _vu_meters.html.erb
+*/
+(function(context, $) {
+
+ "use strict";
+
+ context.JK = context.JK || {};
+
+ // As these are helper functions, just have a single
+ // static object with functions. Each function should
+ // take all necessary arguments to complete its work.
+ context.JK.VuHelpers = {
+
+ /**
+ * Render a VU meter into the provided selector.
+ * vuType can be either "horizontal" or "vertical"
+ */
+ renderVU: function(selector, userOptions) {
+ /**
+ * The default options for rendering a VU
+ */
+ var renderVUDefaults = {
+ vuType: "vertical",
+ lightCount: 12,
+ lightWidth: 3,
+ lightHeight: 17
+ };
+
+ var options = $.extend({}, renderVUDefaults, userOptions);
+ var templateSelector = "#template-vu-v";
+ if (options.vuType === "horizontal") {
+ templateSelector = "#template-vu-h";
+ }
+ var templateSource = $(templateSelector).html();
+ $(selector).empty();
+
+ $(selector).html(context._.template(templateSource, options, {variable: 'data'}));
+ },
+
+ /**
+ * Given a selector representing a container for a VU meter and
+ * a value between 0.0 and 1.0, light the appropriate lights.
+ */
+ updateVU: function (selector, value) {
+ // There are 13 VU lights. Figure out how many to
+ // light based on the incoming value.
+ var countSelector = 'tr';
+ var horizontal = ($('table.horizontal', selector).length);
+ if (horizontal) {
+ countSelector = 'td';
+ }
+
+ var lightCount = $(countSelector, selector).length;
+ var i = 0;
+ var state = 'on';
+ var lights = Math.round(value * lightCount);
+ var redSwitch = Math.round(lightCount * 0.6666667);
+
+ var $light = null;
+ var colorClass = 'vu-green-';
+ var lightSelectorPrefix = selector + ' td.vu';
+ var thisLightSelector = null;
+
+ // Remove all light classes from all lights
+ var allLightsSelector = selector + ' td.vulight';
+ $(allLightsSelector).removeClass('vu-green-off vu-green-on vu-red-off vu-red-on');
+
+ // Set the lights
+ for (i=0; i= redSwitch) {
+ colorClass = 'vu-red-';
+ }
+ if (i >= lights) {
+ state = 'off';
+ }
+ thisLightSelector = lightSelectorPrefix + i;
+ $light = $(thisLightSelector);
+ $light.addClass(colorClass + state);
+ }
+ }
+
+ };
+
+})(window, jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/web_socket.js b/web/app/assets/javascripts/web_socket.js
new file mode 100644
index 000000000..06cc5d027
--- /dev/null
+++ b/web/app/assets/javascripts/web_socket.js
@@ -0,0 +1,391 @@
+// Copyright: Hiroshi Ichikawa ] [-s ] -u -i [-a]')
+ xml.argument('foo=etch.dyndns.org:4442')
+ xml.argument('bar=etch.dyndns.org:4442')
+ xml.argument("-uhttp://www.jamkazam.com#{isp_scoring_path}")
+ xml.argument("-i#{params[:isp]}")
+ xml.argument('-a')
+ end
+ xml.update(:check => 'background')
+ end
+ send_data jnlp, :type=>"application/x-java-jnlp-file"
+ end
+
+ def isp
+ @isps = {
+ 'tw' => ['Time Warner', 'tw.jpg'],
+ 'vz' => ['Verizon', 'vz.png'],
+ 'att' => ['AT&T', 'att.png'],
+ 'cc' => ['Comcast', 'cc.png'],
+ 'other' => ['Other', 'other.jpg']
+ }
+ render :layout => "landing"
+ end
+
+ private
+
+ def correct_user
+ @user = User.find(params[:id])
+ redirect_to(root_url) unless current_user?(@user)
+ end
+
+ def admin_user
+ redirect_to(root_url) unless current_user.admin?
+ end
+
+ # the User Model expects instruments in a different format than the form submits it
+ # so we have to fix it up.
+ def fixup_instruments(original_instruments)
+ # if an instrument is selected by the user in the form, it'll show up in this array
+ instruments = []
+
+ # ok, sweep through all the fields submitted, looking for selected instruments.
+ # also, make up priority because we don't ask for it (but users can fix it later on their profile)
+ priority = 0
+ unless original_instruments == nil
+ original_instruments.each do |key, value|
+ if !value["selected"].nil?
+ instruments << { :instrument_id => key, :proficiency_level => value["proficiency"].to_i, :priority => priority }
+ priority = priority + 1
+ end
+ end
+ end
+
+ return instruments
+ end
+
+ # the User Model expects instruments in a different format than the form submits it
+ # so we have to fix it up.
+ def fixup_birthday(month, day, year)
+ if month.blank? || day.blank? || year.blank?
+ # invalid birthdate, so return nil
+ return nil
+ end
+
+ return Date.new(year.to_i, month.to_i, day.to_i)
+ end
+
+ def load_invited_user(params)
+ # check if this an anonymous request, or result of invitation code
+ invitation_code = params[:invitation_code]
+
+ invited_user = nil
+ unless invitation_code.nil?
+ # we only want to find invitations that have not been accepted
+ invited_user = InvitedUser.find_by_invitation_code(invitation_code)
+ end
+ return invited_user
+ end
+
+ def load_location(remote_ip, location = nil)
+ @location = location
+
+ if @location.nil?
+ @location = MaxMindManager.lookup(remote_ip)
+ end
+
+ @location[:country] = "US" if @location[:country].nil?
+
+ # right now we only accept US signups for beta
+ @countries = MaxMindManager.countries()
+ # populate regions based on current country
+ @regions = MaxMindManager.regions(@location[:country])
+ @cities = @location[:state].nil? ? [] : MaxMindManager.cities(@location[:country], @location[:state])
+ end
+
+ def load_postback(invited_user)
+ if invited_user.nil?
+ signup_path
+ else
+ signup_path + "?invitation_code=" + invited_user.invitation_code
+ end
+ end
+end
diff --git a/web/app/helpers/application_helper.rb b/web/app/helpers/application_helper.rb
new file mode 100644
index 000000000..3330b45ab
--- /dev/null
+++ b/web/app/helpers/application_helper.rb
@@ -0,0 +1,16 @@
+module ApplicationHelper
+
+ # Returns the full title on a per-page basis.
+ def full_title(page_title)
+ base_title = "JamKazam"
+ if page_title.empty?
+ base_title
+ else
+ "#{base_title} | #{page_title}"
+ end
+ end
+
+ def self.base_uri(request)
+ (request.ssl? ? "https://" : "http://") + request.host_with_port
+ end
+end
diff --git a/web/app/helpers/meta_helper.rb b/web/app/helpers/meta_helper.rb
new file mode 100644
index 000000000..0ba8cb259
--- /dev/null
+++ b/web/app/helpers/meta_helper.rb
@@ -0,0 +1,7 @@
+module MetaHelper
+
+ def version()
+ "web=#{::JamWeb::VERSION} lib=#{JamRuby::VERSION} db=#{JamDb::VERSION} pb=#{Jampb::VERSION}"
+ end
+
+end
diff --git a/web/app/helpers/sessions_helper.rb b/web/app/helpers/sessions_helper.rb
new file mode 100644
index 000000000..72e8618a6
--- /dev/null
+++ b/web/app/helpers/sessions_helper.rb
@@ -0,0 +1,68 @@
+module SessionsHelper
+
+ def sign_in(user)
+ set_remember_token(user)
+ self.current_user = user
+ end
+
+ def set_remember_token(user)
+ if @session_only_cookie
+ cookies.delete(:remember_token)
+ cookies[:remember_token] = user.remember_token
+ else
+ cookies[:remember_token] = {
+ :value => user.remember_token,
+ :expires => 20.years.from_now.utc
+ }
+ end
+ end
+
+ def signed_in?
+ !current_user.nil?
+ end
+
+ def current_user=(user)
+ @current_user = user
+ end
+
+ def current_user
+ @current_user ||= User.find_by_remember_token(cookies[:remember_token])
+ end
+
+ def current_user?(user)
+ user == current_user
+ end
+
+ def signed_in_user
+ unless signed_in?
+ store_location
+ redirect_to signin_url, notice: "Please sign in."
+ end
+ end
+
+
+ def api_signed_in_user
+ unless signed_in?
+ render :json => {}, :status => 403
+ end
+ end
+
+ def sign_out
+ current_user = nil
+ cookies.delete(:remember_token)
+ end
+
+ def redirect_back_or(default)
+ redirect_to(session[:return_to] || default)
+ session.delete(:return_to)
+ end
+
+ def store_location
+ session[:return_to] = request.url
+ end
+
+ def jkclient_agent?
+ request.env['HTTP_USER_AGENT'] =~ /JamKazam/
+ end
+
+end
diff --git a/web/app/helpers/static_pages_helper.rb b/web/app/helpers/static_pages_helper.rb
new file mode 100644
index 000000000..2d63e79e6
--- /dev/null
+++ b/web/app/helpers/static_pages_helper.rb
@@ -0,0 +1,2 @@
+module StaticPagesHelper
+end
diff --git a/web/app/helpers/users_helper.rb b/web/app/helpers/users_helper.rb
new file mode 100644
index 000000000..b3edd0a32
--- /dev/null
+++ b/web/app/helpers/users_helper.rb
@@ -0,0 +1,12 @@
+module UsersHelper
+
+ # Returns the Gravatar (http://gravatar.com/) for the given user.
+ def gravatar_for(user, options = { size: 50, hclass: "gravatar" })
+ gravatar_id = Digest::MD5::hexdigest(user.email.downcase)
+ size = options[:size]
+ hclass = options[:hclass]
+ gravatar =
+ gravatar_url = "https://secure.gravatar.com/avatar/#{gravatar_id}?s=#{size}"
+ image_tag(gravatar_url, alt: "#{user.first_name} #{user.last_name}", class: "#{hclass}")
+ end
+end
diff --git a/web/app/mailers/.gitkeep b/web/app/mailers/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/app/responders/api_responder.rb b/web/app/responders/api_responder.rb
new file mode 100644
index 000000000..64df5fd69
--- /dev/null
+++ b/web/app/responders/api_responder.rb
@@ -0,0 +1,16 @@
+class ApiResponder < ActionController::Responder
+ def to_format
+ case
+ when has_errors?
+ logger.debug("REST API entity has error: #{resource.errors.inspect}")
+ controller.response.status = :unprocessable_entity
+ when post?
+ logger.debug("REST API post")
+ controller.response.status = :created
+ end
+
+ default_render
+ rescue ActionView::MissingTemplate => e
+ api_behavior(e)
+ end
+end
diff --git a/web/app/views/api_bands/create.rabl b/web/app/views/api_bands/create.rabl
new file mode 100644
index 000000000..86df71066
--- /dev/null
+++ b/web/app/views/api_bands/create.rabl
@@ -0,0 +1,3 @@
+object @band
+
+extends "api_bands/show"
\ No newline at end of file
diff --git a/web/app/views/api_bands/follower_index.rabl b/web/app/views/api_bands/follower_index.rabl
new file mode 100644
index 000000000..5cb70590c
--- /dev/null
+++ b/web/app/views/api_bands/follower_index.rabl
@@ -0,0 +1,21 @@
+collection @band.followers
+
+node :user_id do |follower|
+ follower.id
+end
+
+node :name do |follower|
+ follower.name
+end
+
+node :location do |follower|
+ follower.location
+end
+
+node :musician do |follower|
+ follower.musician
+end
+
+node :photo_url do |follower|
+ follower.photo_url
+end
diff --git a/web/app/views/api_bands/index.rabl b/web/app/views/api_bands/index.rabl
new file mode 100644
index 000000000..74531e3ae
--- /dev/null
+++ b/web/app/views/api_bands/index.rabl
@@ -0,0 +1,4 @@
+collection @bands
+
+# do not retrieve all child collections when showing a list of bands
+attributes :id, :name, :city, :state, :country, :photo_url, :logo_url
\ No newline at end of file
diff --git a/web/app/views/api_bands/invitation_create.rabl b/web/app/views/api_bands/invitation_create.rabl
new file mode 100644
index 000000000..1cc5c9bde
--- /dev/null
+++ b/web/app/views/api_bands/invitation_create.rabl
@@ -0,0 +1,3 @@
+object @invitation
+
+extends "api_bands/invitation_show"
\ No newline at end of file
diff --git a/web/app/views/api_bands/invitation_index.rabl b/web/app/views/api_bands/invitation_index.rabl
new file mode 100644
index 000000000..2e12df14a
--- /dev/null
+++ b/web/app/views/api_bands/invitation_index.rabl
@@ -0,0 +1,3 @@
+object @invitations
+
+extends "api_bands/invitation_show"
\ No newline at end of file
diff --git a/web/app/views/api_bands/invitation_show.rabl b/web/app/views/api_bands/invitation_show.rabl
new file mode 100644
index 000000000..ffb49a994
--- /dev/null
+++ b/web/app/views/api_bands/invitation_show.rabl
@@ -0,0 +1,15 @@
+object @invitation
+
+attributes :id, :accepted
+
+node :sender do |i|
+ { :id => i.sender.id, :name => i.sender.name }
+end
+
+node :recipient do |i|
+ { :id => i.receiver.id, :name => i.receiver.name }
+end
+
+node :band do |i|
+ { :id => i.band.id, :name => i.band.name }
+end
\ No newline at end of file
diff --git a/web/app/views/api_bands/liker_index.rabl b/web/app/views/api_bands/liker_index.rabl
new file mode 100644
index 000000000..9750b6e33
--- /dev/null
+++ b/web/app/views/api_bands/liker_index.rabl
@@ -0,0 +1,31 @@
+object @band.likers
+
+attributes :liker_id => :user_id
+
+node :first_name do |liker|
+ liker.user.first_name
+end
+
+node :last_name do |liker|
+ liker.user.last_name
+end
+
+node :city do |liker|
+ liker.user.city
+end
+
+node :state do |liker|
+ liker.user.state
+end
+
+node :country do |liker|
+ liker.user.country
+end
+
+node :musician do |liker|
+ liker.user.musician
+end
+
+node :photo_url do |liker|
+ liker.user.photo_url
+end
\ No newline at end of file
diff --git a/web/app/views/api_bands/recording_create.rabl b/web/app/views/api_bands/recording_create.rabl
new file mode 100644
index 000000000..4aeb0e520
--- /dev/null
+++ b/web/app/views/api_bands/recording_create.rabl
@@ -0,0 +1,3 @@
+object @recording
+
+extends "api_bands/recording_show"
\ No newline at end of file
diff --git a/web/app/views/api_bands/recording_index.rabl b/web/app/views/api_bands/recording_index.rabl
new file mode 100644
index 000000000..153606970
--- /dev/null
+++ b/web/app/views/api_bands/recording_index.rabl
@@ -0,0 +1,12 @@
+collection @recordings
+
+attributes :id, :description, :public
+
+node :genres do |recording|
+ unless recording.genres.nil? || recording.genres.size == 0
+ child :genres => :genres do
+ attributes :id, :description
+ #partial('api_genres/index', :object => recording.genres)
+ end
+ end
+end
\ No newline at end of file
diff --git a/web/app/views/api_bands/recording_show.rabl b/web/app/views/api_bands/recording_show.rabl
new file mode 100644
index 000000000..4936e763d
--- /dev/null
+++ b/web/app/views/api_bands/recording_show.rabl
@@ -0,0 +1,10 @@
+object @recording
+
+attributes :id, :description, :public
+
+unless @recording.genres.nil? || @recording.genres.size == 0
+ child :genres => :genres do
+ attributes :id, :description
+ #partial('api_genres/index', :object => @recording.genres)
+ end
+end
\ No newline at end of file
diff --git a/web/app/views/api_bands/recording_update.rabl b/web/app/views/api_bands/recording_update.rabl
new file mode 100644
index 000000000..4aeb0e520
--- /dev/null
+++ b/web/app/views/api_bands/recording_update.rabl
@@ -0,0 +1,3 @@
+object @recording
+
+extends "api_bands/recording_show"
\ No newline at end of file
diff --git a/web/app/views/api_bands/show.rabl b/web/app/views/api_bands/show.rabl
new file mode 100644
index 000000000..fc4b171d9
--- /dev/null
+++ b/web/app/views/api_bands/show.rabl
@@ -0,0 +1,25 @@
+object @band
+
+attributes :id, :name, :city, :state, :country, :website, :biography, :photo_url, :logo_url, :liker_count, :follower_count, :recording_count, :session_count
+
+unless @band.users.nil? || @band.users.size == 0
+ child :users => :musicians do
+ attributes :id, :first_name, :last_name, :photo_url
+
+ # TODO: figure out how to omit empty arrays
+ node :instruments do |user|
+ unless user.instruments.nil? || user.instruments.size == 0
+ child :musician_instruments => :instruments do
+ attributes :instrument_id, :description, :proficiency_level, :priority
+ end
+ end
+ end
+ end
+end
+
+unless @band.genres.nil? || @band.genres.size == 0
+ child :genres => :genres do
+ attributes :id, :description
+ #partial('api_genres/index', :object => @band.genres)
+ end
+end
diff --git a/web/app/views/api_bands/update.rabl b/web/app/views/api_bands/update.rabl
new file mode 100644
index 000000000..86df71066
--- /dev/null
+++ b/web/app/views/api_bands/update.rabl
@@ -0,0 +1,3 @@
+object @band
+
+extends "api_bands/show"
\ No newline at end of file
diff --git a/web/app/views/api_claimed_recordings/index.rabl b/web/app/views/api_claimed_recordings/index.rabl
new file mode 100644
index 000000000..276a551ec
--- /dev/null
+++ b/web/app/views/api_claimed_recordings/index.rabl
@@ -0,0 +1,3 @@
+object @claimed_recordings
+
+extends "api_claimed_recordings/show"
\ No newline at end of file
diff --git a/web/app/views/api_claimed_recordings/show.rabl b/web/app/views/api_claimed_recordings/show.rabl
new file mode 100644
index 000000000..b9dd7af6f
--- /dev/null
+++ b/web/app/views/api_claimed_recordings/show.rabl
@@ -0,0 +1,29 @@
+# I'm not sure this is right at all. The idea is to bring in all the stuff you would need to play the tracks.
+# I don't think I need to include URLs since that's handled by syncing. This is jsut to make the metadata
+# depictable.
+
+object @claimed_recording
+
+attributes :id, :name, :is_public, :is_downloadable
+
+child(:recording => :recording) {
+ attributes :id, :created_at, :duration
+ child(:band => :band) {
+ attributes :id, :name
+ }
+
+ child(:mixes => :mixes) {
+ attributes :id, :url, :is_completed
+ }
+}
+
+child(:recorded_tracks => :recorded_tracks) {
+ attributes :id, :fully_uploaded, :url
+ child(:instrument => :instrument) {
+ attributes :id, :description
+ }
+ child(:user => :user) {
+ attributes :id, :email, :first_name, :last_name, :city, :state, :country, :photo_url
+ }
+}
+
diff --git a/web/app/views/api_genres/index.rabl b/web/app/views/api_genres/index.rabl
new file mode 100644
index 000000000..6fbde2f77
--- /dev/null
+++ b/web/app/views/api_genres/index.rabl
@@ -0,0 +1,3 @@
+object @genres
+
+extends "api_genres/show"
diff --git a/web/app/views/api_genres/show.rabl b/web/app/views/api_genres/show.rabl
new file mode 100644
index 000000000..bfd9107b4
--- /dev/null
+++ b/web/app/views/api_genres/show.rabl
@@ -0,0 +1,3 @@
+object @genre
+
+attributes :id, :description
diff --git a/web/app/views/api_instruments/index.rabl b/web/app/views/api_instruments/index.rabl
new file mode 100644
index 000000000..26f2348aa
--- /dev/null
+++ b/web/app/views/api_instruments/index.rabl
@@ -0,0 +1,3 @@
+object @instruments
+
+extends "api_instruments/show"
diff --git a/web/app/views/api_instruments/show.rabl b/web/app/views/api_instruments/show.rabl
new file mode 100644
index 000000000..8fe354804
--- /dev/null
+++ b/web/app/views/api_instruments/show.rabl
@@ -0,0 +1,3 @@
+object @instrument
+
+attributes :id, :description, :popularity
diff --git a/web/app/views/api_invitations/create.rabl b/web/app/views/api_invitations/create.rabl
new file mode 100644
index 000000000..3831ae78e
--- /dev/null
+++ b/web/app/views/api_invitations/create.rabl
@@ -0,0 +1,3 @@
+object @invitation
+
+extends "api_invitations/invitation"
diff --git a/web/app/views/api_invitations/index.rabl b/web/app/views/api_invitations/index.rabl
new file mode 100644
index 000000000..5f0a35545
--- /dev/null
+++ b/web/app/views/api_invitations/index.rabl
@@ -0,0 +1,3 @@
+object @invitations
+
+extends "api_invitations/invitation"
diff --git a/web/app/views/api_invitations/invitation.rabl b/web/app/views/api_invitations/invitation.rabl
new file mode 100644
index 000000000..95f472afd
--- /dev/null
+++ b/web/app/views/api_invitations/invitation.rabl
@@ -0,0 +1,21 @@
+object @invitation
+
+attributes :id, :join_request_id
+
+child(:sender => :sender) {
+ attributes :id, :name
+}
+
+child(:receiver => :receiver) {
+ attributes :id, :name
+}
+
+child(:music_session) {
+ attributes :id, :description
+}
+
+child(:join_request) {
+ attributes :id
+}
+
+
diff --git a/web/app/views/api_invitations/show.rabl b/web/app/views/api_invitations/show.rabl
new file mode 100644
index 000000000..3831ae78e
--- /dev/null
+++ b/web/app/views/api_invitations/show.rabl
@@ -0,0 +1,3 @@
+object @invitation
+
+extends "api_invitations/invitation"
diff --git a/web/app/views/api_invited_users/create.rabl b/web/app/views/api_invited_users/create.rabl
new file mode 100644
index 000000000..e62c95f69
--- /dev/null
+++ b/web/app/views/api_invited_users/create.rabl
@@ -0,0 +1,3 @@
+object @invited_user
+
+extends "api_invited_users/invited_user"
diff --git a/web/app/views/api_invited_users/index.rabl b/web/app/views/api_invited_users/index.rabl
new file mode 100644
index 000000000..cca853fd4
--- /dev/null
+++ b/web/app/views/api_invited_users/index.rabl
@@ -0,0 +1,3 @@
+object @invited_users
+
+extends "api_invited_users/invited_user"
diff --git a/web/app/views/api_invited_users/invited_user.rabl b/web/app/views/api_invited_users/invited_user.rabl
new file mode 100644
index 000000000..3bce327fa
--- /dev/null
+++ b/web/app/views/api_invited_users/invited_user.rabl
@@ -0,0 +1,3 @@
+object @invited_user
+
+attributes :id, :created_at, :updated_at, :email, :note, :accepted
\ No newline at end of file
diff --git a/web/app/views/api_invited_users/show.rabl b/web/app/views/api_invited_users/show.rabl
new file mode 100644
index 000000000..e62c95f69
--- /dev/null
+++ b/web/app/views/api_invited_users/show.rabl
@@ -0,0 +1,3 @@
+object @invited_user
+
+extends "api_invited_users/invited_user"
diff --git a/web/app/views/api_join_requests/create.rabl b/web/app/views/api_join_requests/create.rabl
new file mode 100644
index 000000000..0c3111a5f
--- /dev/null
+++ b/web/app/views/api_join_requests/create.rabl
@@ -0,0 +1,3 @@
+object @join_request
+
+extends "api_join_requests/join_request"
diff --git a/web/app/views/api_join_requests/index.rabl b/web/app/views/api_join_requests/index.rabl
new file mode 100644
index 000000000..ae5bf1f59
--- /dev/null
+++ b/web/app/views/api_join_requests/index.rabl
@@ -0,0 +1,3 @@
+object @join_requests
+
+extends "api_join_requests/join_request"
diff --git a/web/app/views/api_join_requests/join_request.rabl b/web/app/views/api_join_requests/join_request.rabl
new file mode 100644
index 000000000..a879ee6f2
--- /dev/null
+++ b/web/app/views/api_join_requests/join_request.rabl
@@ -0,0 +1,11 @@
+object @join_request
+
+attributes :id, :text
+attributes :music_session_id => :music_session
+
+child(:user => :user) {
+ attributes :id, :name
+}
+
+
+
diff --git a/web/app/views/api_join_requests/show.rabl b/web/app/views/api_join_requests/show.rabl
new file mode 100644
index 000000000..0c3111a5f
--- /dev/null
+++ b/web/app/views/api_join_requests/show.rabl
@@ -0,0 +1,3 @@
+object @join_request
+
+extends "api_join_requests/join_request"
diff --git a/web/app/views/api_music_sessions/create.rabl b/web/app/views/api_music_sessions/create.rabl
new file mode 100644
index 000000000..e34b6943d
--- /dev/null
+++ b/web/app/views/api_music_sessions/create.rabl
@@ -0,0 +1,3 @@
+object @music_session
+
+extends "api_music_sessions/show"
\ No newline at end of file
diff --git a/web/app/views/api_music_sessions/index.rabl b/web/app/views/api_music_sessions/index.rabl
new file mode 100644
index 000000000..4b7420de3
--- /dev/null
+++ b/web/app/views/api_music_sessions/index.rabl
@@ -0,0 +1,3 @@
+object @music_sessions
+
+extends "api_music_sessions/show"
diff --git a/web/app/views/api_music_sessions/member_show.rabl b/web/app/views/api_music_sessions/member_show.rabl
new file mode 100644
index 000000000..a6023dd1e
--- /dev/null
+++ b/web/app/views/api_music_sessions/member_show.rabl
@@ -0,0 +1,3 @@
+object @connection
+
+attributes :ip_address, :client_id => :id
diff --git a/web/app/views/api_music_sessions/participant_show.rabl b/web/app/views/api_music_sessions/participant_show.rabl
new file mode 100644
index 000000000..cbbf29c87
--- /dev/null
+++ b/web/app/views/api_music_sessions/participant_show.rabl
@@ -0,0 +1,11 @@
+object @connection
+
+attributes :ip_address, :client_id
+attribute :aasm_state => :connection_state
+
+node(:user_id, :if => lambda { |connection| connection.user.friends?(current_user) }) do |connection|
+ connection.user_id
+end
+child(:tracks => :tracks) {
+ attributes :id, :instrument_id, :sound
+}
\ No newline at end of file
diff --git a/web/app/views/api_music_sessions/show.rabl b/web/app/views/api_music_sessions/show.rabl
new file mode 100644
index 000000000..b9670496e
--- /dev/null
+++ b/web/app/views/api_music_sessions/show.rabl
@@ -0,0 +1,34 @@
+object @music_session
+
+attributes :id, :description, :musician_access, :approval_required, :fan_access, :fan_chat, :band_id, :user_id
+
+node :genres do |item|
+ item.genres.map(&:description)
+end
+
+child(:connections => :participants) {
+ collection @music_sessions, :object_root => false
+ attributes :ip_address, :client_id
+
+ node :user do |connection|
+ { :id => connection.user.id, :photo_url => connection.user.photo_url, :name => connection.user.name, :is_friend => connection.user.friends?(current_user), :connection_state => connection.aasm_state }
+ end
+
+ child(:tracks => :tracks) {
+ attributes :id, :connection_id, :instrument_id, :sound
+ }
+}
+
+child({:invitations => :invitations}) {
+ attributes :id, :sender_id, :receiver_id
+}
+
+# only show join_requests if the current_user is in the session
+node(:join_requests, :if => lambda { |music_session| music_session.users.exists?(current_user) } ) do |music_session|
+ child(:join_requests => :join_requests) {
+ attributes :id, :text
+ child(:user => :user) {
+ attributes :id, :name
+ }
+ }
+end
diff --git a/web/app/views/api_music_sessions/track_create.rabl b/web/app/views/api_music_sessions/track_create.rabl
new file mode 100644
index 000000000..1f086e30b
--- /dev/null
+++ b/web/app/views/api_music_sessions/track_create.rabl
@@ -0,0 +1,3 @@
+object @track
+
+extends "api_music_sessions/track_show"
\ No newline at end of file
diff --git a/web/app/views/api_music_sessions/track_index.rabl b/web/app/views/api_music_sessions/track_index.rabl
new file mode 100644
index 000000000..cbb27355e
--- /dev/null
+++ b/web/app/views/api_music_sessions/track_index.rabl
@@ -0,0 +1,3 @@
+object @tracks
+
+extends "api_music_sessions/track_show"
\ No newline at end of file
diff --git a/web/app/views/api_music_sessions/track_show.rabl b/web/app/views/api_music_sessions/track_show.rabl
new file mode 100644
index 000000000..c460b0085
--- /dev/null
+++ b/web/app/views/api_music_sessions/track_show.rabl
@@ -0,0 +1,3 @@
+object @track
+
+attributes :id, :connection_id, :instrument_id, :sound
\ No newline at end of file
diff --git a/web/app/views/api_music_sessions/track_update.rabl b/web/app/views/api_music_sessions/track_update.rabl
new file mode 100644
index 000000000..1f086e30b
--- /dev/null
+++ b/web/app/views/api_music_sessions/track_update.rabl
@@ -0,0 +1,3 @@
+object @track
+
+extends "api_music_sessions/track_show"
\ No newline at end of file
diff --git a/web/app/views/api_search/index.rabl b/web/app/views/api_search/index.rabl
new file mode 100644
index 000000000..1bcb83003
--- /dev/null
+++ b/web/app/views/api_search/index.rabl
@@ -0,0 +1,43 @@
+object @search
+
+unless @search.bands.nil? || @search.bands.size == 0
+ child(:bands => :bands) {
+ attributes :id, :name, :location, :photo_url, :logo_url
+ }
+end
+
+unless @search.musicians.nil? || @search.musicians.size == 0
+ child(:musicians => :musicians) {
+ attributes :id, :first_name, :last_name, :name, :location, :photo_url
+
+ node :is_friend do |musician|
+ musician.friends?(current_user)
+ end
+
+ child :musician_instruments => :instruments do
+ attributes :instrument_id, :description, :proficiency_level, :priority
+ end
+ }
+end
+
+unless @search.fans.nil? || @search.fans.size == 0
+ child(:fans => :fans) {
+ attributes :id, :first_name, :last_name, :name, :location, :photo_url
+
+ node :is_friend do |fan|
+ fan.friends?(current_user)
+ end
+ }
+end
+
+unless @search.recordings.nil? || @search.recordings.size == 0
+ child(:recordings => :recordings) {
+ attributes :id, :name
+ }
+end
+
+unless @search.friends.nil? || @search.friends.size == 0
+ child(:friends => :friends) {
+ attributes :id, :first_name, :last_name, :name, :location, :email, :online, :photo_url, :musician
+ }
+end
diff --git a/web/app/views/api_users/band_following_index.rabl b/web/app/views/api_users/band_following_index.rabl
new file mode 100644
index 000000000..0e49c2b49
--- /dev/null
+++ b/web/app/views/api_users/band_following_index.rabl
@@ -0,0 +1,21 @@
+collection @user.band_followings
+
+node :band_id do |following|
+ following.id
+end
+
+node :name do |following|
+ following.name
+end
+
+node :location do |following|
+ following.location
+end
+
+node :photo_url do |following|
+ following.photo_url
+end
+
+node :logo_url do |following|
+ following.logo_url
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/band_following_show.rabl b/web/app/views/api_users/band_following_show.rabl
new file mode 100644
index 000000000..ad7786535
--- /dev/null
+++ b/web/app/views/api_users/band_following_show.rabl
@@ -0,0 +1,3 @@
+object @following
+
+attributes :id, :band_id, :follower_id
\ No newline at end of file
diff --git a/web/app/views/api_users/band_index.rabl b/web/app/views/api_users/band_index.rabl
new file mode 100644
index 000000000..6ac9c409c
--- /dev/null
+++ b/web/app/views/api_users/band_index.rabl
@@ -0,0 +1,12 @@
+collection @bands
+
+# do not retrieve all child collections when showing a list of bands
+attributes :id, :name, :location, :photo_url, :logo_url
+
+node :genres do |band|
+ unless band.genres.nil? || band.genres.size == 0
+ child :genres => :genres do
+ attributes :id, :description
+ end
+ end
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/band_invitation_index.rabl b/web/app/views/api_users/band_invitation_index.rabl
new file mode 100644
index 000000000..a385b6d03
--- /dev/null
+++ b/web/app/views/api_users/band_invitation_index.rabl
@@ -0,0 +1,3 @@
+object @invitations
+
+extends "api_users/band_invitation_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/band_invitation_show.rabl b/web/app/views/api_users/band_invitation_show.rabl
new file mode 100644
index 000000000..ffb49a994
--- /dev/null
+++ b/web/app/views/api_users/band_invitation_show.rabl
@@ -0,0 +1,15 @@
+object @invitation
+
+attributes :id, :accepted
+
+node :sender do |i|
+ { :id => i.sender.id, :name => i.sender.name }
+end
+
+node :recipient do |i|
+ { :id => i.receiver.id, :name => i.receiver.name }
+end
+
+node :band do |i|
+ { :id => i.band.id, :name => i.band.name }
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/band_invitation_update.rabl b/web/app/views/api_users/band_invitation_update.rabl
new file mode 100644
index 000000000..68a2acead
--- /dev/null
+++ b/web/app/views/api_users/band_invitation_update.rabl
@@ -0,0 +1,3 @@
+object @invitation
+
+extends "api_users/band_invitation_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/band_like_index.rabl b/web/app/views/api_users/band_like_index.rabl
new file mode 100644
index 000000000..7283388cd
--- /dev/null
+++ b/web/app/views/api_users/band_like_index.rabl
@@ -0,0 +1,27 @@
+object @user.band_likes
+
+attributes :band_id
+
+node :name do |like|
+ like.band.name
+end
+
+node :city do |like|
+ like.band.city
+end
+
+node :state do |like|
+ like.band.state
+end
+
+node :country do |like|
+ like.band.country
+end
+
+node :photo_url do |like|
+ like.band.photo_url
+end
+
+node :logo_url do |like|
+ like.band.logo_url
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/create.rabl b/web/app/views/api_users/create.rabl
new file mode 100644
index 000000000..e7df79f18
--- /dev/null
+++ b/web/app/views/api_users/create.rabl
@@ -0,0 +1,3 @@
+object @user
+
+extends "api_users/show"
\ No newline at end of file
diff --git a/web/app/views/api_users/favorite_create.rabl b/web/app/views/api_users/favorite_create.rabl
new file mode 100644
index 000000000..4e83898ba
--- /dev/null
+++ b/web/app/views/api_users/favorite_create.rabl
@@ -0,0 +1,3 @@
+object @user.favorites
+
+extends "api_users/favorite_index"
\ No newline at end of file
diff --git a/web/app/views/api_users/favorite_index.rabl b/web/app/views/api_users/favorite_index.rabl
new file mode 100644
index 000000000..8c5da0be7
--- /dev/null
+++ b/web/app/views/api_users/favorite_index.rabl
@@ -0,0 +1,11 @@
+object @user.favorites
+
+attributes :recording_id
+
+node :description do |favorite|
+ favorite.recording.description
+end
+
+node :public do |favorite|
+ favorite.recording.public
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/follower_index.rabl b/web/app/views/api_users/follower_index.rabl
new file mode 100644
index 000000000..418c61503
--- /dev/null
+++ b/web/app/views/api_users/follower_index.rabl
@@ -0,0 +1,21 @@
+collection @user.followers
+
+node :user_id do |follower|
+ follower.id
+end
+
+node :name do |follower|
+ follower.name
+end
+
+node :location do |follower|
+ follower.location
+end
+
+node :musician do |follower|
+ follower.musician
+end
+
+node :photo_url do |follower|
+ follower.photo_url
+end
diff --git a/web/app/views/api_users/following_create.rabl b/web/app/views/api_users/following_create.rabl
new file mode 100644
index 000000000..c95a073e0
--- /dev/null
+++ b/web/app/views/api_users/following_create.rabl
@@ -0,0 +1,3 @@
+object @user.followings
+
+extends "api_users/following_index"
\ No newline at end of file
diff --git a/web/app/views/api_users/following_index.rabl b/web/app/views/api_users/following_index.rabl
new file mode 100644
index 000000000..4c7941f2f
--- /dev/null
+++ b/web/app/views/api_users/following_index.rabl
@@ -0,0 +1,21 @@
+collection @user.followings
+
+node :user_id do |following|
+ following.id
+end
+
+node :name do |following|
+ following.name
+end
+
+node :location do |following|
+ following.location
+end
+
+node :musician do |following|
+ following.musician
+end
+
+node :photo_url do |following|
+ following.photo_url
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/following_show.rabl b/web/app/views/api_users/following_show.rabl
new file mode 100644
index 000000000..fff81526b
--- /dev/null
+++ b/web/app/views/api_users/following_show.rabl
@@ -0,0 +1,3 @@
+object @following
+
+attributes :id, :user_id, :follower_id
\ No newline at end of file
diff --git a/web/app/views/api_users/friend_index.rabl b/web/app/views/api_users/friend_index.rabl
new file mode 100644
index 000000000..40eb8fd7c
--- /dev/null
+++ b/web/app/views/api_users/friend_index.rabl
@@ -0,0 +1,3 @@
+object @user.friends
+
+attributes :id, :first_name, :last_name, :name, :location, :city, :state, :country, :email, :online, :photo_url
\ No newline at end of file
diff --git a/web/app/views/api_users/friend_request_create.rabl b/web/app/views/api_users/friend_request_create.rabl
new file mode 100644
index 000000000..6f79cfc24
--- /dev/null
+++ b/web/app/views/api_users/friend_request_create.rabl
@@ -0,0 +1,3 @@
+object @friend_request
+
+extends "api_users/friend_request_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/friend_request_index.rabl b/web/app/views/api_users/friend_request_index.rabl
new file mode 100644
index 000000000..5d5261574
--- /dev/null
+++ b/web/app/views/api_users/friend_request_index.rabl
@@ -0,0 +1,3 @@
+object @friend_requests
+
+extends "api_users/friend_request_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/friend_request_show.rabl b/web/app/views/api_users/friend_request_show.rabl
new file mode 100644
index 000000000..a0bb6df49
--- /dev/null
+++ b/web/app/views/api_users/friend_request_show.rabl
@@ -0,0 +1,3 @@
+object @friend_request
+
+attributes :id, :user_id, :friend_id, :status, :message, :created_at
\ No newline at end of file
diff --git a/web/app/views/api_users/friend_request_update.rabl b/web/app/views/api_users/friend_request_update.rabl
new file mode 100644
index 000000000..6f79cfc24
--- /dev/null
+++ b/web/app/views/api_users/friend_request_update.rabl
@@ -0,0 +1,3 @@
+object @friend_request
+
+extends "api_users/friend_request_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/friend_show.rabl b/web/app/views/api_users/friend_show.rabl
new file mode 100644
index 000000000..27bb3275e
--- /dev/null
+++ b/web/app/views/api_users/friend_show.rabl
@@ -0,0 +1,3 @@
+object @friend
+
+attributes :id, :user_id, :friend_id
\ No newline at end of file
diff --git a/web/app/views/api_users/index.rabl b/web/app/views/api_users/index.rabl
new file mode 100644
index 000000000..8f9bbf9a7
--- /dev/null
+++ b/web/app/views/api_users/index.rabl
@@ -0,0 +1,4 @@
+collection @users
+
+# do not retrieve all child collections when showing a list of users
+attributes :id, :first_name, :last_name, :name, :city, :state, :country, :email, :online, :musician, :photo_url
\ No newline at end of file
diff --git a/web/app/views/api_users/like_create.rabl b/web/app/views/api_users/like_create.rabl
new file mode 100644
index 000000000..426460cc7
--- /dev/null
+++ b/web/app/views/api_users/like_create.rabl
@@ -0,0 +1,3 @@
+object @user.likes
+
+extends "api_users/like_index"
\ No newline at end of file
diff --git a/web/app/views/api_users/like_index.rabl b/web/app/views/api_users/like_index.rabl
new file mode 100644
index 000000000..1976ef29f
--- /dev/null
+++ b/web/app/views/api_users/like_index.rabl
@@ -0,0 +1,31 @@
+object @user.likes
+
+attributes :user_id
+
+node :first_name do |like|
+ like.user.first_name
+end
+
+node :last_name do |like|
+ like.user.last_name
+end
+
+node :city do |like|
+ like.user.city
+end
+
+node :state do |like|
+ like.user.state
+end
+
+node :country do |like|
+ like.user.country
+end
+
+node :musician do |like|
+ like.user.musician
+end
+
+node :photo_url do |like|
+ like.user.photo_url
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/liker_index.rabl b/web/app/views/api_users/liker_index.rabl
new file mode 100644
index 000000000..cbdf608bc
--- /dev/null
+++ b/web/app/views/api_users/liker_index.rabl
@@ -0,0 +1,31 @@
+object @user.likers
+
+attributes :liker_id => :user_id
+
+node :first_name do |liker|
+ liker.user.first_name
+end
+
+node :last_name do |liker|
+ liker.user.last_name
+end
+
+node :city do |liker|
+ liker.user.city
+end
+
+node :state do |liker|
+ liker.user.state
+end
+
+node :country do |liker|
+ liker.user.country
+end
+
+node :musician do |liker|
+ liker.user.musician
+end
+
+node :photo_url do |liker|
+ liker.user.photo_url
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/notification_index.rabl b/web/app/views/api_users/notification_index.rabl
new file mode 100644
index 000000000..23f80c077
--- /dev/null
+++ b/web/app/views/api_users/notification_index.rabl
@@ -0,0 +1,7 @@
+collection @notifications
+
+attributes :description, :source_user_id, :target_user_id, :session_id, :recording_id, :invitation_id, :join_request_id, :friend_request_id, :formatted_msg, :created_at, :photo_url
+
+node :notification_id do |n|
+ n.id
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/recording_create.rabl b/web/app/views/api_users/recording_create.rabl
new file mode 100644
index 000000000..8d8826efe
--- /dev/null
+++ b/web/app/views/api_users/recording_create.rabl
@@ -0,0 +1,3 @@
+object @recording
+
+extends "api_users/recording_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/recording_index.rabl b/web/app/views/api_users/recording_index.rabl
new file mode 100644
index 000000000..d0bf502d6
--- /dev/null
+++ b/web/app/views/api_users/recording_index.rabl
@@ -0,0 +1,12 @@
+collection @recordings
+
+attributes :id, :description, :public, :favorite_count
+
+node :genres do |recording|
+ unless recording.genres.nil? || recording.genres.size == 0
+ child :genres => :genres do
+ attributes :id, :description
+ #partial('api_genres/index', :object => recording.genres)
+ end
+ end
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/recording_show.rabl b/web/app/views/api_users/recording_show.rabl
new file mode 100644
index 000000000..f0248d79c
--- /dev/null
+++ b/web/app/views/api_users/recording_show.rabl
@@ -0,0 +1,12 @@
+object @recording
+
+attributes :id, :description, :public, :favorite_count
+
+unless @recording.genres.nil? || @recording.genres.size == 0
+ child :genres => :genres do
+ attributes :id, :description
+ #partial('api_genres/index', :object => @band.genres)
+ end
+end
+
+#TODO: show the Users that have added this Recording as a Favorite ONLY IF the owning user has "Better Analytics service level"
\ No newline at end of file
diff --git a/web/app/views/api_users/recording_update.rabl b/web/app/views/api_users/recording_update.rabl
new file mode 100644
index 000000000..8d8826efe
--- /dev/null
+++ b/web/app/views/api_users/recording_update.rabl
@@ -0,0 +1,3 @@
+object @recording
+
+extends "api_users/recording_show"
\ No newline at end of file
diff --git a/web/app/views/api_users/session_history_index.rabl b/web/app/views/api_users/session_history_index.rabl
new file mode 100644
index 000000000..4ba35abc2
--- /dev/null
+++ b/web/app/views/api_users/session_history_index.rabl
@@ -0,0 +1,7 @@
+object @session_history
+
+attributes :music_session_id, :user_id, :description, :band_id, :genres
+
+child :music_session_user_histories => :participants do
+ attributes :client_id, :user_id
+end
\ No newline at end of file
diff --git a/web/app/views/api_users/session_user_history_index.rabl b/web/app/views/api_users/session_user_history_index.rabl
new file mode 100644
index 000000000..73b769c16
--- /dev/null
+++ b/web/app/views/api_users/session_user_history_index.rabl
@@ -0,0 +1,3 @@
+object @session_user_history
+
+attributes :music_session_id, :user_id, :client_id
\ No newline at end of file
diff --git a/web/app/views/api_users/show.rabl b/web/app/views/api_users/show.rabl
new file mode 100644
index 000000000..09a5bb4bf
--- /dev/null
+++ b/web/app/views/api_users/show.rabl
@@ -0,0 +1,31 @@
+object @user
+
+attributes :id, :first_name, :last_name, :name, :city, :state, :country, :location, :online, :photo_url, :musician, :gender, :birth_date, :internet_service_provider, :friend_count, :liker_count, :like_count, :band_like_count, :follower_count, :following_count, :band_following_count, :recording_count, :session_count
+
+# give back more info if the user being fetched is yourself
+if @user == current_user
+ attributes :email, :original_fpfile, :cropped_fpfile, :crop_selection, :session_settings
+end
+
+unless @user.friends.nil? || @user.friends.size == 0
+ child :friends => :friends do
+ attributes :id, :first_name, :last_name, :online
+ end
+end
+
+unless @user.bands.nil? || @user.bands.size == 0
+ child :band_musicians => :bands do
+ attributes :id, :name, :admin, :photo_url, :logo_url
+
+ child :genres => :genres do
+ attributes :id, :description
+ #partial('api_genres/index', :object => @user.bands.genres)
+ end
+ end
+end
+
+unless @user.instruments.nil? || @user.instruments.size == 0
+ child :musician_instruments => :instruments do
+ attributes :description, :proficiency_level, :priority, :instrument_id
+ end
+end
diff --git a/web/app/views/api_users/signup_confirm.rabl b/web/app/views/api_users/signup_confirm.rabl
new file mode 100644
index 000000000..e7df79f18
--- /dev/null
+++ b/web/app/views/api_users/signup_confirm.rabl
@@ -0,0 +1,3 @@
+object @user
+
+extends "api_users/show"
\ No newline at end of file
diff --git a/web/app/views/api_users/update.rabl b/web/app/views/api_users/update.rabl
new file mode 100644
index 000000000..e7df79f18
--- /dev/null
+++ b/web/app/views/api_users/update.rabl
@@ -0,0 +1,3 @@
+object @user
+
+extends "api_users/show"
\ No newline at end of file
diff --git a/web/app/views/artifacts/versioncheck.html.erb b/web/app/views/artifacts/versioncheck.html.erb
new file mode 100644
index 000000000..417e14a28
--- /dev/null
+++ b/web/app/views/artifacts/versioncheck.html.erb
@@ -0,0 +1,10 @@
+
+
+
+ <%= image_tag "logo.png" %>
+ New version available
+
+ Version <%= @artifact.version %> is now released on http://jamkazam.com
+ Please download directly from here.
+
diff --git a/web/app/views/clients/_account.html.erb b/web/app/views/clients/_account.html.erb
new file mode 100644
index 000000000..0bd1a893c
--- /dev/null
+++ b/web/app/views/clients/_account.html.erb
@@ -0,0 +1,111 @@
+
+
+
+
+
+ my account
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_account_audio_profile.html.erb b/web/app/views/clients/_account_audio_profile.html.erb
new file mode 100644
index 000000000..236bd2c8b
--- /dev/null
+++ b/web/app/views/clients/_account_audio_profile.html.erb
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+ my account
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_account_identity.html.erb b/web/app/views/clients/_account_identity.html.erb
new file mode 100644
index 000000000..f99233cce
--- /dev/null
+++ b/web/app/views/clients/_account_identity.html.erb
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+ my account
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_account_profile.html.erb b/web/app/views/clients/_account_profile.html.erb
new file mode 100644
index 000000000..bbd0e8be7
--- /dev/null
+++ b/web/app/views/clients/_account_profile.html.erb
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+ my account
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_account_profile_avatar.html.erb b/web/app/views/clients/_account_profile_avatar.html.erb
new file mode 100644
index 000000000..57ff42942
--- /dev/null
+++ b/web/app/views/clients/_account_profile_avatar.html.erb
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+ my account
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_addNewGear.html.erb b/web/app/views/clients/_addNewGear.html.erb
new file mode 100644
index 000000000..462040b57
--- /dev/null
+++ b/web/app/views/clients/_addNewGear.html.erb
@@ -0,0 +1,16 @@
+
+
+
+ <%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :class => 'content-icon' } %>
+ add new audio gear
+
+
+ To add a new audio device, you must exit your current session and test the device using the JamKazam automated test feature.
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_addTrack.html.erb b/web/app/views/clients/_addTrack.html.erb
new file mode 100644
index 000000000..596b2884a
--- /dev/null
+++ b/web/app/views/clients/_addTrack.html.erb
@@ -0,0 +1,63 @@
+
+
+
+ <%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :class => 'content-icon' } %>
+ add a track
+
+
+
+ Use arrow buttons to assign audio inputs to this new track, and choose what instrument you are playing on this track. Please note that you may only use one audio device for all audio inputs and outputs. If you don't see an audio device you think should be listed view this help topic to understand why.
+
+
+
+
+
+
+ Unused Inputs:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Track 2 Input:
+
+
+
+
+
+
+
+ Track 2 Instrument:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_bands.html.erb b/web/app/views/clients/_bands.html.erb
new file mode 100644
index 000000000..8505890b1
--- /dev/null
+++ b/web/app/views/clients/_bands.html.erb
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+ bands
+ <%= render "screen_navigation" %>
+
+ This feature not yet implemented
+
diff --git a/web/app/views/clients/_banner.html.erb b/web/app/views/clients/_banner.html.erb
new file mode 100644
index 000000000..9a932e3a9
--- /dev/null
+++ b/web/app/views/clients/_banner.html.erb
@@ -0,0 +1,18 @@
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_client_update.html.erb b/web/app/views/clients/_client_update.html.erb
new file mode 100644
index 000000000..7861217b0
--- /dev/null
+++ b/web/app/views/clients/_client_update.html.erb
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_configureTrack.html.erb b/web/app/views/clients/_configureTrack.html.erb
new file mode 100644
index 000000000..b05eddd01
--- /dev/null
+++ b/web/app/views/clients/_configureTrack.html.erb
@@ -0,0 +1,184 @@
+
+
+
+ <%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :class => 'content-icon' } %>
+ configure tracks
+
+
+
+ Music Audio
+ Voice Chat
+
+
+
+
+
+
+
+
+
+
+
+
+ Audio Device:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Unused Inputs:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Track 1 Input:
+
+
+
+
+
+
+ Track 1 Instrument:
+
+
+
+
+
+
+
+
+
+
+ Track 2 Input:
+
+
+
+
+
+
+ Track 2 Instrument:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Unused Outputs:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Session Audio Output:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CANCEL
+ UPDATE SETTINGS
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_createSession.html.erb b/web/app/views/clients/_createSession.html.erb
new file mode 100644
index 000000000..97336c799
--- /dev/null
+++ b/web/app/views/clients/_createSession.html.erb
@@ -0,0 +1,185 @@
+
+
+
+
+
+
+<%= render "friendSelector" %>
+<%= render "invitation" %>
+
+
+
+
+
+
diff --git a/web/app/views/clients/_error.html.erb b/web/app/views/clients/_error.html.erb
new file mode 100644
index 000000000..f1c131e73
--- /dev/null
+++ b/web/app/views/clients/_error.html.erb
@@ -0,0 +1,15 @@
+
+
+
+ <%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :class => 'content-icon' } %>
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_faders.html.erb b/web/app/views/clients/_faders.html.erb
new file mode 100644
index 000000000..fd4a33046
--- /dev/null
+++ b/web/app/views/clients/_faders.html.erb
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_feed.html.erb b/web/app/views/clients/_feed.html.erb
new file mode 100644
index 000000000..5f09c1720
--- /dev/null
+++ b/web/app/views/clients/_feed.html.erb
@@ -0,0 +1,12 @@
+
+
+
+
+
+ feed
+ <%= render "screen_navigation" %>
+
+ This feature not yet implemented
+
diff --git a/web/app/views/clients/_findSession.html.erb b/web/app/views/clients/_findSession.html.erb
new file mode 100644
index 000000000..47d32b786
--- /dev/null
+++ b/web/app/views/clients/_findSession.html.erb
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+ find a session
+
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_footer.html.erb b/web/app/views/clients/_footer.html.erb
new file mode 100644
index 000000000..adb4012d0
--- /dev/null
+++ b/web/app/views/clients/_footer.html.erb
@@ -0,0 +1,14 @@
+
+
+
diff --git a/web/app/views/clients/_friendSelector.html.erb b/web/app/views/clients/_friendSelector.html.erb
new file mode 100644
index 000000000..159f9a49f
--- /dev/null
+++ b/web/app/views/clients/_friendSelector.html.erb
@@ -0,0 +1,27 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_ftue.html.erb b/web/app/views/clients/_ftue.html.erb
new file mode 100644
index 000000000..3a1e5b1db
--- /dev/null
+++ b/web/app/views/clients/_ftue.html.erb
@@ -0,0 +1,276 @@
+
+
+
+ audio gear setup
+
+
+
+
+
+
+
+
+ Please identify which of the three types of audio gear below you
+ are going to use with the JamKazam service, and click one to
+ watch a video on how to navigate this initial setup and testing
+ process. After watching the video, click the 'NEXT' button to
+ get started. If you don't have your audio gear handy now, click
+ Cancel.
+
+
+
+ -
+ AUDIO DEVICE WITH PORTS FOR INSTRUMENT OR MIC INPUT JACKS
+ <%= image_tag "content/audio_capture_ftue.png", {:width => 243, :height => 70} %>
+
+ -
+ USB MICROPHONE
+ <%= image_tag "content/microphone_ftue.png", {:width => 70, :height => 113} %>
+
+ -
+ COMPUTER'S BUILT-IN MIC & SPEAKERS/HEADPHONES
+ <%= image_tag "content/computer_ftue.png", {:width => 118, :height => 105} %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_genreSelector.html.erb b/web/app/views/clients/_genreSelector.html.erb
new file mode 100644
index 000000000..d63a04089
--- /dev/null
+++ b/web/app/views/clients/_genreSelector.html.erb
@@ -0,0 +1,3 @@
+
diff --git a/web/app/views/clients/_header.html.erb b/web/app/views/clients/_header.html.erb
new file mode 100644
index 000000000..e61a45c46
--- /dev/null
+++ b/web/app/views/clients/_header.html.erb
@@ -0,0 +1,85 @@
+
+
+
diff --git a/web/app/views/clients/_home.html.erb b/web/app/views/clients/_home.html.erb
new file mode 100644
index 000000000..1ae839f61
--- /dev/null
+++ b/web/app/views/clients/_home.html.erb
@@ -0,0 +1,72 @@
+
+
+ <% if @nativeClient %>
+
+
+ create session
+
+
+
+
+ find session
+
+
+
+
+ profile
+
+
+
+
+ feed
+
+
+
+
+ account
+
+
+
+
+ <% else %>
+
+
+ feed
+
+
+
+
+ bands
+
+
+
+
+ musicians
+
+
+
+
+ profile
+
+
+
+
+ account
+
+
+
+
+ <% end %>
+
+
diff --git a/web/app/views/clients/_invitation.html.erb b/web/app/views/clients/_invitation.html.erb
new file mode 100644
index 000000000..5e80baacc
--- /dev/null
+++ b/web/app/views/clients/_invitation.html.erb
@@ -0,0 +1,28 @@
+
+
diff --git a/web/app/views/clients/_musicians.html.erb b/web/app/views/clients/_musicians.html.erb
new file mode 100644
index 000000000..4a6eac046
--- /dev/null
+++ b/web/app/views/clients/_musicians.html.erb
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+ musicians
+ <%= render "screen_navigation" %>
+
+ This feature not yet implemented
+
diff --git a/web/app/views/clients/_notify.html.erb b/web/app/views/clients/_notify.html.erb
new file mode 100644
index 000000000..d865136cf
--- /dev/null
+++ b/web/app/views/clients/_notify.html.erb
@@ -0,0 +1,15 @@
+
+
diff --git a/web/app/views/clients/_overlay_small.html.erb b/web/app/views/clients/_overlay_small.html.erb
new file mode 100644
index 000000000..199712e10
--- /dev/null
+++ b/web/app/views/clients/_overlay_small.html.erb
@@ -0,0 +1,18 @@
+
\ No newline at end of file
diff --git a/web/app/views/clients/_profile.html.erb b/web/app/views/clients/_profile.html.erb
new file mode 100644
index 000000000..70ec227df
--- /dev/null
+++ b/web/app/views/clients/_profile.html.erb
@@ -0,0 +1,126 @@
+
+
+
+
+
+ musician profile
+
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_screen_navigation.html.erb b/web/app/views/clients/_screen_navigation.html.erb
new file mode 100644
index 000000000..230e076a6
--- /dev/null
+++ b/web/app/views/clients/_screen_navigation.html.erb
@@ -0,0 +1,6 @@
+
+
diff --git a/web/app/views/clients/_searchResults.html.erb b/web/app/views/clients/_searchResults.html.erb
new file mode 100644
index 000000000..3d68961a1
--- /dev/null
+++ b/web/app/views/clients/_searchResults.html.erb
@@ -0,0 +1,51 @@
+
+
+
+
+ search results
+ <%= render "screen_navigation" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_session.html.erb b/web/app/views/clients/_session.html.erb
new file mode 100644
index 000000000..af1489925
--- /dev/null
+++ b/web/app/views/clients/_session.html.erb
@@ -0,0 +1,180 @@
+
+
+
+
+ session
+ <%= render "screen_navigation" %>
+
+
+
+
+
+ <%= image_tag "content/icon_resync.png", {:align => "texttop", :height => 14, :width => 12} %>
+ RESYNC
+
+
+ <%= image_tag "content/icon_settings_sm.png", {:align => "texttop", :height => 12, :width => 12} %>
+ SETTINGS
+
+
+ <%= image_tag "content/icon_share.png", {:align => "texttop", :height => 12, :width => 12} %>
+ SHARE
+
+
+
+
+ VOLUME:
+
+
+
+
+
+ MIX:
+ others
+
+ me
+
+
+
+ X LEAVE
+
+
+
+
+
+
+
+
+
+
+
+
+ my tracks
+
+
+
+
+
+
+
+
+
+
+ live tracks
+
+
+
+
+ No Live Tracks:
+ Invite Other Musicians to
+ Add Live Tracks
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%= render "configureTrack" %>
+<%= render "addTrack" %>
+<%= render "addNewGear" %>
+<%= render "error" %>
+<%= render "sessionSettings" %>
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/_sessionList.html.erb b/web/app/views/clients/_sessionList.html.erb
new file mode 100644
index 000000000..451bb286c
--- /dev/null
+++ b/web/app/views/clients/_sessionList.html.erb
@@ -0,0 +1,14 @@
+<%= title %>
+
+
+
+ GENRE
+ DESCRIPTION
+ MUSICIANS
+ AUDIENCE
+ LATENCY
+ LISTEN
+ JOIN
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/_sessionSettings.html.erb b/web/app/views/clients/_sessionSettings.html.erb
new file mode 100644
index 000000000..6dbc3d68e
--- /dev/null
+++ b/web/app/views/clients/_sessionSettings.html.erb
@@ -0,0 +1,75 @@
+
+
+
+
+
+ <%= image_tag "content/icon_settings_lg.png",
+ {:width => 18, :height => 18, :class => "content-icon"} %>
+ update session settings
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
diff --git a/web/app/views/clients/_vu_meters.html.erb b/web/app/views/clients/_vu_meters.html.erb
new file mode 100644
index 000000000..bd72905d3
--- /dev/null
+++ b/web/app/views/clients/_vu_meters.html.erb
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
diff --git a/web/app/views/clients/banners/_disconnected.html.erb b/web/app/views/clients/banners/_disconnected.html.erb
new file mode 100644
index 000000000..4a5b341be
--- /dev/null
+++ b/web/app/views/clients/banners/_disconnected.html.erb
@@ -0,0 +1,42 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/web/app/views/clients/index.html.erb b/web/app/views/clients/index.html.erb
new file mode 100644
index 000000000..d2f129f30
--- /dev/null
+++ b/web/app/views/clients/index.html.erb
@@ -0,0 +1,185 @@
+
+
+ Javascript Bridge Test
+ <%= render "screen_navigation" %> +I don't think I'm connected!
+ + +
+
+
+ Create hard-coded session
+ + +
+
+
+ Join sesssion
+ +
+
+
+ TestLatency
+ ++
+
+
+
+ GetFTUE
+ + +SetFTUE
+
+
+
+
+GetASIODevices
+ + +
+
+
+
+<%= render "header" %>
+<%= render "home" %>
+<%= render "footer" %>
+<%= render "searchResults" %>
+<%= render "faders" %>
+<%= render "vu_meters" %>
+<%= render "ftue" %>
+<%= render "sidebar" %>
+<%= render "createSession" %>
+<%= render "findSession" %>
+<%= render "session" %>
+<%= render "profile" %>
+<%= render "feed" %>
+<%= render "bands" %>
+<%= render "musicians" %>
+<%= render "testBridge" %>
+<%= render "account" %>
+<%= render "account_identity" %>
+<%= render "account_profile" %>
+<%= render "account_profile_avatar" %>
+<%= render "account_audio_profile" %>
+<%= render "notify" %>
+<%= render "client_update" %>
+<%= render "banner" %>
+<%= render "clients/banners/disconnected" %>
+<%= render "overlay_small" %>
+
+
+
+
+
+
diff --git a/web/app/views/corps/about.html.erb b/web/app/views/corps/about.html.erb
new file mode 100644
index 000000000..3aff18037
--- /dev/null
+++ b/web/app/views/corps/about.html.erb
@@ -0,0 +1,9 @@
+<% provide(:title, 'About') %>
+<% provide(:purpose, 'about') %>
+
+ 
+
+
+ Connecting...
+About Us
+ +The JamKazam team loves music, and in particular live music. We’ve combined our passion for live music and technology to make it far easier for musicians to play live with each other.
+ +Using JamKazam, you can now play music with other musicians from your homes across the Internet as if you were sitting in the same room. You can record your performances at the track level, share your recordings, and even broadcast your live sessions to family, friends, and fans.
+ +We hope you enjoy using the service, making more musician friends, and making more live music!
diff --git a/web/app/views/corps/contact.html.erb b/web/app/views/corps/contact.html.erb new file mode 100644 index 000000000..f1eedfeec --- /dev/null +++ b/web/app/views/corps/contact.html.erb @@ -0,0 +1,36 @@ +<% provide(:title, 'Contact') %> +<% provide(:purpose, 'contact') %> +Contact
+ +Thank you for your interest in JamKazam. Depending on your specific interest, please use one of the following avenues to reach out to us. We look forward to hearing from you!
+Support
+For technical support and help using our products and services, please visit the JamKazam Support Center.
+Partnerships
+For partnering inquiries, please contact us at: partners@jamkazam.com.
+Media
+For inquiries from traditional media, bloggers, and others interested in sharing news and information about us with others, please visit the <%= link_to "JamKazam Media Center", corp_media_center_path %>, and you may also contact us at pr@jamkazam.com.
+Infringement
+To report content hosted on the JamKazam platform that that infringes your copyright or the copyright of a third party on whose behalf you are entitled to act, please see the Reporting Infringements section of the JamKazam Terms of Service.
+General
+For general inquiries, please contact us at: info@jamkazam.com.
+Feedback:
+ ++ + \ No newline at end of file diff --git a/web/app/views/corps/cookie_policy.html.erb b/web/app/views/corps/cookie_policy.html.erb new file mode 100644 index 000000000..675da3d07 --- /dev/null +++ b/web/app/views/corps/cookie_policy.html.erb @@ -0,0 +1,84 @@ +<% provide(:title, 'Cookies Policy') %> +<% provide(:purpose, 'cookie_policy') %> + +
Cookies Policy
+ +This Cookies Policy forms part of our general Privacy Policy. You can read the full Privacy + Policy <%= link_to "here", privacy_path %>.
+In common with most other websites, we use cookies and similar technologies to help us understand how people use + JamKazam so that we can keep improving our Platform. We have created this Cookies Policy to provide you with clear and + explicit information about the technologies that we use on JamKazam, and your choices when it comes to these + technologies.
+If you choose to use the Platform without blocking or disabling cookies or opting out of other technologies, you will + indicate your consent to our use of these cookies and other technologies and to our use (in accordance with this + policy and the rest of our Privacy Policy) of any personal information that we collect using these technologies. If + you do not consent to the use of these technologies, please be sure to block or disable cookies using your browser + settings and/or the settings within our mobile apps.
+ +What are cookies?
+Cookies are small text files that are placed on your computer by websites that you visit. These text files can be + read by these websites and help to identify you when you return to a website. Cookies can be “persistent” or “session” + cookies. Persistent cookies remain on your computer when you have gone offline, while session cookies are deleted as + soon as you close your web browser.
+To find out more about cookies, including how to see what cookies have been set and how to block and delete cookies, + please visit http://www.aboutcookies.org/.
+ +JamKazam Cookies
+We use our own cookies to recognize you when you visit our website or use our apps. This means that you don’t have to + log in each time you visit, and we can remember your preferences and settings. JamKazam cookie names are currently + “_jamkazam_session”, “client_id”, and “remember_token”.
+ +Third Party Cookies
+In addition to our own cookies, we work with various reputable companies to help us analyze how the Platform is used, + and to optimize our Website and Apps to deliver the best possible experience. The following companies help us achieve + this through use of cookies:
+ +Google Analytics and Google Web Optimizer
+Google Analytics and Google Web Optimizer are services provided by Google, Inc. (“Google”). Google Analytics uses + cookies to help us analyze how users use our website, our mobile site, our Apps, and any JamKazam widgets embedded on + third party sites. Google Web Optimizer uses the same cookies to measure how different users respond to different + content. The information generated by these cookies (including your truncated IP address) is transmitted to and stored + by Google on servers in the United States. Google will use this information for the purpose of evaluating your, and + other users’, use of our website, mobile site, Apps, and JamKazam widgets, compiling reports for us on website + activity and providing other services relating to website activity and Internet usage. Please note that Google only + receives your truncated IP address. This is sufficient for Google to identify (approximately) the country from which + you are visiting our sites or accessing our players, but is not sufficient to identify you, or your computer or mobile + device, individually.
+Google cookies are those beginning “__ut”.
+You can find more information here, + including a link to Google’s privacy + policy.
+ +Similar Technologies
+In addition to cookies, we also use the following standard Internet technologies in connection with your use of the + Platform:
+Clear GIFs: We sometimes use “clear GIFs”, also known as “web bugs”, which are small image files that we embed into + our email newsletters. These clear GIFs tell us whether you opened the newsletter, clicked on any of the content or + forwarded the newsletter to someone else. This provides us with useful information regarding the effectiveness of our + email newsletters, which we can use to ensure that we are delivering information that is relevant to our users.
+Support: We work with Desk.com, a subsidiary of Salesforce.com, (“Desk.com”) to provide support to our users, and we + use Desk.com’s identity integration to automate our users’ access to Desk.com support accounts, so that you do not + have to set up separate accounts for JamKazam support services. + Click here to review Desk.com’s privacy policy.
+ +Cookie Controls
+You can use the settings within your browser to control the cookies that are set on your computer or mobile device. + However, please be aware that cookies are important to many aspects for the Platform – if you set your browser to + reject cookies, you may not be able to enjoy all of the features of the Platform. To find out how to see what cookies + have been set and how to reject and delete cookies, please + visit http://www.aboutcookies.org.
+To opt-out of analysis by Google Analytics on our website and other websites, please visit + http://tools.google.com/dlpage/gaoptout.
+ +Consent to Cookies and Similar Technologies
+We have done our best to provide you with clear and comprehensive information about our use of cookies and similar + technologies. If you choose to use the Platform without blocking or disabling cookies or opting out of these + technologies (as described above), you will indicate your consent to our use of these cookies and other technologies + and to our use (in accordance with this policy and our Privacy Policy) of any personal information that we collect + using these technologies. If you do not consent to the use of these technologies, please be sure to block or disable + them using your browser settings, and/or choose not to use the JamKazam service.
+ ++ +
Effective Date: 1 August 2013
+ diff --git a/web/app/views/corps/help.html.erb b/web/app/views/corps/help.html.erb new file mode 100644 index 000000000..e5d6f7654 --- /dev/null +++ b/web/app/views/corps/help.html.erb @@ -0,0 +1,13 @@ +<% provide(:title, 'Help') %> +<% provide(:purpose, 'help') %> +Help
+ +To get help, please visit the JamKazam support center using the JamKazam Support link below. JamKazam uses the + Desk.com service to provide support. In the support center, you can browse knowledge base articles and search other + support cases to see if an answer to your question is already available. And if not, you can post your question there, + and we'll reply as soon as we can. When you click the JamKazam Support link, we'll automatically sign you into our + Desk.com service using your JamKazam credentials, so you won't have to register for a separate support account.
+ + \ No newline at end of file diff --git a/web/app/views/corps/media_center.html.erb b/web/app/views/corps/media_center.html.erb new file mode 100644 index 000000000..9652112bf --- /dev/null +++ b/web/app/views/corps/media_center.html.erb @@ -0,0 +1,58 @@ +<% provide(:title, 'Media Center') %> +<% provide(:purpose, 'media_center') %> + +Media Center
++
+
|
+ <%= image_tag("content/icon_product.png", height: '58', width: '58') %>
+
+ + + Product Information++ +
|
+
+
+ <%= image_tag("content/icon_users.png", height: '58', width: '58') %>
+ + + User Examples++ +
|
+
+ <%= image_tag("content/icon_pr.png", height: '58', width: '58') %>
+ + + Press Releases++ +
|
+
News
+August 27, 2013 -- Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. READ MORE �
+ +August 15, 2013 -- Aliquam et nisl vel ligula consectetuer suscipit. Morbi euismod enim eget neque. Donec sagittis massa. Vestibulum quis augue sit amet ipsum laoreet pretium. Nulla facilisi. READ MORE �
+ +August 2, 2013 -- Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. READ MORE �
+ +July 12, 2013 -- Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. READ MORE �
+ +July 7, 2013 -- Aliquam et nisl vel ligula consectetuer suscipit. Morbi euismod enim eget neque. Donec sagittis massa. Vestibulum quis augue sit amet ipsum laoreet pretium. Nulla facilisi. READ MORE �
+ + + +