8 files changed, 39 insertions, 6 deletions

@@ -228,3 +228,14 @@ h2.centered {
     text-decoration: none;
   }
 }
+
+#scrobble-box {
+  img {
+    margin: 0 auto;
+    display: block;
+  }
+
+  p {
+    text-align: center;
+  }
+}
@@ -1,9 +1,19 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
+  before_action :choose_random_song
 
   private
 
     def after_sign_out_path_for(resource)
       new_session_path(resource)
     end
+
+    def choose_random_song
+      ids = Scrobble.ids
+      if ids.empty?
+        @random_song = nil
+      else
+        @random_song = Scrobble.find(ids.sample)
+      end
+    end
 end
@@ -0,0 +1,2 @@
+class Scrobble < ApplicationRecord
+end
@@ -1,3 +1,3 @@
 - title "Editing #{@stream.title}"
-= form_for @stream, url: admin_stream_url(@stream), html: { id: "entry-form" } do |f|
+= form_for @stream, url: admin_stream_url(@stream.id), html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -10,5 +10,5 @@
       %td= stream.created_at.strftime("%B %d, %Y, %l:%M%P")
       %td
         %ul.admin-actions
-          %li= link_to "Edit", edit_admin_stream_url(stream)
-          %li= link_to "Add Update", new_admin_stream_update_url(stream)
+          %li= link_to "Edit", edit_admin_stream_url(stream.id)
+          %li= link_to "Add Update", new_admin_stream_update_url(stream.id)
@@ -24,5 +24,5 @@
     %time.dt-published{ datetime: blog.visible_date.strftime("%Y-%m-%dT%H:%M:%SZ%z") }= blog.visible_date.strftime("%B #{blog.visible_date.day.ordinalize}, %Y at %-I:%M:%S%P")
   .post-vote{ id: "blog-vote-section-#{blog.id}" }
     %span.vote-link{ id: "blog-upvote-link-#{blog.id}" }= link_to_unless (not blog.published or blog.already_upvoted?(request.remote_ip)), "👍", upvote_blog_path(blog), remote: true, rel: "nofollow", class: "blog-upvote-link", method: :post
-    %span.post-rating{ id: "blog-rating-#{blog.id}" }= blog.upvotes - blog.downvotes
+    %span.post-rating{ id: "blog-rating-#{blog.id}" }= blog.upvotes
     %span.vote-link{ id: "blog-downvote-link-#{blog.id}" }= link_to_unless (not blog.published or blog.already_downvoted?(request.remote_ip)), "👎", downvote_blog_path(blog), remote: true, rel: "nofollow", class: "blog-downvote-link", method: :post
@@ -73,6 +73,16 @@
                 %li
                   = image_tag "feed.png"
                   = link_to "Atom feed", blogs_url(format: :atom)
+          - unless @random_song.nil?
+            .sidebar-module#scrobble-box
+              .bubble.rounded
+                %h2 Listening to
+                = image_tag @random_song.image, width: "174px"
+                %p
+                  %strong= @random_song.title
+                  by
+                  = @random_song.artist
+                %p= @random_song.album
           .sidebar-module
             .bubble.rounded
               %h2 Meta
@@ -21,12 +21,12 @@
           %li= link_to_unless_current "Home", quotes_url
           %li= link_to_unless_current "Latest", latest_quotes_url
           %li= link_to_unless_current "Top", top_quotes_url
-          %li= link_to "Random", random_quotes_url
+          %li{"data-turbolinks" => "false"}= link_to "Random", random_quotes_url
           - if user_signed_in?
             %li= link_to_unless_current "Submit", new_quote_url
           %li= link_to_unless_current "Tags", tags_quotes_url
           %li= link_to_unless_current "Search", search_form_quotes_url
-          %li= link_to_unless_current "Stats", stats_quotes_url
+          %li{"data-turbolinks" => "false"}= link_to_unless_current "Stats", stats_quotes_url 
           %li= link_to_unless_current "Feed", latest_quotes_url(:atom)
           - if user_signed_in?
             %li= link_to_unless_current "Admin", admin_url