From 5ead25feb6ff5c2d1fdc16de65a4a4fdfead9f3c Mon Sep 17 00:00:00 2001
From: Justin DiRose <justin@justindirose.com>
Date: Mon, 19 Jul 2021 19:56:19 -0500
Subject: [PATCH] REFACTOR: Rename s to subscribe (#86)

---
 .../javascripts/discourse/components/campaign-banner.js.es6   | 2 +-
 .../controllers/{s-index.js.es6 => subscribe-index.js.es6}    | 0
 .../controllers/{s-show.js.es6 => subscribe-show.js.es6}      | 0
 .../discourse/controllers/{s.js.es6 => subscribe.js.es6}      | 0
 .../routes/{s-index.js.es6 => subscribe-index.js.es6}         | 0
 .../discourse/routes/{s-show.js.es6 => subscribe-show.js.es6} | 0
 .../discourse/routes/{s.js.es6 => subscribe.js.es6}           | 0
 assets/javascripts/discourse/subscriptions-route-map.js.es6   | 2 +-
 .../discourse/templates/components/campaign-banner.hbs        | 4 ++--
 .../discourse/templates/components/product-item.hbs           | 4 ++--
 .../javascripts/discourse/templates/{s.hbs => subscribe.hbs}  | 0
 .../discourse/templates/{s => subscribe}/index.hbs            | 0
 .../javascripts/discourse/templates/{s => subscribe}/show.hbs | 0
 13 files changed, 6 insertions(+), 6 deletions(-)
 rename assets/javascripts/discourse/controllers/{s-index.js.es6 => subscribe-index.js.es6} (100%)
 rename assets/javascripts/discourse/controllers/{s-show.js.es6 => subscribe-show.js.es6} (100%)
 rename assets/javascripts/discourse/controllers/{s.js.es6 => subscribe.js.es6} (100%)
 rename assets/javascripts/discourse/routes/{s-index.js.es6 => subscribe-index.js.es6} (100%)
 rename assets/javascripts/discourse/routes/{s-show.js.es6 => subscribe-show.js.es6} (100%)
 rename assets/javascripts/discourse/routes/{s.js.es6 => subscribe.js.es6} (100%)
 rename assets/javascripts/discourse/templates/{s.hbs => subscribe.hbs} (100%)
 rename assets/javascripts/discourse/templates/{s => subscribe}/index.hbs (100%)
 rename assets/javascripts/discourse/templates/{s => subscribe}/show.hbs (100%)

diff --git a/assets/javascripts/discourse/components/campaign-banner.js.es6 b/assets/javascripts/discourse/components/campaign-banner.js.es6
index a5dcbd6..6784aa6 100644
--- a/assets/javascripts/discourse/components/campaign-banner.js.es6
+++ b/assets/javascripts/discourse/components/campaign-banner.js.es6
@@ -119,7 +119,7 @@ export default Component.extend({
     const showOnRoute =
       currentRoute !== "discovery.s" &&
       !currentRoute.split(".")[0].includes("admin") &&
-      currentRoute.split(".")[0] !== "s";
+      currentRoute.split(".")[0] !== "subscribe";
 
     if (!this.site.show_campaign_banner) {
       return false;
diff --git a/assets/javascripts/discourse/controllers/s-index.js.es6 b/assets/javascripts/discourse/controllers/subscribe-index.js.es6
similarity index 100%
rename from assets/javascripts/discourse/controllers/s-index.js.es6
rename to assets/javascripts/discourse/controllers/subscribe-index.js.es6
diff --git a/assets/javascripts/discourse/controllers/s-show.js.es6 b/assets/javascripts/discourse/controllers/subscribe-show.js.es6
similarity index 100%
rename from assets/javascripts/discourse/controllers/s-show.js.es6
rename to assets/javascripts/discourse/controllers/subscribe-show.js.es6
diff --git a/assets/javascripts/discourse/controllers/s.js.es6 b/assets/javascripts/discourse/controllers/subscribe.js.es6
similarity index 100%
rename from assets/javascripts/discourse/controllers/s.js.es6
rename to assets/javascripts/discourse/controllers/subscribe.js.es6
diff --git a/assets/javascripts/discourse/routes/s-index.js.es6 b/assets/javascripts/discourse/routes/subscribe-index.js.es6
similarity index 100%
rename from assets/javascripts/discourse/routes/s-index.js.es6
rename to assets/javascripts/discourse/routes/subscribe-index.js.es6
diff --git a/assets/javascripts/discourse/routes/s-show.js.es6 b/assets/javascripts/discourse/routes/subscribe-show.js.es6
similarity index 100%
rename from assets/javascripts/discourse/routes/s-show.js.es6
rename to assets/javascripts/discourse/routes/subscribe-show.js.es6
diff --git a/assets/javascripts/discourse/routes/s.js.es6 b/assets/javascripts/discourse/routes/subscribe.js.es6
similarity index 100%
rename from assets/javascripts/discourse/routes/s.js.es6
rename to assets/javascripts/discourse/routes/subscribe.js.es6
diff --git a/assets/javascripts/discourse/subscriptions-route-map.js.es6 b/assets/javascripts/discourse/subscriptions-route-map.js.es6
index e326593..2d68b94 100644
--- a/assets/javascripts/discourse/subscriptions-route-map.js.es6
+++ b/assets/javascripts/discourse/subscriptions-route-map.js.es6
@@ -1,5 +1,5 @@
 export default function () {
-  this.route("s", function () {
+  this.route("subscribe", { path: "/s" }, function () {
     this.route("show", { path: "/:subscription-id" });
   });
 }
diff --git a/assets/javascripts/discourse/templates/components/campaign-banner.hbs b/assets/javascripts/discourse/templates/components/campaign-banner.hbs
index 1807103..d6349ec 100644
--- a/assets/javascripts/discourse/templates/components/campaign-banner.hbs
+++ b/assets/javascripts/discourse/templates/components/campaign-banner.hbs
@@ -14,11 +14,11 @@
         <p class="campaign-banner-info-description">{{i18n "discourse_subscriptions.campaign.body"}}</p>
 
         {{#if product}}
-          {{#link-to "s.show" product disabled=product.subscribed class="btn btn-primary campaign-banner-info-button"}}
+          {{#link-to "subscribe.show" product disabled=product.subscribed class="btn btn-primary campaign-banner-info-button"}}
             {{d-icon "far-heart"}} {{d-icon "heart" class="hover-heart"}} {{i18n "discourse_subscriptions.campaign.button"}}
           {{/link-to}}
         {{else}}
-          {{#link-to "s" class="btn btn-primary campaign-banner-info-button"}}
+          {{#link-to "subscribe" class="btn btn-primary campaign-banner-info-button"}}
             {{d-icon "far-heart"}} {{d-icon "heart" class="hover-heart"}} {{i18n "discourse_subscriptions.campaign.button"}}
           {{/link-to}}
         {{/if}}
diff --git a/assets/javascripts/discourse/templates/components/product-item.hbs b/assets/javascripts/discourse/templates/components/product-item.hbs
index 4ef4300..c1e46dd 100644
--- a/assets/javascripts/discourse/templates/components/product-item.hbs
+++ b/assets/javascripts/discourse/templates/components/product-item.hbs
@@ -7,7 +7,7 @@
 {{#if isLoggedIn}}
   <div class="product-purchase">
     {{#if product.repurchaseable}}
-      {{#link-to "s.show" product.id class="btn btn-primary"}}
+      {{#link-to "subscribe.show" product.id class="btn btn-primary"}}
         {{i18n "discourse_subscriptions.subscribe.title"}}
       {{/link-to}}
       {{#if product.subscribed}}
@@ -22,7 +22,7 @@
           {{i18n "discourse_subscriptions.subscribe.go_to_billing"}}
         {{/link-to}}
       {{else}}
-        {{#link-to "s.show" product.id disabled=product.subscribed class="btn btn-primary"}}
+        {{#link-to "subscribe.show" product.id disabled=product.subscribed class="btn btn-primary"}}
           {{i18n "discourse_subscriptions.subscribe.title"}}
         {{/link-to}}
       {{/if}}
diff --git a/assets/javascripts/discourse/templates/s.hbs b/assets/javascripts/discourse/templates/subscribe.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/s.hbs
rename to assets/javascripts/discourse/templates/subscribe.hbs
diff --git a/assets/javascripts/discourse/templates/s/index.hbs b/assets/javascripts/discourse/templates/subscribe/index.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/s/index.hbs
rename to assets/javascripts/discourse/templates/subscribe/index.hbs
diff --git a/assets/javascripts/discourse/templates/s/show.hbs b/assets/javascripts/discourse/templates/subscribe/show.hbs
similarity index 100%
rename from assets/javascripts/discourse/templates/s/show.hbs
rename to assets/javascripts/discourse/templates/subscribe/show.hbs