diff --git a/Gemfile b/Gemfile index d49bed3..6942706 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .coffee assets and views # gem 'coffee-rails', '~> 4.2' # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks -gem 'turbolinks', '~> 5' +# gem 'turbolinks', '~> 5' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.5' # Use Redis adapter to run Action Cable in production diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e0afb62..312f55a 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,4 +12,3 @@ // //= require rails-ujs //= require activestorage -//= require turbolinks diff --git a/app/helpers/sidemenu_helper.rb b/app/helpers/sidemenu_helper.rb index 9a1b632..2a49028 100644 --- a/app/helpers/sidemenu_helper.rb +++ b/app/helpers/sidemenu_helper.rb @@ -100,7 +100,6 @@ module SidemenuHelper # check if this link is active def check_link_active(for_active) is_active = false - puts "#{for_active} - #{controller_path.to_s}" if for_active.class.to_s == 'String' is_active = controller_path.to_s.include?(for_active) elsif for_active.class.to_s == 'Array' diff --git a/app/helpers/usermenu_helper.rb b/app/helpers/usermenu_helper.rb new file mode 100644 index 0000000..696bdca --- /dev/null +++ b/app/helpers/usermenu_helper.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +# Module for building usermenu +module UsermenuHelper + +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 4679645..ce8e3ad 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,9 +7,9 @@ <%= favicon_link_tag %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag 'application', media: 'all' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application' %> @@ -20,7 +20,7 @@