From e365ced5312f970ec7b232040ccf09782c151529 Mon Sep 17 00:00:00 2001
From: Isaac Janzen <50783505+janzenisaac@users.noreply.github.com>
Date: Sun, 28 May 2023 09:32:27 -0500
Subject: [PATCH] DEV: Use angle bracket syntax (#167)

---
 ...lugins-discourse-subscriptions-coupons.hbs |  8 ++---
 .../templates/components/payment-options.hbs  | 10 +++----
 .../templates/components/product-list.hbs     |  2 +-
 .../subscriptions-campaign.hbs                |  2 +-
 .../subscriptions-campaign-topic-footer.hbs   |  2 +-
 .../subscriptions-campaign-sidebar.hbs        |  2 +-
 .../discourse/templates/subscribe/index.hbs   |  4 +--
 .../discourse/templates/subscribe/show.hbs    | 30 +++++++++----------
 .../user/billing/subscriptions/card.hbs       |  2 +-
 package.json                                  |  2 +-
 yarn.lock                                     |  2 +-
 11 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-coupons.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-coupons.hbs
index 3e6de1c..899874b 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-coupons.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-coupons.hbs
@@ -53,9 +53,9 @@
   {{/unless}}
 
   {{#if creating}}
-    {{create-coupon-form
-      cancel=(action "closeCreateForm")
-      create=(action "createNewCoupon")
-    }}
+    <CreateCouponForm
+      @cancel={{action "closeCreateForm"}}
+      @create={{action "createNewCoupon"}}
+    />
   {{/if}}
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/payment-options.hbs b/assets/javascripts/discourse/templates/components/payment-options.hbs
index d81899c..6966262 100644
--- a/assets/javascripts/discourse/templates/components/payment-options.hbs
+++ b/assets/javascripts/discourse/templates/components/payment-options.hbs
@@ -4,10 +4,10 @@
 
 <div class="subscribe-buttons">
   {{#each orderedPlans as |plan|}}
-    {{payment-plan
-      plan=plan
-      selectedPlan=selectedPlan
-      clickPlan=(action "clickPlan")
-    }}
+    <PaymentPlan
+      @plan={{plan}}
+      @selectedPlan={{selectedPlan}}
+      @clickPlan={{action "clickPlan"}}
+    />
   {{/each}}
 </div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/components/product-list.hbs b/assets/javascripts/discourse/templates/components/product-list.hbs
index fc22336..80f638c 100644
--- a/assets/javascripts/discourse/templates/components/product-list.hbs
+++ b/assets/javascripts/discourse/templates/components/product-list.hbs
@@ -2,6 +2,6 @@
   <p>{{i18n "discourse_subscriptions.subscribe.no_products"}}</p>
 {{else}}
   {{#each products as |product|}}
-    {{product-item product=product isLoggedIn=isLoggedIn}}
+    <ProductItem @product={{product}} @isLoggedIn={{isLoggedIn}} />
   {{/each}}
 {{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/above-main-container/subscriptions-campaign.hbs b/assets/javascripts/discourse/templates/connectors/above-main-container/subscriptions-campaign.hbs
index 8007616..a467e54 100644
--- a/assets/javascripts/discourse/templates/connectors/above-main-container/subscriptions-campaign.hbs
+++ b/assets/javascripts/discourse/templates/connectors/above-main-container/subscriptions-campaign.hbs
@@ -1 +1 @@
-{{campaign-banner connectorName="above-main-container"}}
\ No newline at end of file
+<CampaignBanner @connectorName="above-main-container" />
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/after-topic-footer-buttons/subscriptions-campaign-topic-footer.hbs b/assets/javascripts/discourse/templates/connectors/after-topic-footer-buttons/subscriptions-campaign-topic-footer.hbs
index a2b73ec..20fea51 100644
--- a/assets/javascripts/discourse/templates/connectors/after-topic-footer-buttons/subscriptions-campaign-topic-footer.hbs
+++ b/assets/javascripts/discourse/templates/connectors/after-topic-footer-buttons/subscriptions-campaign-topic-footer.hbs
@@ -1 +1 @@
-{{campaign-banner connectorName="after-topic-footer-buttons"}}
\ No newline at end of file
+<CampaignBanner @connectorName="after-topic-footer-buttons" />
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/before-topic-list/subscriptions-campaign-sidebar.hbs b/assets/javascripts/discourse/templates/connectors/before-topic-list/subscriptions-campaign-sidebar.hbs
index ba0decd..04bcb5a 100644
--- a/assets/javascripts/discourse/templates/connectors/before-topic-list/subscriptions-campaign-sidebar.hbs
+++ b/assets/javascripts/discourse/templates/connectors/before-topic-list/subscriptions-campaign-sidebar.hbs
@@ -1 +1 @@
-{{campaign-banner connectorName="before-topic-list"}}
\ No newline at end of file
+<CampaignBanner @connectorName="before-topic-list" />
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/subscribe/index.hbs b/assets/javascripts/discourse/templates/subscribe/index.hbs
index 9c3f979..a149651 100644
--- a/assets/javascripts/discourse/templates/subscribe/index.hbs
+++ b/assets/javascripts/discourse/templates/subscribe/index.hbs
@@ -1,5 +1,5 @@
 {{#unless isLoggedIn}}
-  {{login-required}}
+  <LoginRequired />
 {{/unless}}
 
-{{product-list products=model isLoggedIn=isLoggedIn}}
\ No newline at end of file
+<ProductList @products={{model}} @isLoggedIn={{isLoggedIn}} />
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/subscribe/show.hbs b/assets/javascripts/discourse/templates/subscribe/show.hbs
index 354a8c0..fa1981b 100644
--- a/assets/javascripts/discourse/templates/subscribe/show.hbs
+++ b/assets/javascripts/discourse/templates/subscribe/show.hbs
@@ -19,16 +19,16 @@
 
       <hr />
 
-      {{payment-options plans=model.plans selectedPlan=selectedPlan}}
+      <PaymentOptions @plans={{model.plans}} @selectedPlan={{selectedPlan}} />
 
       <hr />
 
-      {{subscribe-card cardElement=cardElement}}
+      <SubscribeCard @cardElement={{cardElement}} />
 
       {{#if loading}}
         {{loading-spinner}}
       {{else if isAnonymous}}
-        {{login-required}}
+        <LoginRequired />
       {{else}}
         <Input
           @type="text"
@@ -40,10 +40,10 @@
           class="subscribe-name"
         />
         <div class="address-fields">
-          {{subscribe-country-select
-            value=cardholderAddress.country
-            onChange=(action "changeCountry")
-          }}
+          <SubscribeCountrySelect
+            @value={{cardholderAddress.country}}
+            @onChange={{action "changeCountry"}}
+          />
           <Input
             @type="text"
             name="cardholder_postal_code"
@@ -74,15 +74,15 @@
             class="subscribe-address-city"
           />
           {{#if isCountryUS}}
-            {{subscribe-us-state-select
-              value=cardholderAddress.state
-              onChange=(action "changeState")
-            }}
+            <SubscribeUsStateSelect
+              @value={{cardholderAddress.state}}
+              @onChange={{action "changeState"}}
+            />
           {{else if isCountryCA}}
-            {{subscribe-ca-province-select
-              value=cardholderAddress.state
-              onChange=(action "changeState")
-            }}
+            <SubscribeCaProvinceSelect
+              @value={{cardholderAddress.state}}
+              @onChange={{action "changeState"}}
+            />
           {{else}}
             <Input
               @type="text"
diff --git a/assets/javascripts/discourse/templates/user/billing/subscriptions/card.hbs b/assets/javascripts/discourse/templates/user/billing/subscriptions/card.hbs
index 56d2867..9d698b3 100644
--- a/assets/javascripts/discourse/templates/user/billing/subscriptions/card.hbs
+++ b/assets/javascripts/discourse/templates/user/billing/subscriptions/card.hbs
@@ -5,7 +5,7 @@
 
 <div class="form-vertical">
   <div class="control-group">
-    {{subscribe-card cardElement=cardElement class="input-xxlarge"}}
+    <SubscribeCard @cardElement={{cardElement}} class="input-xxlarge" />
   </div>
 
   <SaveControls
diff --git a/package.json b/package.json
index 5ae6d0f..43f8c31 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,6 @@
   "author": "Discourse",
   "license": "MIT",
   "devDependencies": {
-    "eslint-config-discourse": "^3.1.0"
+    "eslint-config-discourse": "^3.4.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 5327dd7..90be8cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1145,7 +1145,7 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-discourse@^3.1.0:
+eslint-config-discourse@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/eslint-config-discourse/-/eslint-config-discourse-3.4.0.tgz#636a1824bca48c90aeac5bee2f8d7b993609191f"
   integrity sha512-9jwu8GQPDOxAO0ByV6RbInu5r39HrFvbAHQRJ8YoGg2fuvHcX+p7fYcxEWj64LhmF4qD55cAGhN0Gmj10RVjoQ==