fix/Only show public snippets to users who aren't self

Author: LewisYoul

app/controllers/users_controller.rb

@@ -13,9 +13,17 @@ def show
     @followers = @user.followers
     @following = @user.following
     @display_popover = true
-    @snippets = @user.filed_snippets
-      .order(created_at: :desc)
-      .paginate(page: 1, per_page: 6)
+
+    # need to change current implementation to hit specific user snippets endpoint so can optionally show private ones
+    if @user == current_user
+      @snippets = @user.filed_snippets
+        .order(created_at: :desc)
+        .paginate(page: 1, per_page: 6)
+    else
+      @snippets = @user.filed_snippets.public_snippets
+        .order(created_at: :desc)
+        .paginate(page: 1, per_page: 6)
+    end
 
     @tab_id = params[:tab_id] || :snippets
   end

app/models/user.rb

@@ -54,10 +54,10 @@ def popover_options_for(snippet)
       options << { type: :modal, title: 'Edit', url: edit_modals_snippet_path(snippet) }
       options << { type: :alert, title: 'Delete', url: delete_alert_snippet_path(snippet) }
     elsif filed?(snippet)
-      options << { type: :modal, title: 'Move to...', url: move_modal_snippet_path(snippet) }
+      options << { type: :modal, title: 'Move to...', url: move_modals_snippet_path(snippet) }
       options << { type: :alert, title: 'Unfile', url: unfile_alert_snippet_path(snippet) }
     elsif !filed?(snippet)
-      options << { type: :modal, title: 'File', url: move_modal_snippet_path(snippet) }
+      options << { type: :modal, title: 'File', url: move_modals_snippet_path(snippet) }
     end
 
     options

app/views/modals/snippets/edit.html.erb

@@ -31,13 +31,23 @@
       </div>
 
       <div class="create-snippet--options-wrapper">
-        <%= f.select :folder_id, options_from_collection_for_select(@folders, :id, :name, @folder.id) %>
-        <%= f.select :language, [], {}, { data: { target: "highlight.languages" } } %>
-        <%# <select v-model="snippetParams.language">
-          <option v-for="language in languages" :key="language" :value="language">{{ language }}</option>
-        </select> %>
-
-        <%= f.submit 'UPDATE', class: "button--cta-new" %>
+        <div class="flex v-center" style="cursor: pointer;"
+          data-controller="checkbox"
+          data-action="click->checkbox#toggle"
+          data-checkbox-checked-text-value="Public"
+          data-checkbox-checked-icon-value="/icons/lock-open.svg"
+          data-checkbox-unchecked-text-value="Private"
+          data-checkbox-unchecked-icon-value="/icons/lock-closed.svg"
+        >
+          <span data-checkbox-target="text">Public</span>
+          <img data-checkbox-target="icon" src="/icons/lock-open.svg" width="20">
+          <%= f.hidden_field :public, value: true, data: { checkbox_target: 'value' } %>
+        </div>
+        <div class="flex">
+          <%= f.select :folder_id, options_from_collection_for_select(@folders, :id, :name, @folder.id), prompt: 'Select folder...' %>
+          <%= f.submit 'UPDATE', class: "margin-left button--cta-new" %>
+        </div>
+      </div>
       </div>
     <% end %>
 

app/views/modals/snippets/move.html.erb

@@ -26,7 +26,7 @@
     <button
       data-action="click->snippets#file"
       data-target="snippets.moveButton"
-      class="button--cta-disabled"
+      class="button--cta-disabled margin-left--tiny"
       disabled
     >
       <%= @header.upcase %>

app/views/shared/delete_alert.html.erb

@@ -20,6 +20,6 @@
     method: :delete,
     remote: true,
     data: { toast_message: @toast_message, resource_id: @resource_id, action: 'ajax:success->alert#deleteSuccess' },
-    class: "button--cta-new"
+    class: "button--cta-new margin-left--tiny"
   ) %>
 </div>

app/views/snippets/unfile_alert.html.erb

@@ -20,6 +20,6 @@
     method: :delete,
     remote: true,
     data: { toast_message: 'Snippet removed from collection!', action: 'ajax:success->alert#unfileSuccess' },
-    class: "button--cta-new"
+    class: "button--cta-new margin-left--tiny"
   ) %>
 </div>