feature/Move all modals into modals namespace

Author: LewisYoul

app/controllers/folders/modals_controller.rb

@@ -0,0 +1,5 @@
+class Modals::FoldersController < ModalsController
+  def new
+
+  end
+end

app/controllers/modals/folders_controller.rb

@@ -0,0 +1,31 @@
+class Modals::SnippetsController < ModalsController
+  before_action :set_snippet, only: %i(edit)
+
+  def new
+    @snippet = Snippet.new
+    @folders = current_user.folders
+  end
+
+  def edit
+    @folders = current_user.folders
+    @folder = current_user.snippet_folders.find_by(snippet_id: params[:id]).folder
+  end
+
+  def move
+    @snippet = Snippet.find(params[:id])
+    @current_folder_id = current_user.snippet_folders.find_by(snippet_id: params[:id])&.folder&.id
+    @header = @current_folder_id ? 'Move Snippet' : 'File Snippet'
+    @folders = current_user.folders
+  end
+
+  private
+
+  def set_snippet
+    unless @snippet = current_user.snippets.find_by(id: params[:id])
+      respond_to do |format|
+        format.html { redirect_to root_path, alert: UNAUTHORIZED }
+        format.json { render json: { message: UNAUTHORIZED }, status: 401 }
+      end
+    end
+  end
+end

app/controllers/modals/snippets_controller.rb

@@ -1,4 +1,4 @@
-class Users::ModalsController < ModalsController
+class Modals::UsersController < ModalsController
   def sign_in_sign_up; end
 
   def sign_in
@@ -8,4 +8,6 @@ def sign_in
   def sign_up
     @user = User.new
   end
+
+  def edit_avatar; end
 end

…p/controllers/users/modals_controller.rb …p/controllers/modals/users_controller.rbapp/controllers/users/modals_controller.rb renamed to app/controllers/modals/users_controller.rb app/controllers/users/modals_controller.rb renamed to app/controllers/modals/users_controller.rb

@@ -74,29 +74,6 @@ def file
     end
   end
 
-  def new_snippet_modal
-    @snippet = Snippet.new
-    @folders = current_user.folders
-
-    render 'new', layout: false
-  end
-
-  def move_modal
-    @snippet = Snippet.find(params[:id])
-    @current_folder_id = current_user.snippet_folders.find_by(snippet_id: params[:id])&.folder&.id
-    @header = @current_folder_id ? 'Move Snippet' : 'File Snippet'
-    @folders = current_user.folders
-
-    render layout: false
-  end
-
-  def edit_modal
-    @folders = current_user.folders
-    @folder = current_user.snippet_folders.find_by(snippet_id: params[:id]).folder
-
-    render 'edit', layout: false
-  end
-
   def delete_alert
     @snippet = current_user.snippets.find(params[:id])
     @title = 'Delete Snippet'
@@ -242,15 +219,6 @@ def destroy
 
   private
 
-  def set_snippet
-    unless @snippet = current_user.snippets.find_by(id: params[:id])
-      respond_to do |format|
-        format.html { redirect_to root_path, alert: UNAUTHORIZED }
-        format.json { render json: { message: UNAUTHORIZED }, status: 401 }
-      end
-    end
-  end
-
   def snippet_params
     params.require(:snippet).permit(
       :description,

app/controllers/snippets/modals_controller.rb

@@ -1,8 +1,4 @@
 class UsersController < ApplicationController
-  def edit_avatar_modal
-    render layout: false
-  end
-
   def index
     users = User.limit(5)
 

app/controllers/snippets_controller.rb

@@ -3,6 +3,7 @@ import axios from 'axios';
 
 export default class extends Controller {
   static targets = ["modal", "header", "body"];
+  static values = { url: String }
 
   connect() {
     this.element[this.identifier] = this
@@ -14,11 +15,11 @@ export default class extends Controller {
   }
 
   present(event) {
-    console.log('click', event.currentTarget.dataset)
+    console.log('click', this.urlValue)
     event.preventDefault();
     event.stopPropagation();
 
-    axios.get(event.currentTarget.dataset.modalUrl)
+    axios.get(this.urlValue)
       .then(res => {
         console.log(res)
         this.close();

app/controllers/users_controller.rb

@@ -23,17 +23,14 @@ export default class extends Controller {
       reader.onload = function(e) {
         self.uploadedFile = e.target.result
 
-        self.modal.present('/users/edit_avatar_modal')
+        const event = new CustomEvent('open-avatar-modal')
+        window.dispatchEvent(event)
       }
 
       reader.readAsDataURL(input.files[0]);
     }
   }
 
-  get modal() {
-    return document.getElementById('modal').modal
-  }
-
   set cropper(cropperObj) {
     return this.cropper = cropperObj
   }

app/javascript/controllers/modal_controller.js

@@ -6,7 +6,7 @@ class Folder < ApplicationRecord
   def popover_options_for(user)
     options = []
 
-    options << { type: :modal, title: 'Add snippet', url: new_snippet_modal_snippets_path(folder_id: id) }
+    options << { type: :modal, title: 'Add snippet', url: new_modals_snippet_path(folder_id: id) }
     options << { type: :link, title: 'Rename folder', url: edit_folder_path(self) }
 
     if snippets.empty?