feature/Pre populate folder id when creating snippet from folder

Author: LewisYoul

app/controllers/registrations_controller.rb

@@ -4,12 +4,6 @@ class RegistrationsController < Devise::RegistrationsController
   #   super
   # end
 
-  # def edit
-  #   super do
-  #     @page_title = 'Account'
-  #   end
-  # end
-
   def update
     current_user.updated_at = Time.now
     current_user.avatar.attach(params[:user][:avatar])

app/controllers/snippets_controller.rb

@@ -76,12 +76,6 @@ def file
 
   def new_snippet_modal
     @snippet = Snippet.new
-
-    if params[:folder_id]
-      @folder_id = params[:folder_id]
-      @redirect_url = params[:redirect_url]
-    end
-
     @folders = current_user.folders
 
     render 'new', layout: false

app/views/folders/index.html.erb

@@ -11,9 +11,7 @@
         <img src="/icons/search.svg">
       </div>
 
-    <%= link_to(new_folder_modal_folders_path, data: { controller: 'snippets', action: 'snippets#presentModal', modal_url: new_folder_modal_folders_path }, class: 'button--cta-new') do %>
-        <span>NEW FOLDER</span>
-      <% end %>
+    <%= link_to('NEW FOLDER', new_folder_path, data: { controller: 'snippets', action: 'snippets#presentModal', modal_url: new_folder_modal_folders_path }, class: 'button--cta-new') %>
   </div>
 
   <div class="margin-top"

app/views/folders/show.html.erb

@@ -14,7 +14,7 @@
         <img src="/icons/search.svg">
       </div>
 
-    <%= link_to 'NEW SNIPPET', new_snippet_path, class: 'button--cta-new' %>
+    <%= link_to 'ADD SNIPPET', new_snippet_path, class: 'button--cta-new', data: { controller: 'snippets', action: 'snippets#presentModal', modal_url: new_snippet_modal_snippets_path(folder_id: @folder.id) } %>
   </div>
 
   <div class="margin-top"

app/views/snippets/new.html.erb

@@ -30,7 +30,7 @@
       </div>
 
       <div class="create-snippet--options-wrapper">
-        <%= f.select :folder_id, options_from_collection_for_select(@folders, :id, :name) %>
+        <%= f.select :folder_id, options_from_collection_for_select(@folders, :id, :name, params[: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>