From 3828578d5d4a8bcd5170e2f2b65d009d680e80a8 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 7 Nov 2023 17:24:51 +0000 Subject: [PATCH] DEV: Restructure file locations - Colocate components / connectors - Move admin UI files to `admin/assets` so they are only served to admins --- .../assets}/javascripts/discourse/adplugin-route-map.js | 0 .../javascripts/discourse/components/house-ads-chooser.js | 0 .../discourse}/components/house-ads-list-setting.hbs | 0 .../discourse/components/house-ads-list-setting.js | 0 .../javascripts/discourse}/components/house-ads-setting.hbs | 0 .../javascripts/discourse/components/house-ads-setting.js | 0 .../discourse/controllers/admin-plugins-house-ads-index.js | 0 .../discourse/controllers/admin-plugins-house-ads-show.js | 0 .../discourse/controllers/admin-plugins-house-ads.js | 0 .../discourse/routes/admin-plugins-house-ads-index.js | 0 .../discourse/routes/admin-plugins-house-ads-show.js | 0 .../javascripts/discourse/routes/admin-plugins-house-ads.js | 0 .../discourse/templates/admin/plugins-house-ads-index.hbs | 0 .../discourse/templates/admin/plugins-house-ads-show.hbs | 0 .../discourse/templates/admin/plugins-house-ads.hbs | 0 .../discourse/{templates => }/components/ad-slot.hbs | 0 .../discourse/{templates => }/components/adbutler-ad.hbs | 0 .../{templates => }/components/amazon-product-links.hbs | 0 .../discourse/{templates => }/components/carbonads-ad.hbs | 0 .../discourse/{templates => }/components/google-adsense.hbs | 0 .../discourse/{templates => }/components/google-dfp-ad.hbs | 0 .../discourse/{templates => }/components/house-ad.hbs | 0 assets/javascripts/discourse/components/post-bottom-ad.hbs | 5 +++++ .../connectors/after-topic-list-item/discourse-adplugin.hbs | 0 .../connectors/after-topic-list-item/discourse-adplugin.js | 0 .../discovery-list-container-top/discourse-adplugin.hbs | 0 .../connectors/post-bottom/discourse-adplugin.hbs | 0 .../topic-above-post-stream/discourse-adplugin.hbs | 0 .../connectors/topic-above-suggested/discourse-adplugin.hbs | 0 .../{ => discourse}/initializers/initialize-ad-plugin.js | 0 .../discourse/templates/components/post-bottom-ad.hbs | 5 ----- 31 files changed, 5 insertions(+), 5 deletions(-) rename {assets => admin/assets}/javascripts/discourse/adplugin-route-map.js (100%) rename {assets => admin/assets}/javascripts/discourse/components/house-ads-chooser.js (100%) rename {assets/javascripts/discourse/templates => admin/assets/javascripts/discourse}/components/house-ads-list-setting.hbs (100%) rename {assets => admin/assets}/javascripts/discourse/components/house-ads-list-setting.js (100%) rename {assets/javascripts/discourse/templates => admin/assets/javascripts/discourse}/components/house-ads-setting.hbs (100%) rename {assets => admin/assets}/javascripts/discourse/components/house-ads-setting.js (100%) rename {assets => admin/assets}/javascripts/discourse/controllers/admin-plugins-house-ads-index.js (100%) rename {assets => admin/assets}/javascripts/discourse/controllers/admin-plugins-house-ads-show.js (100%) rename {assets => admin/assets}/javascripts/discourse/controllers/admin-plugins-house-ads.js (100%) rename {assets => admin/assets}/javascripts/discourse/routes/admin-plugins-house-ads-index.js (100%) rename {assets => admin/assets}/javascripts/discourse/routes/admin-plugins-house-ads-show.js (100%) rename {assets => admin/assets}/javascripts/discourse/routes/admin-plugins-house-ads.js (100%) rename {assets => admin/assets}/javascripts/discourse/templates/admin/plugins-house-ads-index.hbs (100%) rename {assets => admin/assets}/javascripts/discourse/templates/admin/plugins-house-ads-show.hbs (100%) rename {assets => admin/assets}/javascripts/discourse/templates/admin/plugins-house-ads.hbs (100%) rename assets/javascripts/discourse/{templates => }/components/ad-slot.hbs (100%) rename assets/javascripts/discourse/{templates => }/components/adbutler-ad.hbs (100%) rename assets/javascripts/discourse/{templates => }/components/amazon-product-links.hbs (100%) rename assets/javascripts/discourse/{templates => }/components/carbonads-ad.hbs (100%) rename assets/javascripts/discourse/{templates => }/components/google-adsense.hbs (100%) rename assets/javascripts/discourse/{templates => }/components/google-dfp-ad.hbs (100%) rename assets/javascripts/discourse/{templates => }/components/house-ad.hbs (100%) create mode 100644 assets/javascripts/discourse/components/post-bottom-ad.hbs rename assets/javascripts/discourse/{templates => }/connectors/after-topic-list-item/discourse-adplugin.hbs (100%) rename assets/javascripts/discourse/{templates => }/connectors/after-topic-list-item/discourse-adplugin.js (100%) rename assets/javascripts/discourse/{templates => }/connectors/discovery-list-container-top/discourse-adplugin.hbs (100%) rename assets/javascripts/discourse/{templates => }/connectors/post-bottom/discourse-adplugin.hbs (100%) rename assets/javascripts/discourse/{templates => }/connectors/topic-above-post-stream/discourse-adplugin.hbs (100%) rename assets/javascripts/discourse/{templates => }/connectors/topic-above-suggested/discourse-adplugin.hbs (100%) rename assets/javascripts/{ => discourse}/initializers/initialize-ad-plugin.js (100%) delete mode 100644 assets/javascripts/discourse/templates/components/post-bottom-ad.hbs diff --git a/assets/javascripts/discourse/adplugin-route-map.js b/admin/assets/javascripts/discourse/adplugin-route-map.js similarity index 100% rename from assets/javascripts/discourse/adplugin-route-map.js rename to admin/assets/javascripts/discourse/adplugin-route-map.js diff --git a/assets/javascripts/discourse/components/house-ads-chooser.js b/admin/assets/javascripts/discourse/components/house-ads-chooser.js similarity index 100% rename from assets/javascripts/discourse/components/house-ads-chooser.js rename to admin/assets/javascripts/discourse/components/house-ads-chooser.js diff --git a/assets/javascripts/discourse/templates/components/house-ads-list-setting.hbs b/admin/assets/javascripts/discourse/components/house-ads-list-setting.hbs similarity index 100% rename from assets/javascripts/discourse/templates/components/house-ads-list-setting.hbs rename to admin/assets/javascripts/discourse/components/house-ads-list-setting.hbs diff --git a/assets/javascripts/discourse/components/house-ads-list-setting.js b/admin/assets/javascripts/discourse/components/house-ads-list-setting.js similarity index 100% rename from assets/javascripts/discourse/components/house-ads-list-setting.js rename to admin/assets/javascripts/discourse/components/house-ads-list-setting.js diff --git a/assets/javascripts/discourse/templates/components/house-ads-setting.hbs b/admin/assets/javascripts/discourse/components/house-ads-setting.hbs similarity index 100% rename from assets/javascripts/discourse/templates/components/house-ads-setting.hbs rename to admin/assets/javascripts/discourse/components/house-ads-setting.hbs diff --git a/assets/javascripts/discourse/components/house-ads-setting.js b/admin/assets/javascripts/discourse/components/house-ads-setting.js similarity index 100% rename from assets/javascripts/discourse/components/house-ads-setting.js rename to admin/assets/javascripts/discourse/components/house-ads-setting.js diff --git a/assets/javascripts/discourse/controllers/admin-plugins-house-ads-index.js b/admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads-index.js similarity index 100% rename from assets/javascripts/discourse/controllers/admin-plugins-house-ads-index.js rename to admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads-index.js diff --git a/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js b/admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js similarity index 100% rename from assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js rename to admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js diff --git a/assets/javascripts/discourse/controllers/admin-plugins-house-ads.js b/admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads.js similarity index 100% rename from assets/javascripts/discourse/controllers/admin-plugins-house-ads.js rename to admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads.js diff --git a/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js b/admin/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js similarity index 100% rename from assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js rename to admin/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js diff --git a/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js b/admin/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js similarity index 100% rename from assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js rename to admin/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js diff --git a/assets/javascripts/discourse/routes/admin-plugins-house-ads.js b/admin/assets/javascripts/discourse/routes/admin-plugins-house-ads.js similarity index 100% rename from assets/javascripts/discourse/routes/admin-plugins-house-ads.js rename to admin/assets/javascripts/discourse/routes/admin-plugins-house-ads.js diff --git a/assets/javascripts/discourse/templates/admin/plugins-house-ads-index.hbs b/admin/assets/javascripts/discourse/templates/admin/plugins-house-ads-index.hbs similarity index 100% rename from assets/javascripts/discourse/templates/admin/plugins-house-ads-index.hbs rename to admin/assets/javascripts/discourse/templates/admin/plugins-house-ads-index.hbs diff --git a/assets/javascripts/discourse/templates/admin/plugins-house-ads-show.hbs b/admin/assets/javascripts/discourse/templates/admin/plugins-house-ads-show.hbs similarity index 100% rename from assets/javascripts/discourse/templates/admin/plugins-house-ads-show.hbs rename to admin/assets/javascripts/discourse/templates/admin/plugins-house-ads-show.hbs diff --git a/assets/javascripts/discourse/templates/admin/plugins-house-ads.hbs b/admin/assets/javascripts/discourse/templates/admin/plugins-house-ads.hbs similarity index 100% rename from assets/javascripts/discourse/templates/admin/plugins-house-ads.hbs rename to admin/assets/javascripts/discourse/templates/admin/plugins-house-ads.hbs diff --git a/assets/javascripts/discourse/templates/components/ad-slot.hbs b/assets/javascripts/discourse/components/ad-slot.hbs similarity index 100% rename from assets/javascripts/discourse/templates/components/ad-slot.hbs rename to assets/javascripts/discourse/components/ad-slot.hbs diff --git a/assets/javascripts/discourse/templates/components/adbutler-ad.hbs b/assets/javascripts/discourse/components/adbutler-ad.hbs similarity index 100% rename from assets/javascripts/discourse/templates/components/adbutler-ad.hbs rename to assets/javascripts/discourse/components/adbutler-ad.hbs diff --git a/assets/javascripts/discourse/templates/components/amazon-product-links.hbs b/assets/javascripts/discourse/components/amazon-product-links.hbs similarity index 100% rename from assets/javascripts/discourse/templates/components/amazon-product-links.hbs rename to assets/javascripts/discourse/components/amazon-product-links.hbs diff --git a/assets/javascripts/discourse/templates/components/carbonads-ad.hbs b/assets/javascripts/discourse/components/carbonads-ad.hbs similarity index 100% rename from assets/javascripts/discourse/templates/components/carbonads-ad.hbs rename to assets/javascripts/discourse/components/carbonads-ad.hbs diff --git a/assets/javascripts/discourse/templates/components/google-adsense.hbs b/assets/javascripts/discourse/components/google-adsense.hbs similarity index 100% rename from assets/javascripts/discourse/templates/components/google-adsense.hbs rename to assets/javascripts/discourse/components/google-adsense.hbs diff --git a/assets/javascripts/discourse/templates/components/google-dfp-ad.hbs b/assets/javascripts/discourse/components/google-dfp-ad.hbs similarity index 100% rename from assets/javascripts/discourse/templates/components/google-dfp-ad.hbs rename to assets/javascripts/discourse/components/google-dfp-ad.hbs diff --git a/assets/javascripts/discourse/templates/components/house-ad.hbs b/assets/javascripts/discourse/components/house-ad.hbs similarity index 100% rename from assets/javascripts/discourse/templates/components/house-ad.hbs rename to assets/javascripts/discourse/components/house-ad.hbs diff --git a/assets/javascripts/discourse/components/post-bottom-ad.hbs b/assets/javascripts/discourse/components/post-bottom-ad.hbs new file mode 100644 index 0000000..b67e781 --- /dev/null +++ b/assets/javascripts/discourse/components/post-bottom-ad.hbs @@ -0,0 +1,5 @@ +{{ad-slot + placement="post-bottom" + category=@model.topic.category.slug + postNumber=@model.post_number +}} \ No newline at end of file diff --git a/assets/javascripts/discourse/templates/connectors/after-topic-list-item/discourse-adplugin.hbs b/assets/javascripts/discourse/connectors/after-topic-list-item/discourse-adplugin.hbs similarity index 100% rename from assets/javascripts/discourse/templates/connectors/after-topic-list-item/discourse-adplugin.hbs rename to assets/javascripts/discourse/connectors/after-topic-list-item/discourse-adplugin.hbs diff --git a/assets/javascripts/discourse/templates/connectors/after-topic-list-item/discourse-adplugin.js b/assets/javascripts/discourse/connectors/after-topic-list-item/discourse-adplugin.js similarity index 100% rename from assets/javascripts/discourse/templates/connectors/after-topic-list-item/discourse-adplugin.js rename to assets/javascripts/discourse/connectors/after-topic-list-item/discourse-adplugin.js diff --git a/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-adplugin.hbs b/assets/javascripts/discourse/connectors/discovery-list-container-top/discourse-adplugin.hbs similarity index 100% rename from assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-adplugin.hbs rename to assets/javascripts/discourse/connectors/discovery-list-container-top/discourse-adplugin.hbs diff --git a/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-adplugin.hbs b/assets/javascripts/discourse/connectors/post-bottom/discourse-adplugin.hbs similarity index 100% rename from assets/javascripts/discourse/templates/connectors/post-bottom/discourse-adplugin.hbs rename to assets/javascripts/discourse/connectors/post-bottom/discourse-adplugin.hbs diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-adplugin.hbs b/assets/javascripts/discourse/connectors/topic-above-post-stream/discourse-adplugin.hbs similarity index 100% rename from assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-adplugin.hbs rename to assets/javascripts/discourse/connectors/topic-above-post-stream/discourse-adplugin.hbs diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-adplugin.hbs b/assets/javascripts/discourse/connectors/topic-above-suggested/discourse-adplugin.hbs similarity index 100% rename from assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-adplugin.hbs rename to assets/javascripts/discourse/connectors/topic-above-suggested/discourse-adplugin.hbs diff --git a/assets/javascripts/initializers/initialize-ad-plugin.js b/assets/javascripts/discourse/initializers/initialize-ad-plugin.js similarity index 100% rename from assets/javascripts/initializers/initialize-ad-plugin.js rename to assets/javascripts/discourse/initializers/initialize-ad-plugin.js diff --git a/assets/javascripts/discourse/templates/components/post-bottom-ad.hbs b/assets/javascripts/discourse/templates/components/post-bottom-ad.hbs deleted file mode 100644 index b134aa9..0000000 --- a/assets/javascripts/discourse/templates/components/post-bottom-ad.hbs +++ /dev/null @@ -1,5 +0,0 @@ -{{ad-slot - placement="post-bottom" - category=model.topic.category.slug - postNumber=model.post_number -}} \ No newline at end of file