diff --git a/Gemfile b/Gemfile index 922df12..3c4e17f 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,7 @@ gem 'redis', '~> 4.0' # Use ActiveStorage variant gem 'mini_magick', '~> 4.8' - +gem 'kaminari', '~> 1.1.1' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development diff --git a/Gemfile.lock b/Gemfile.lock index dce889e..5cbd6de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -91,6 +91,18 @@ GEM jbuilder (2.8.0) activesupport (>= 4.2.0) multi_json (>= 1.2) + kaminari (1.1.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) + actionview + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) + activerecord + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -217,6 +229,7 @@ DEPENDENCIES devise factory_bot_rails jbuilder (~> 2.5) + kaminari (~> 1.1.1) listen (>= 3.0.5, < 3.2) mini_magick (~> 4.8) mysql2 (>= 0.4.4, < 0.6.0) diff --git a/app/helpers/views_helper.rb b/app/helpers/views_helper.rb index d1ccff1..c6ff0ba 100644 --- a/app/helpers/views_helper.rb +++ b/app/helpers/views_helper.rb @@ -5,13 +5,39 @@ module ViewsHelper def dropdown_link(name, menu_links) content_tag(:div, class: 'dropdown no-arrow') do concat link_for('#', name) + concat dropdown_menu(menu_links) end end def link_for(href, text) - + link_to(text, href, class: 'dropdown-toggle', id: 'ddMenuLink', + role: 'button', data: { toggle: 'dropdown' }, + aria: { haspopup: 'true', expanded: 'false' }) end - + + def dropdown_menu(menu_links) + content_tag(:div, class: 'dropdown no-arrow') do + menu_links.each do |ml| + + end + end + end + + def menu_item(item) + if item.nil? + # divider + tag.div class: 'dropdown-divider' + elsif item.class.to_s == 'String' + # header + content_tag :h6, I18n.t(item), class: 'dropdown-header' + elsif item.class.to_s == 'Array' + # link (menu item) + icon = item[2].nil? ? '' : "" + nm = I18n.t(sub[0]) + link_to(raw("#{icon} #{nm}"), sub[1], class: 'dropdown-item') + end + end + =begin