Add links to annotations and fix empty comments

MaMpf-HD · Aug 2, 2024 · 7f2a9bd · 7f2a9bd
1 parent 13782cf
commit 7f2a9bd
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 22 deletions.
diff --git a/app/assets/stylesheets/annotations_overview.scss b/app/assets/stylesheets/annotations_overview.scss
@@ -6,4 +6,10 @@
 
 .annotation-overview-item {
   border-width: 1.5px;
+  cursor: pointer;
+  transition: box-shadow 120ms cubic-bezier(0.33, 1, 0.68, 1);
+
+  &:hover {
+    box-shadow: rgba(0, 0, 0, 0.23) 1px 2px 8px -2px;
+  }
 }
diff --git a/app/controllers/annotations_overview_controller.rb b/app/controllers/annotations_overview_controller.rb
@@ -2,7 +2,15 @@ class AnnotationsOverviewController < ApplicationController
   layout "application_no_sidebar_with_background"
 
   def show
-    @user_annotations = Annotation.where(user_id: current_user.id)
+    @user_annotations = Annotation.where(user_id: current_user.id).map do |annotation|
+      {
+        category: annotation.category,
+        text: annotation.comment_optional,
+        link: helpers.video_link_timed(annotation.medium_id, annotation.timestamp),
+        color: annotation.color,
+        updated_at: annotation.updated_at
+      }
+    end
     render "annotations/annotations_overview"
   end
 end
diff --git a/app/helpers/media_helper.rb b/app/helpers/media_helper.rb
@@ -149,4 +149,9 @@ def external_link_description_not_empty(medium)
     # link url itself.
     medium.external_link_description.presence || medium.external_reference_link
   end
+
+  def video_link_timed(medium_id, timestamp)
+    play_path = Rails.application.routes.url_helpers.play_medium_path(medium_id)
+    "#{play_path}?time=#{timestamp.total_seconds}"
+  end
 end
diff --git a/app/views/annotations/annotations_overview.html.erb b/app/views/annotations/annotations_overview.html.erb
@@ -4,29 +4,31 @@
   <h2>Your annotations</h2>
   <p>
     This list comprises all annotations you have created across various lectures.
+    Click on an annotation to view it.
   </p>
 
   <% @user_annotations.each do |annotation| %>
-    <div class="annotation-overview-item card mb-3"
-        style="border-color: <%= annotation.color %>"">
+    <a href="<%= annotation[:link] %>"
+        style="text-decoration: none;">
 
-      <div class="card-header">
-        <%= annotation.category.capitalize %>
-      </div>
-
-      <div class="card-body">
-        <p class="card-text">
-          <%= truncate(annotation.comment, length: 100) %>
-        </p>
+      <div class="annotation-overview-item card mb-3"
+          style='border-color: <%= annotation[:color] %>'>
+        <div class="card-header">
+          <%= annotation[:category].capitalize %>
+        </div>
 
-        <p class="card-text">
-          <small class="text-body-secondary">
-          Last updated <%= time_ago_in_words(annotation.updated_at) %> ago
-          </small>
-        </p>
+        <div class="card-body">
+          <p class="card-text">
+            <%= truncate(annotation[:text], length: 100) %>
+            <br>
+            <small class="text-body-secondary">
+            Last updated <%= time_ago_in_words(annotation[:updated_at]) %> ago
+            </small>
+          </p>
+        </div>
       </div>
-
-    </div>
-    <% end %>
+      
+    </a>
+  <% end %>
 
 </div>
diff --git a/app/views/commontator/comments/_body.html.erb b/app/views/commontator/comments/_body.html.erb
@@ -8,10 +8,11 @@
 <!--- Show timestamps in comments that have a linked annotation --->
 <% annotation = comment.annotation %>
 <% unless annotation.nil? %>
-  <% medium = annotation.medium %>
+  <% medium_id = annotation.medium.id %>
   <% timestamp = annotation.timestamp %>
   <br>
   Timestamp:
-  <a href= '<%= Rails.application.routes.url_helpers.play_medium_path(medium) %>?time=<%= timestamp.total_seconds %>'>
-  <%= timestamp.hms_colon_string %> </a>
+  <a href="<%= video_link_timed(medium_id, timestamp) %>">
+    <%= timestamp.hms_colon_string %>
+  </a>
 <% end %>