Move layout related components under layout/

solidusio · Nov 13, 2023 · e636fe0 · e636fe0
1 parent 378ed49
commit e636fe0
Show file tree

Hide file tree

Showing 31 changed files with 30 additions and 31 deletions.
diff --git a/admin/app/components/solidus_admin/feedback/component.rb b/admin/app/components/solidus_admin/feedback/component.rb
diff --git a/...solidus_admin/feedback/component.html.erb → ..._admin/layout/feedback/component.html.erb b/...solidus_admin/feedback/component.html.erb → ..._admin/layout/feedback/component.html.erb
diff --git a/admin/app/components/solidus_admin/layout/feedback/component.rb b/admin/app/components/solidus_admin/layout/feedback/component.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Layout::Feedback::Component < SolidusAdmin::BaseComponent
+end
diff --git a/...ents/solidus_admin/feedback/component.yml → ...lidus_admin/layout/feedback/component.yml b/...ents/solidus_admin/feedback/component.yml → ...lidus_admin/layout/feedback/component.yml
diff --git a/...in/sidebar/account_nav/component.html.erb → ...out/navigation/account/component.html.erb b/...in/sidebar/account_nav/component.html.erb → ...out/navigation/account/component.html.erb
diff --git a/...us_admin/sidebar/account_nav/component.rb → ...in/layout/navigation/account/component.rb b/...us_admin/sidebar/account_nav/component.rb → ...in/layout/navigation/account/component.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Account navigation
-class SolidusAdmin::Sidebar::AccountNav::Component < SolidusAdmin::BaseComponent
+class SolidusAdmin::Layout::Navigation::Account::Component < SolidusAdmin::BaseComponent
   # @param user_label [String]
   # @param account_path [String]
   # @param logout_path [String]

diff --git a/...s_admin/sidebar/account_nav/component.yml → ...n/layout/navigation/account/component.yml b/...s_admin/sidebar/account_nav/component.yml → ...n/layout/navigation/account/component.yml
diff --git a/.../solidus_admin/sidebar/component.html.erb → ...dmin/layout/navigation/component.html.erb b/.../solidus_admin/sidebar/component.html.erb → ...dmin/layout/navigation/component.html.erb
@@ -17,7 +17,7 @@
   <% end %>
 
   <ul>
-    <%= render component("sidebar/item").with_collection(items, fullpath: request.fullpath) %>
+    <%= render component("layout/navigation/item").with_collection(items, fullpath: request.fullpath) %>
   </ul>
 
   <div class="mt-auto">
@@ -29,7 +29,7 @@
         </div>
       </label>
     </div>
