From 524cb5211b97fbe406321b40b5746c290535a8b0 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 14 Feb 2023 13:58:14 +0000 Subject: [PATCH] DEV: Revert colocation of components with mobile templates (#20285) Separate mobile templates aren't compatible with colocation. Reverting for now. --- .../app/{ => templates}/components/categories-only.hbs | 0 .../components/categories-with-featured-topics.hbs | 0 .../discourse/app/{ => templates}/components/directory-item.hbs | 0 .../discourse/app/{ => templates}/components/navigation-bar.hbs | 0 .../app/{ => templates}/components/parent-category-row.hbs | 0 .../app/{ => templates}/components/sub-category-item.hbs | 0 .../app/{ => templates}/components/sub-category-row.hbs | 0 .../components/subcategories-with-featured-topics.hbs | 0 spec/integrity/coding_style_spec.rb | 2 +- 9 files changed, 1 insertion(+), 1 deletion(-) rename app/assets/javascripts/discourse/app/{ => templates}/components/categories-only.hbs (100%) rename app/assets/javascripts/discourse/app/{ => templates}/components/categories-with-featured-topics.hbs (100%) rename app/assets/javascripts/discourse/app/{ => templates}/components/directory-item.hbs (100%) rename app/assets/javascripts/discourse/app/{ => templates}/components/navigation-bar.hbs (100%) rename app/assets/javascripts/discourse/app/{ => templates}/components/parent-category-row.hbs (100%) rename app/assets/javascripts/discourse/app/{ => templates}/components/sub-category-item.hbs (100%) rename app/assets/javascripts/discourse/app/{ => templates}/components/sub-category-row.hbs (100%) rename app/assets/javascripts/discourse/app/{ => templates}/components/subcategories-with-featured-topics.hbs (100%) diff --git a/app/assets/javascripts/discourse/app/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/components/categories-only.hbs rename to app/assets/javascripts/discourse/app/templates/components/categories-only.hbs diff --git a/app/assets/javascripts/discourse/app/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/components/categories-with-featured-topics.hbs rename to app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs diff --git a/app/assets/javascripts/discourse/app/components/directory-item.hbs b/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/components/directory-item.hbs rename to app/assets/javascripts/discourse/app/templates/components/directory-item.hbs diff --git a/app/assets/javascripts/discourse/app/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/components/navigation-bar.hbs rename to app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs diff --git a/app/assets/javascripts/discourse/app/components/parent-category-row.hbs b/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/components/parent-category-row.hbs rename to app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs diff --git a/app/assets/javascripts/discourse/app/components/sub-category-item.hbs b/app/assets/javascripts/discourse/app/templates/components/sub-category-item.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/components/sub-category-item.hbs rename to app/assets/javascripts/discourse/app/templates/components/sub-category-item.hbs diff --git a/app/assets/javascripts/discourse/app/components/sub-category-row.hbs b/app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/components/sub-category-row.hbs rename to app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs diff --git a/app/assets/javascripts/discourse/app/components/subcategories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/subcategories-with-featured-topics.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/components/subcategories-with-featured-topics.hbs rename to app/assets/javascripts/discourse/app/templates/components/subcategories-with-featured-topics.hbs diff --git a/spec/integrity/coding_style_spec.rb b/spec/integrity/coding_style_spec.rb index ad9cc91cbbf..c90c8bcae4e 100644 --- a/spec/integrity/coding_style_spec.rb +++ b/spec/integrity/coding_style_spec.rb @@ -48,7 +48,7 @@ RSpec.describe "Coding style" do describe "non-colocated component templates" do { - "discourse" => "app/assets/javascripts/discourse/app/templates/components", + # "discourse" => "app/assets/javascripts/discourse/app/templates/components", "admin" => "app/assets/javascripts/admin/addon/templates/components", "chat/discourse" => "plugins/chat/assets/javascripts/discourse/templates/components", "chat/admin" => "plugins/chat/assets/javascripts/admin/templates/components",