diff --git a/Gemfile b/Gemfile index 11e9d38..fec4acc 100644 --- a/Gemfile +++ b/Gemfile @@ -45,7 +45,6 @@ gem 'therubyracer' gem 'omniauth-facebook' gem 'ancestry' - group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' diff --git a/Gemfile.lock b/Gemfile.lock index 65fc7a4..3fffdbc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,6 +44,7 @@ GEM debug_inspector (>= 0.0.1) bootstrap-sass (3.3.1.0) sass (~> 3.2) + breadcrumbs_on_rails (2.3.0) builder (3.2.2) byebug (3.5.1) columnize (~> 0.8) @@ -227,6 +228,7 @@ PLATFORMS DEPENDENCIES ancestry bootstrap-sass (~> 3.3.1.0) + breadcrumbs_on_rails byebug coffee-rails (~> 4.1.0) devise (~> 3.4.1) diff --git a/app/controllers/folders_controller.rb b/app/controllers/folders_controller.rb index 57695f5..40b9a31 100644 --- a/app/controllers/folders_controller.rb +++ b/app/controllers/folders_controller.rb @@ -1,7 +1,7 @@ class FoldersController < ApplicationController before_action :authenticate_user! - + def new @folder = Folder.new(parent_id: params[:parent_id], user_id: current_user.id) end @@ -19,13 +19,17 @@ def create def destroy @folder = Folder.find params[:id] @folder.delete - redirect_to folders_path + redirect_to folders_path end - - private - def folder_params - params.require(:folder).permit(:name, :parent_id, :user_id) + def show + @folders = Folder.all end + private + + def folder_params + params.require(:folder).permit(:name, :parent_id, :user_id) + end + end diff --git a/app/views/folders/index.html.slim b/app/views/folders/index.html.slim index 433ca6a..3b5d335 100644 --- a/app/views/folders/index.html.slim +++ b/app/views/folders/index.html.slim @@ -1,5 +1,17 @@ h1 Folders +ol.nav-path + span + | You are here: / + = link_to "Folders", folders_path + - if @folder && @folder.ancestors + | / + - @folder.ancestors.each do |folder| + = link_to folder.name, folder + | / + = @folder.name if @folder + + = nested_folders @folders.arrange(:order => :created_at) = render "form"