From 54b85718332cf693af973f7e4677e135fd6ae1c9 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Thu, 15 Jun 2017 13:04:30 +0200 Subject: [PATCH] FIX devise and jQuery sortable --- Gemfile | 2 +- app/assets/javascripts/binda/application.js | 2 +- config/routes.rb | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index bd08dc4f..6dbc2ebf 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gemspec group :development, :test do gem 'pg' gem 'pry-rails', '~> 0.3.5' - gem 'rspec-rails', '~> 3.5' + gem 'rspec-rails', '>= 3.5', '< 3.7' gem 'autoprefixer-rails' gem 'capybara' gem 'factory_girl_rails' diff --git a/app/assets/javascripts/binda/application.js b/app/assets/javascripts/binda/application.js index 5d148384..158b9f26 100644 --- a/app/assets/javascripts/binda/application.js +++ b/app/assets/javascripts/binda/application.js @@ -13,6 +13,6 @@ //= require jquery //= require jquery_ujs -//= require jquery-ui/sortable +//= require jquery-ui/widgets/sortable //= require tinymce-jquery //= require binda/dist/binda.bundle.js diff --git a/config/routes.rb b/config/routes.rb index 7407a7b4..60d0b309 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,13 +1,12 @@ Binda::Engine.routes.draw do - resources :dates # ROOT # ---- # https://github.com/plataformatec/devise/wiki/How-To:-Require-authentication-for-all-components - # authenticated :user, class_name: "Binda::User", module: :devise do - # root to: 'settings#index', as: :authenticated_root - # end - # root to: redirect( "users/sign_in") + authenticated :user, class_name: "Binda::User", module: :devise do + root to: 'settings#index', as: :authenticated_root + end + root to: redirect( "users/sign_in" ) root 'settings#dashboard' @@ -58,5 +57,6 @@ resources :galleries resources :assets resources :repeaters + resources :dates end