Skip to content

Commit

Permalink
Update tables and navigation
Browse files Browse the repository at this point in the history
  • Loading branch information
sfnelson committed Dec 15, 2023
1 parent ed8fb0a commit 4a8ff79
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 27 deletions.
22 changes: 13 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
katalyst-koi (4.3.2)
katalyst-koi (4.3.3)
bcrypt
importmap-rails
katalyst-content
Expand Down Expand Up @@ -112,7 +112,7 @@ GEM
erubi (~> 1.4)
parser (>= 2.4)
smart_properties
bigdecimal (3.1.4)
bigdecimal (3.1.5)
bindata (2.4.15)
brakeman (6.1.0)
builder (3.2.4)
Expand Down Expand Up @@ -174,7 +174,7 @@ GEM
activemodel (>= 6.1)
activesupport (>= 6.1)
html-attributes-utils (~> 1)
hashdiff (1.0.1)
hashdiff (1.1.0)
html-attributes-utils (1.0.2)
activesupport (>= 6.1.4.4)
i18n (1.14.1)
Expand All @@ -183,7 +183,7 @@ GEM
actionpack (>= 6.0.0)
activesupport (>= 6.0.0)
railties (>= 6.0.0)
io-console (0.6.0)
io-console (0.7.0)
irb (1.10.1)
rdoc
reline (>= 0.3.8)
Expand All @@ -202,15 +202,19 @@ GEM
activesupport (>= 3)
redis (>= 3)
redlock (>= 1.2)
katalyst-html-attributes (1.0.0)
katalyst-html-attributes (1.0.1)
activesupport
html-attributes-utils
katalyst-kpop (3.0.1)
katalyst-html-attributes
turbo-rails
view_component
katalyst-navigation (1.4.1)
katalyst-tables (2.2.12)
katalyst-navigation (1.5.1)
katalyst-html-attributes
katalyst-kpop
katalyst-tables
view_component
katalyst-tables (2.3.1)
katalyst-html-attributes
view_component
language_server-protocol (3.17.0.3)
Expand All @@ -228,7 +232,7 @@ GEM
mini_mime (1.1.5)
minitest (5.20.0)
mutex_m (0.2.0)
net-imap (0.4.7)
net-imap (0.4.8)
date
net-protocol
net-pop (0.1.2)
Expand Down Expand Up @@ -333,7 +337,7 @@ GEM
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.1)
rubocop (1.58.0)
rubocop (1.59.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand Down
6 changes: 6 additions & 0 deletions app/assets/javascripts/koi/controllers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ application.load(kpop);
import content from "@katalyst/content";
application.load(content);

import navigation from "@katalyst/navigation";
application.load(navigation);

import tables from "@katalyst/tables";
application.load(tables);

// Eager load all controllers defined in the import map under controllers/**/*_controller
import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading";
eagerLoadControllersFrom("controllers", application);
Expand Down
15 changes: 3 additions & 12 deletions app/views/katalyst/navigation/menus/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
<% content_for :title, menu.title %>
<% content_for(:breadcrumbs) { link_to "Navigations", katalyst_navigation.menus_path } %>

<%= navigation_editor_status_bar menu: %>

<%= navigation_editor_menu menu: do |form| %>
<div role="rowheader">
<h4>Title</h4>
<h4>Url</h4>
<h4>Actions</h4>
</div>

<%= navigation_editor_list menu: %>
<% end %>
<%= render editor.status_bar %>
<%= render editor %>

<%= content_for :sidebar do %>
<%= render "katalyst/navigation/menus/new_items", menu: %>
<%= render editor.new_items %>
<% end %>
3 changes: 3 additions & 0 deletions config/initializers/navigation.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# frozen_string_literal: true

Katalyst::Navigation.config.base_controller = "Admin::ApplicationController"
2 changes: 1 addition & 1 deletion katalyst-koi.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Describe your gem and declare its dependencies:
Gem::Specification.new do |s|
s.name = "katalyst-koi"
s.version = "4.3.2"
s.version = "4.3.3"
s.authors = ["Katalyst Interactive"]
s.email = ["[email protected]"]

Expand Down
5 changes: 0 additions & 5 deletions lib/koi/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,5 @@ class Engine < ::Rails::Engine
g.fixture_replacement :factory_bot
g.factory_bot dir: "spec/factories"
end

config.to_prepare do
Katalyst::Navigation::BaseController.include Koi::Controller::IsAdminController
Katalyst::Navigation::BaseController.helper Koi::Engine.helpers
end
end
end

0 comments on commit 4a8ff79

Please sign in to comment.