VRFS-986 landing page work

ruby/lib/jam_ruby/models/music_session_history.rb

@@ -15,6 +15,7 @@ module JamRuby
                :foreign_key => :band_id,                
                :inverse_of => :music_session_history)
 
+    has_many :music_session_history_users, :class_name => "JamRuby::MusicSessionUserHistory", :foreign_key => "music_session_id"
     has_many :comments, :class_name => "JamRuby::MusicSessionComment", :foreign_key => "music_session_id"
     has_many :likes, :class_name => "JamRuby::MusicSessionLiker", :foreign_key => "music_session_id"
 

ruby/lib/jam_ruby/models/music_session_user_history.rb

@@ -12,6 +12,10 @@ module JamRuby
                :foreign_key => "user_id", 
                :inverse_of => :music_session_user_histories)
 
+    belongs_to(:music_session_history, 
+               :class_name => "MusicSessionHistory",
+               :foreign_key => "music_session_id")
+
     validates_inclusion_of :rating, :in => 0..2, :allow_nil => true
     after_save :track_user_progression
 

web/app/controllers/music_sessions_controller.rb

@@ -1,50 +1,10 @@
 class MusicSessionsController < ApplicationController
 
-  # have to be signed in currently to see this screen
-  before_filter :signed_in_user
-
   respond_to :html
 
-  def index
-    @music_sessions = MusicSession.paginate(page: params[:page])
-  end
-
   def show
-    @music_session = MusicSession.find(params[:id])
-
-    # use gon to pass variables into javascript
-    gon.websocket_gateway_uri = Rails.application.config.websocket_gateway_uri
-    gon.music_session_id = @music_session.id
-  end
-
-  def new
-    @music_session = MusicSession.new
-  end
-
-  def create
-    @music_session = MusicSession.new()
-    @music_session.creator = current_user
-    @music_session.description = params[:jam_ruby_music_session][:description]
-    if @music_session.save
-      flash[:success] = "Music Session created"
-      redirect_to @music_session
-    else
-      render 'new'
-    end
-  end
-
-
-  def edit
-  end
-
-  def update
-
-  end
-
-  def destroy
-    MusicSession.find(params[:id]).destroy
-    flash[:success] = "Jam Session deleted."
-    redirect_to music_sessions_url
+    @music_session = MusicSessionHistory.find_by_music_session_id(params[:id])
+    render :layout => "web"
   end
 
 end

web/app/views/music_sessions/show.html.erb

@@ -1,32 +1,32 @@
-<% provide(:title, "#{@claimed_recording.name}") %>
+<% provide(:title, "#{@music_session.description}") %>
 
 <div class="landing-band">
-  <% unless @claimed_recording.recording.band.nil? %>
+  <% unless @music_session.band.nil? %>
     <div class="landing-avatar">
-      <% unless @claimed_recording.recording.band.photo_url.blank? %>
-        <%= image_tag "#{@claimed_recording.recording.band.photo_url}", {:alt => ""} %>
+      <% unless @music_session.band.photo_url.blank? %>
+        <%= image_tag "#{@music_session.band.photo_url}", {:alt => ""} %>
       <% else %>
         <%= image_tag "shared/avatar_generic_band.png", {:alt => ""} %>
       <% end %>
     </div>
-    <%= @claimed_recording.recording.band.name %>
+    <%= @music_session.band.name %>
   <% else %>
     <div class="landing-avatar">
-      <% unless @claimed_recording.recording.owner.photo_url.blank? %>
-        <%= image_tag "#{@claimed_recording.recording.owner.photo_url}", {:alt => ""} %>
+      <% unless @music_session.creator.photo_url.blank? %>
+        <%= image_tag "#{@music_session.creator.photo_url}", {:alt => ""} %>
       <% else %>
         <%= image_tag "shared/avatar_generic.png", {:alt => ""} %>
       <% end %>
     </div>
-    <%= @claimed_recording.recording.owner.name %>
+    <%= @music_session.creator.name %>
   <% end %>
 </div>
 
 <div class="landing-details">
-  <div class="left f20 orange"><strong>RECORDING</strong></div>
-  <div class="right f14 grey"><%= @claimed_recording.recording.created_at.strftime("%b %e %Y, %l:%M %p") %></div>
+  <div class="left f20 teal"><strong>SESSION: Live Session in Progress</strong></div>
+  <div class="right f14 grey"><%= @cmusic_session.created_at.strftime("%b %e %Y, %l:%M %p") %></div>
   <br clear="all" /><br />
-  <h2 class="left"><%= @claimed_recording.name %></h2>
+  <h2 class="left"><%= @music_session.name %></h2>
   <div class="right">
     <a href="#"><%= image_tag "content/icon_like.png", {:width => 12, :height => 12} %>&nbsp;LIKE</a>&nbsp;&nbsp;&nbsp;
     <a href="#"><%= image_tag "content/icon_share.png", {:width => 13, :height => 15} %>&nbsp;SHARE</a>
@@ -34,22 +34,14 @@
   <br clear="all" />TODO: Which field is this in the database??<br /><br />
   <div class="w100">
     <div class="recording-controls">
-      <a class="left" href="#"><%= image_tag "content/icon_playbutton.png", {:width => 20, :height => 20} %></a>
-      <div class="recording-position">
-        <div class="recording-time">0:00</div>
-        <div class="recording-playback">
-          <div class="recording-slider"><%= image_tag "content/slider_playcontrols.png", {:width => 5, :height => 16} %></div>
-        </div>
-        <div class="recording-time">4:59</div>
-      </div>
+      <a class="left mr20" href="#"><%= image_tag "content/icon_playbutton.png", {:width => 20, :height => 20} %></a>
+      <div class="session-status">LIVE SESSION IN PROGRESS</div>
       <div class="recording-current">1:23</div>
     </div>
 
-    <div class="left white"><%= @claimed_recording.genre_id.capitalize %></div>
+    <div class="left white"><%= @music_session.genres.split('|').first.id.capitalize %></div>
     <div class="right white">
-      <%= @claimed_recording.recording.play_count %>
-      <%= image_tag "content/icon_arrow.png", {:width => 7, :height => 12, :align => "absmiddle"} %>&nbsp;&nbsp;&nbsp;&nbsp;
-      <%= @claimed_recording.recording.comment_count %>
+      <%= @music_session.comment_count %>
       <%= image_tag "content/icon_comment.png", {:width => 13, :height => 12, :align => "absmiddle"} %>&nbsp;&nbsp;&nbsp;&nbsp;
       <%= @claimed_recording.recording.like_count %>
       <%= image_tag "content/icon_like.png", {:width => 12, :height => 12, :align => "absmiddle"} %>

web/app/views/recordings/show.html.erb

@@ -61,7 +61,7 @@
 <br clear="all" />
 
 <% if signed_in? %>
-  <%= render :partial => "shared/landing_sidebar", :locals => {:user => @claimed_recording.recording.owner} %>
+  <%= render :partial => "shared/landing_sidebar", :locals => {:user => @claimed_recording.recording.owner, :recent_events => ""} %>
 <% else %>
   <%= render :partial => "shared/cta_sidebar" %>
 <% end %>