-    <%= render component("sidebar/account_nav").new(
+    <%= render component("layout/navigation/account").new(
       user_label: helpers.current_solidus_admin_user.email,
       account_path: solidus_admin.account_path,
       logout_path: helpers.solidus_admin_logout_path,

diff --git a/...onents/solidus_admin/sidebar/component.js → ...idus_admin/layout/navigation/component.js b/...onents/solidus_admin/sidebar/component.js → ...idus_admin/layout/navigation/component.js
diff --git a/...onents/solidus_admin/sidebar/component.rb → ...idus_admin/layout/navigation/component.rb b/...onents/solidus_admin/sidebar/component.rb → ...idus_admin/layout/navigation/component.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Renders the sidebar
-class SolidusAdmin::Sidebar::Component < SolidusAdmin::BaseComponent
+class SolidusAdmin::Layout::Navigation::Component < SolidusAdmin::BaseComponent
   def initialize(
     store:,
     logo_path: SolidusAdmin::Config.logo_path,

diff --git a/...nents/solidus_admin/sidebar/component.yml → ...dus_admin/layout/navigation/component.yml b/...nents/solidus_admin/sidebar/component.yml → ...dus_admin/layout/navigation/component.yml
diff --git a/...dus_admin/sidebar/item/component.html.erb → ...layout/navigation/item/component.html.erb b/...dus_admin/sidebar/item/component.html.erb → ...layout/navigation/item/component.html.erb
diff --git a/...s/solidus_admin/sidebar/item/component.rb → ...admin/layout/navigation/item/component.rb b/...s/solidus_admin/sidebar/item/component.rb → ...admin/layout/navigation/item/component.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Menu item within a {Sidebar}
-class SolidusAdmin::Sidebar::Item::Component < SolidusAdmin::BaseComponent
+class SolidusAdmin::Layout::Navigation::Item::Component < SolidusAdmin::BaseComponent
   with_collection_parameter :item
 
   # @param item [SolidusAdmin::MainNavItem

diff --git a/admin/app/components/solidus_admin/layout/page_helpers.rb b/admin/app/components/solidus_admin/layout/page_helpers.rb
@@ -7,7 +7,7 @@ def page(**attrs, &block)
 
   def page_header_actions(&block)
     tag.div(safe_join([
-      render(component("feedback").new),
+      render(component("layout/feedback").new),
       capture(&block),
     ]), class: "flex gap-2 items-center")
   end

diff --git a/...ents/solidus_admin/skip_link/component.rb → ...lidus_admin/layout/skip_link/component.rb b/...ents/solidus_admin/skip_link/component.rb → ...lidus_admin/layout/skip_link/component.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Skip to content link
-class SolidusAdmin::SkipLink::Component < SolidusAdmin::BaseComponent
+class SolidusAdmin::Layout::SkipLink::Component < SolidusAdmin::BaseComponent
   # @param href [String] the href attribute for the skip link
   def initialize(href:)
     @href = href

diff --git a/...nts/solidus_admin/skip_link/component.yml → ...idus_admin/layout/skip_link/component.yml b/...nts/solidus_admin/skip_link/component.yml → ...idus_admin/layout/skip_link/component.yml
diff --git a/admin/app/views/layouts/solidus_admin/application.html.erb b/admin/app/views/layouts/solidus_admin/application.html.erb
@@ -8,11 +8,11 @@
   </head>
 
   <body class="bg-gray-15">
-    <%= render component("skip_link").new(href: "#main") %>
+    <%= render component("layout/skip_link").new(href: "#main") %>
     <div class="flex gap-0">
       <div class="min-w-[240px] border-r border-r-gray-100 relative">
         <div class="min-h-screen top-0 sticky flex">
-          <%= render component("sidebar").new(store: current_store) %>
+          <%= render component("layout/navigation").new(store: current_store) %>
         </div>
       </div>
 

diff --git a/...lidus_admin/feedback/component_preview.rb → ...dmin/layout/feedback/component_preview.rb b/...lidus_admin/feedback/component_preview.rb → ...dmin/layout/feedback/component_preview.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# @component "ui/feedback"
-class SolidusAdmin::Feedback::ComponentPreview < ViewComponent::Preview
+class SolidusAdmin::Layout::Feedback::ComponentPreview < ViewComponent::Preview
   include SolidusAdmin::Preview
 
   def overview

diff --git a/...dback/component_preview/overview.html.erb → ...dback/component_preview/overview.html.erb b/...dback/component_preview/overview.html.erb → ...dback/component_preview/overview.html.erb
diff --git a/.../sidebar/account_nav/component_preview.rb → ...t/navigation/account/component_preview.rb b/.../sidebar/account_nav/component_preview.rb → ...t/navigation/account/component_preview.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-# @component "sidebar/account_nav"
-class SolidusAdmin::Sidebar::AccountNav::ComponentPreview < ViewComponent::Preview
+# @component "layout/navigation/account"
+class SolidusAdmin::Layout::Navigation::Account::ComponentPreview < ViewComponent::Preview
   include SolidusAdmin::Preview
 
   def overview

diff --git a/...t_nav/component_preview/overview.html.erb → ...count/component_preview/overview.html.erb b/...t_nav/component_preview/overview.html.erb → ...count/component_preview/overview.html.erb
diff --git a/...nav/component_preview/playground.html.erb → ...unt/component_preview/playground.html.erb b/...nav/component_preview/playground.html.erb → ...unt/component_preview/playground.html.erb
diff --git a/...olidus_admin/sidebar/component_preview.rb → ...in/layout/navigation/component_preview.rb b/...olidus_admin/sidebar/component_preview.rb → ...in/layout/navigation/component_preview.rb
@@ -2,8 +2,8 @@
 
 require "solidus_admin/main_nav_item"
 
-# @component "sidebar"
-class SolidusAdmin::Sidebar::ComponentPreview < ViewComponent::Preview
+# @component "layout/navigation"
+class SolidusAdmin::Layout::Navigation::ComponentPreview < ViewComponent::Preview
   include SolidusAdmin::Preview
 
   # The item component is used to render main navigation items, which are
@@ -17,7 +17,7 @@ class SolidusAdmin::Sidebar::ComponentPreview < ViewComponent::Preview
   #   key: :overview,
   #   position: 80
   # )
-  # render component("sidebar/item", item: item)
+  # render component("layout/navigation/item", item: item)
   # ```
   #
   # @param store_name text

diff --git a/...s_admin/sidebar/item/component_preview.rb → ...yout/navigation/item/component_preview.rb b/...s_admin/sidebar/item/component_preview.rb → ...yout/navigation/item/component_preview.rb
@@ -2,8 +2,8 @@
 
 require "solidus_admin/main_nav_item"
 
-# @component "sidebar/item"
-class SolidusAdmin::Sidebar::Item::ComponentPreview < ViewComponent::Preview
+# @component "layout/navigation/item"
+class SolidusAdmin::Layout::Navigation::Item::ComponentPreview < ViewComponent::Preview
   include SolidusAdmin::Preview
 
   DUMMY_ROUTE = :foo_path

diff --git a/.../item/component_preview/overview.html.erb → .../item/component_preview/overview.html.erb b/.../item/component_preview/overview.html.erb → .../item/component_preview/overview.html.erb
diff --git a/...idus_admin/skip_link/component_preview.rb → ...min/layout/skip_link/component_preview.rb b/...idus_admin/skip_link/component_preview.rb → ...min/layout/skip_link/component_preview.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-# @component "skip_link"
-class SolidusAdmin::SkipLink::ComponentPreview < ViewComponent::Preview
+# @component "layout/skip_link"
+class SolidusAdmin::Layout::SkipLink::ComponentPreview < ViewComponent::Preview
   include SolidusAdmin::Preview
 
   # Click on the "Preview" window area and press "Tab" to see the skip link

diff --git a/...solidus_admin/skip_link/component_spec.rb → ...s_admin/layout/feedback/component_spec.rb b/...solidus_admin/skip_link/component_spec.rb → ...s_admin/layout/feedback/component_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe SolidusAdmin::SkipLink::Component, type: :component do
+RSpec.describe SolidusAdmin::Layout::Feedback::Component, type: :component do
   it "renders the overview preview" do
     render_preview(:overview)
   end

diff --git a/...min/sidebar/account_nav/component_spec.rb → ...yout/navigation/account/component_spec.rb b/...min/sidebar/account_nav/component_spec.rb → ...yout/navigation/account/component_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe SolidusAdmin::Sidebar::AccountNav::Component, type: :component do
+RSpec.describe SolidusAdmin::Layout::Navigation::Account::Component, type: :component do
   it "renders the overview preview" do
     render_preview(:overview)
   end

diff --git a/...s/solidus_admin/sidebar/component_spec.rb → ...admin/layout/navigation/component_spec.rb b/...s/solidus_admin/sidebar/component_spec.rb → ...admin/layout/navigation/component_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe SolidusAdmin::Sidebar::Component, type: :component do
+RSpec.describe SolidusAdmin::Layout::Navigation::Component, type: :component do
   before { allow(vc_test_controller).to receive(:spree_current_user).and_return(build(:user)) }
 
   it "renders the overview preview" do
@@ -32,7 +32,7 @@
   end
 
   it "renders the account nav component" do
-    account_nav_component = mock_component do
+    account_component = mock_component do
       def call
         "account nav"
       end
@@ -42,7 +42,7 @@ def call
       items: [],
     )
     allow(component).to receive(:component).and_call_original
-    allow(component).to receive(:component).with('sidebar/account_nav').and_return(account_nav_component)
+    allow(component).to receive(:component).with('layout/navigation/account').and_return(account_component)
 
     render_inline(component)
 

diff --git a/...idus_admin/sidebar/item/component_spec.rb → .../layout/navigation/item/component_spec.rb b/...idus_admin/sidebar/item/component_spec.rb → .../layout/navigation/item/component_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe SolidusAdmin::Sidebar::Item::Component, type: :component do
+RSpec.describe SolidusAdmin::Layout::Navigation::Item::Component, type: :component do
   def url_helpers(solidus_admin: {}, spree: {})
     double(
       solidus_admin: double(**solidus_admin),

diff --git a/.../solidus_admin/feedback/component_spec.rb → ..._admin/layout/skip_link/component_spec.rb b/.../solidus_admin/feedback/component_spec.rb → ..._admin/layout/skip_link/component_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe SolidusAdmin::Feedback::Component, type: :component do
+RSpec.describe SolidusAdmin::Layout::SkipLink::Component, type: :component do
   it "renders the overview preview" do
     render_preview(:overview)
   end