feature/Make comments notifiable

Author: LewisYoul

app/assets/stylesheets/card.scss

@@ -6,10 +6,10 @@
     border-radius: 2px;
     position: relative;
     margin: 16px 0px;
-    padding: 16px 8px;
     box-shadow: 0 1px 2px lightgrey;
     border: 1px solid lightgrey;
 
+    
     &-padding {
       padding: 16px;
     }

app/assets/stylesheets/helpers.scss

@@ -15,6 +15,7 @@
 // DISPLAY
 
 .block { display: block; }
+.inline-block { display: inline-block; }
 .hidden { display: none !important; }
 
 // POSITION
@@ -37,6 +38,10 @@
 .margin-top {
   margin-top: 16px;
 
+  &--small {
+    margin-top: 8px;
+  }
+
   &--tiny {
     margin-top: 4px;
   }

app/assets/stylesheets/notifications.scss

@@ -0,0 +1,19 @@
+@import './variables.scss';
+
+.notification {
+  &--wrapper {
+    cursor: pointer;
+    border-bottom: 1px solid lightgrey;
+    padding: 16px;
+
+    &:hover {
+      background-color: $color-hover;
+    }
+  }
+
+  &--body {
+    display: block;
+    margin-top: 8px;
+    margin-left: 60px;
+  }
+}

app/assets/stylesheets/user-preview.scss

@@ -17,14 +17,12 @@
     margin: 8px 0px 0px 12px;
 
     &-name {
-      display: block;
       font-weight: 500;
       font-size: 16px;
       font-family: Helvetica, sans-serif;
       overflow: hidden;
       text-overflow: ellipsis;
       max-width: 130px;
-      display: block;
     }
 
     &-time-ago {

app/controllers/comments_controller.rb

@@ -7,6 +7,7 @@ def create
     @comment = @snippet.comments.new(comment_params)
 
     if @comment.save
+      @comment.notifications.create(user: @snippet.user)
       flash[:notice] = 'Comment created!'
       redirect_to snippet_path(@snippet)
     else

app/helpers/application_helper.rb

@@ -17,10 +17,12 @@ def notification_counter(user)
     end
   end
 
-  def notification_for_display(notification)
+  def notification_action_text(notification)
     case notification.notifiable_type
     when 'Follow'
-      render partial: 'notifications/follow', locals: { notification: notification }
+      'followed you'
+    when 'Comment'
+      'commented on your snippet'
     end
   end
 end

app/models/comment.rb

@@ -1,6 +1,7 @@
 class Comment < ApplicationRecord
   belongs_to :snippet, counter_cache: true
   belongs_to :user
+  has_many :notifications, as: :notifiable, dependent: :destroy
 
   validates_presence_of :body
 

app/models/snippet.rb

@@ -66,7 +66,11 @@ def private?
   end
 
   def visible_to?(user)
-    self.user_id == user.try(:id)
+    if private?
+      self.user_id == user.try(:id)
+    else
+      true
+    end
   end
 
   private

app/views/notifications/_comment.html.erb

@@ -0,0 +1,5 @@
+<% commenter = notification.notifiable.user %>
+
+<%= render 'notifications/notification', url: snippet_path(notification.notifiable.snippet), user: commenter, notification: notification do %>
+  <span class="notification--body"><%= notification.notifiable.body.first(150) %></span>
+<% end %>

app/views/notifications/_follow.html.erb

@@ -1,11 +1,3 @@
 <% follower = notification.notifiable.follower %>
 
-<div
-  class="card--container card--container-padding"
-  style="cursor: pointer;"
-  data-controller="navigation"
-  data-navigation-url-value="<%= user_path(follower) %>"
-  data-action="click->navigation#navigate"
->
-  <span><%= follower.name %> followed you</span>
-</div>
+<%= render 'notifications/notification', url: user_path(follower), user: follower, notification: notification %>