feature/Add private icon to private snippets

Author: LewisYoul

app/assets/stylesheets/helpers.scss

@@ -55,7 +55,13 @@
     margin-left: 4px;
   }
 }
-.margin-right { margin-right: 16px }
+.margin-right {
+  margin-right: 16px;
+
+  &--tiny {
+    margin-right: 4px;
+  }
+}
 .margin-auto { margin: 0 auto; }
 
 .text-center { text-align: center; }

app/assets/stylesheets/toast.scss

@@ -10,7 +10,7 @@
     padding: 18px;
     box-shadow: 0px 4px 24px rgba(0, 0, 0, 0.1);
     text-align: center;
-    z-index: 4;
+    z-index: 10;
 
     &-notice {
       @extend .toast--container;

app/controllers/snippets_controller.rb

@@ -70,17 +70,6 @@ def file
     end
   end
 
-  def unfile_alert
-    @snippet = current_user.filed_snippets.find(params[:id])
-    @title = 'Unfile Snippet'
-    @message = UNFILE_CONFIRM_TEXT
-    @confirm_word = 'UNFILE'
-    @confirm_path = unfile_snippet_path(@snippet)
-    @method = :delete
-
-    render layout: false
-  end
-
   def current_folder
     snippet_folder = current_user.snippet_folders.find_by(snippet_id: params[:id])
 
@@ -97,8 +86,8 @@ def show
     @page_title = "Snippet"
     @snippet = Snippet.includes(comments: :user).find_by(id: params[:id])
 
-    unless @snippet
-      flash[:alert] = "We were unable to find that snippet"
+    unless @snippet && @snippet.visible_to?(current_user)
+      flash[:alert] = "You are not authorized to view that snippet"
       redirect_to root_path
     end
 

app/javascript/controllers/modal_controller.js

@@ -23,6 +23,8 @@ export default class extends Controller {
   }
 
   close() {
-    if (this.hasModalTarget) { this.modalTarget.remove(); };
+    const modal = document.getElementById('modal');
+
+    if (modal) { modal.remove(); };
   }
 }

app/models/snippet.rb

@@ -61,6 +61,14 @@ def client_id
     "snippet_#{id}"
   end
 
+  def private?
+    !public?
+  end
+
+  def visible_to?(user)
+    self.user_id == user.try(:id)
+  end
+
   private
 
   def owner_folder_presence

app/views/snippets/_snippet.html.erb

@@ -12,6 +12,9 @@
     <div>
       <div style="display: flex; flex-direction: column;">
         <div style="display: flex; justify-content: flex-end; margin-bottom: 8px; align-items: center;">
+          <% if snippet.private? %>
+            <img data-checkbox-target="icon" title="This snippet is only visible to you" src="/icons/lock-closed.svg" width="16">
+          <% end %>
           <% if folder %>
             <div class="folder-tag">
               <img src="/icons/icons8-folder-white.svg" width="12">

app/views/snippets/_snippet_preview.html.erb

@@ -11,6 +11,9 @@
     <div>
       <div style="display: flex; flex-direction: column;">
         <div style="display: flex; justify-content: flex-end; margin-bottom: 8px; align-items: center;">
+          <% if snippet.private? %>
+            <img class="margin-right--tiny" title="This snippet is only visible to you" data-checkbox-target="icon" src="/icons/lock-closed.svg" width="16">
+          <% end %>
           <% if folder %>
             <div class="folder-tag">
               <img src="/icons/icons8-folder-white.svg" width="12">