refactor/Use alerts namespace for alerts

Author: LewisYoul

app/controllers/alerts/comments_controller.rb

@@ -0,0 +1,9 @@
+class Alerts::CommentsController < AlertsController
+  DELETE_CONFIRM_TEXT = "Are you sure you want to delete this comment? You won't be able to undo this.".freeze
+
+  def delete
+    @comment = current_user.comments.find(params[:id])
+    @header = 'Delete Comment'
+    @message = DELETE_CONFIRM_TEXT
+  end
+end

app/controllers/alerts/folders_controller.rb

@@ -0,0 +1,9 @@
+class Alerts::FoldersController < AlertsController
+  DELETE_CONFIRM_TEXT = "Are you sure you want to delete this folder? You won't be able to undo this.".freeze
+
+  def delete
+    @folder = current_user.folders.find(params[:id])
+    @header = 'Delete Folder'
+    @message = DELETE_CONFIRM_TEXT
+  end
+end

app/controllers/alerts/snippets_controller.rb

@@ -0,0 +1,16 @@
+class Alerts::SnippetsController < AlertsController
+  UNFILE_CONFIRM_TEXT = "Are you sure you want to unfile this snippet? It will be removed from your collection.".freeze
+  DELETE_CONFIRM_TEXT = "Are you sure you want to delete this snippet? You won't be able to undo this.".freeze
+
+  def unfile
+    @snippet = current_user.filed_snippets.find(params[:id])
+    @header = 'Unfile Snippet'
+    @message = UNFILE_CONFIRM_TEXT
+  end
+
+  def delete
+    @snippet = current_user.snippets.find(params[:id])
+    @header = 'Delete Snippet'
+    @message = DELETE_CONFIRM_TEXT
+  end
+end

app/controllers/alerts_controller.rb

@@ -0,0 +1,5 @@
+class AlertsController < ApplicationController
+  skip_before_action :assign_users_for_connect
+
+  layout 'alert'
+end

app/controllers/application_controller.rb

@@ -25,7 +25,7 @@ def assign_users_for_connect
     if user_signed_in?
       @users_for_connect = User.where.not(id: current_user.following.pluck(:id) << current_user.id).limit(5)
     else
-      @users_for_connect = User.limit(5)
+      @users_for_connect = User.order(updated_at: :desc).limit(5)
     end
   end
 

app/controllers/comments_controller.rb

@@ -2,8 +2,6 @@ class CommentsController < ApplicationController
   before_action :authenticate_user!
   before_action :set_comment, only: :destroy
 
-  DELETE_CONFIRM_TEXT = "Are you sure you want to delete this comment? You won't be able to undo this.".freeze
-
   def create
     @snippet = Snippet.find(params[:snippet_id])
     @comment = @snippet.comments.new(comment_params)
@@ -34,18 +32,6 @@ def popover
     render partial: 'shared/popover', layout: false
   end
 
-  def delete_alert
-    @comment = current_user.comments.find(params[:id])
-    @title = 'Delete Comment'
-    @message = DELETE_CONFIRM_TEXT
-    @confirm_word = 'DELETE'
-    @toast_message = 'Comment deleted!'
-    @confirm_path = comment_path(@comment)
-    @resource_id = @comment.client_id
-
-    render 'shared/delete_alert', layout: false
-  end
-
   private
 
   def set_comment

app/controllers/folders_controller.rb

@@ -1,6 +1,5 @@
 class FoldersController < ApplicationController
   MINIMUM_FOLDERS = 1.freeze
-  DELETE_CONFIRM_TEXT = "Are you sure you want to delete this folder? You won't be able to undo this.".freeze
 
   before_action :authenticate_user!
   before_action :set_folder, only: %i(show edit update destroy)
@@ -14,18 +13,6 @@ def popover
     render partial: 'shared/popover', layout: false
   end
 
-  def delete_alert
-    @folder = current_user.folders.find(params[:id])
-    @title = 'Delete Folder'
-    @message = DELETE_CONFIRM_TEXT
-    @confirm_word = 'DELETE'
-    @confirm_path = folder_path(@folder, redirect_url: folders_path)
-    @resource_id = @folder.client_id
-    @method = :delete
-
-    render 'shared/delete_alert', layout: false
-  end
-
   def index
     @page_title = 'Folders'
 

app/controllers/snippets_controller.rb

@@ -1,9 +1,6 @@
 class SnippetsController < ApplicationController
   before_action :authenticate_user!, except: :show
 
-  DELETE_CONFIRM_TEXT = "Are you sure you want to delete this snippet? You won't be able to undo this.".freeze
-  UNFILE_CONFIRM_TEXT = "Are you sure you want to unfile this snippet? It will be removed from your collection.".freeze
-
   def index
     @page_title = "Snippets"
     @user = User.find_by(id: params[:user_id]) || current_user
@@ -73,18 +70,6 @@ def file
     end
   end
 
-  def delete_alert
-    @snippet = current_user.snippets.find(params[:id])
-    @title = 'Delete Snippet'
-    @message = DELETE_CONFIRM_TEXT
-    @confirm_word = 'DELETE'
-    @toast_message = 'Snippet deleted!'
-    @confirm_path = snippet_path(@snippet)
-    @resource_id = @snippet.client_id
-
-    render 'shared/delete_alert', layout: false
-  end
-
   def unfile_alert
     @snippet = current_user.filed_snippets.find(params[:id])
     @title = 'Unfile Snippet'

app/javascript/controllers/alert_controller.js

@@ -3,16 +3,16 @@ import axios from 'axios';
 
 export default class extends Controller {
   static targets = ["alert", "confirm", "body", "header"];
-  
-  connect() {
-    this.element[this.identifier] = this
-  }
+  static values = { url: String };
 
-  present(url) {
-    axios.get(url)
+  present(event) {
+    event.preventDefault();
+    event.stopPropagation();
+    console.log(this.urlValue)
+    axios.get(this.urlValue)
       .then(res => {
-        this.bodyTarget.insertAdjacentHTML('afterbegin', res.data);
-        this.alertTarget.classList.remove('hidden')
+        console.log(res)
+        document.body.insertAdjacentHTML('afterbegin', res.data);
       })
       .catch(console.error)
   }

app/javascript/controllers/modal_controller.js

@@ -4,28 +4,21 @@ import axios from 'axios';
 export default class extends Controller {
   static targets = ["modal", "header", "body"];
   static values = { url: String }
-  
-  connect() {
-    this.element[this.identifier] = this
-  }
 
   initialize() {
     const csrfToken = document.querySelector("meta[name=csrf-token]").content
     axios.defaults.headers.common['X-CSRF-Token'] = csrfToken
   }
 
   present(event) {
-    console.log('click', this.urlValue)
     event.preventDefault();
     event.stopPropagation();
 
     axios.get(this.urlValue)
       .then(res => {
-        console.log(res)
         this.close();
+
         document.body.insertAdjacentHTML('afterbegin', res.data);
-        // this.bodyTarget.insertAdjacentHTML('afterbegin', res.data);
-        // this.modalTarget.classList.remove('hidden')
       })
       .catch(console.error)
   }