DEV: Update eslint-config-discourse, use prettier for hbs (#146)
This commit is contained in:
David Taylor
GitHub
parent
fb072aa851
commit
7fb0936e5c
|
|
@ -41,8 +41,8 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
yarn prettier -v
|
yarn prettier -v
|
||||||
if [ 0 -lt $(find assets admin/assets -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
|
if [ 0 -lt $(find assets admin/assets -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" -or -name "*.hbs" \) 2> /dev/null | wc -l) ]; then
|
||||||
yarn prettier --list-different "assets/**/*.{scss,js,es6}"
|
yarn prettier --list-different "assets/**/*.{scss,js,es6,hbs}"
|
||||||
fi
|
fi
|
||||||
if [ 0 -lt $(find test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
|
if [ 0 -lt $(find test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
|
||||||
yarn prettier --list-different "test/**/*.{js,es6}"
|
yarn prettier --list-different "test/**/*.{js,es6}"
|
||||||
|
|
@ -50,7 +50,12 @@ jobs:
|
||||||
|
|
||||||
- name: Ember template lint
|
- name: Ember template lint
|
||||||
if: ${{ !cancelled() }}
|
if: ${{ !cancelled() }}
|
||||||
run: yarn ember-template-lint --no-error-on-unmatched-pattern assets/javascripts admin/assets/javascripts
|
run: yarn ember-template-lint --no-error-on-unmatched-pattern assets/javascripts
|
||||||
|
|
||||||
|
# Separated due to https://github.com/ember-template-lint/ember-template-lint/issues/2758
|
||||||
|
- name: Ember template lint (admin)
|
||||||
|
if: ${{ !cancelled() }}
|
||||||
|
run: yarn ember-template-lint --no-error-on-unmatched-pattern admin/assets/javascripts
|
||||||
|
|
||||||
- name: Rubocop
|
- name: Rubocop
|
||||||
if: ${{ !cancelled() }}
|
if: ${{ !cancelled() }}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
{{#if model.unconfigured}}
|
{{#if model.unconfigured}}
|
||||||
<p>{{i18n "discourse_subscriptions.admin.unconfigured"}}</p>
|
<p>{{i18n "discourse_subscriptions.admin.unconfigured"}}</p>
|
||||||
<p>
|
<p>
|
||||||
<a
|
<a href="https://meta.discourse.org/t/discourse-subscriptions/140818/">
|
||||||
href="https://meta.discourse.org/t/discourse-subscriptions/140818/"
|
|
||||||
>
|
|
||||||
{{i18n "discourse_subscriptions.admin.on_meta"}}
|
{{i18n "discourse_subscriptions.admin.on_meta"}}
|
||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
|
|
@ -60,4 +58,4 @@
|
||||||
create=(action "createNewCoupon")
|
create=(action "createNewCoupon")
|
||||||
}}
|
}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
@ -55,4 +55,4 @@
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{/load-more}}
|
{{/load-more}}
|
||||||
|
|
@ -29,4 +29,4 @@
|
||||||
</tr>
|
</tr>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
@ -71,4 +71,4 @@
|
||||||
{{i18n "discourse_subscriptions.admin.products.product_help"}}
|
{{i18n "discourse_subscriptions.admin.products.product_help"}}
|
||||||
</p>
|
</p>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
@ -135,7 +135,7 @@
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<hr>
|
<hr />
|
||||||
|
|
||||||
<p class="control-instructions">
|
<p class="control-instructions">
|
||||||
{{i18n "discourse_subscriptions.admin.plans.operations.create_help"}}
|
{{i18n "discourse_subscriptions.admin.plans.operations.create_help"}}
|
||||||
|
|
@ -158,4 +158,4 @@
|
||||||
}}
|
}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
@ -124,7 +124,7 @@
|
||||||
{{else}}
|
{{else}}
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="8">
|
<td colspan="8">
|
||||||
<hr>
|
<hr />
|
||||||
{{i18n
|
{{i18n
|
||||||
"discourse_subscriptions.admin.products.product.plan_help"
|
"discourse_subscriptions.admin.products.product.plan_help"
|
||||||
}}
|
}}
|
||||||
|
|
@ -156,4 +156,4 @@
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{outlet}}
|
{{outlet}}
|
||||||
|
|
@ -1 +1 @@
|
||||||
{{outlet}}
|
{{outlet}}
|
||||||
|
|
@ -87,4 +87,4 @@
|
||||||
{{/load-more}}
|
{{/load-more}}
|
||||||
|
|
||||||
{{conditional-loading-spinner condition=loading}}
|
{{conditional-loading-spinner condition=loading}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
}}
|
}}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<hr>
|
<hr />
|
||||||
|
|
||||||
<div id="discourse-subscriptions-admin">
|
<div id="discourse-subscriptions-admin">
|
||||||
{{outlet}}
|
{{outlet}}
|
||||||
|
|
@ -47,4 +47,4 @@
|
||||||
{{i18n "discourse_subscriptions.admin.on_meta"}}
|
{{i18n "discourse_subscriptions.admin.on_meta"}}
|
||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
@ -170,4 +170,4 @@
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
@ -42,4 +42,4 @@
|
||||||
icon="times"
|
icon="times"
|
||||||
class="btn btn-icon"
|
class="btn btn-icon"
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -5,4 +5,4 @@
|
||||||
action=(action "createAccount")
|
action=(action "createAccount")
|
||||||
icon="user"
|
icon="user"
|
||||||
class="btn btn-primary"
|
class="btn btn-primary"
|
||||||
}}
|
}}
|
||||||
|
|
@ -10,4 +10,4 @@
|
||||||
clickPlan=(action "clickPlan")
|
clickPlan=(action "clickPlan")
|
||||||
}}
|
}}
|
||||||
{{/each}}
|
{{/each}}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -18,4 +18,4 @@
|
||||||
<span class="amount">
|
<span class="amount">
|
||||||
{{format-currency this.plan.currency this.plan.amountDollars}}
|
{{format-currency this.plan.currency this.plan.amountDollars}}
|
||||||
</span>
|
</span>
|
||||||
</DButton>
|
</DButton>
|
||||||
|
|
@ -46,4 +46,4 @@
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
@ -4,4 +4,4 @@
|
||||||
{{#each products as |product|}}
|
{{#each products as |product|}}
|
||||||
{{product-item product=product isLoggedIn=isLoggedIn}}
|
{{product-item product=product isLoggedIn=isLoggedIn}}
|
||||||
{{/each}}
|
{{/each}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
@ -1 +1 @@
|
||||||
<div id="card-element"></div>
|
<div id="card-element"></div>
|
||||||
|
|
@ -1 +1 @@
|
||||||
{{campaign-banner connectorName="above-main-container"}}
|
{{campaign-banner connectorName="above-main-container"}}
|
||||||
|
|
@ -1 +1 @@
|
||||||
{{campaign-banner connectorName="after-topic-footer-buttons"}}
|
{{campaign-banner connectorName="after-topic-footer-buttons"}}
|
||||||
|
|
@ -1 +1 @@
|
||||||
{{campaign-banner connectorName="before-topic-list"}}
|
{{campaign-banner connectorName="before-topic-list"}}
|
||||||
|
|
@ -3,4 +3,4 @@
|
||||||
{{d-icon "far-credit-card"}}
|
{{d-icon "far-credit-card"}}
|
||||||
{{i18n "discourse_subscriptions.navigation.billing"}}
|
{{i18n "discourse_subscriptions.navigation.billing"}}
|
||||||
{{/link-to}}
|
{{/link-to}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
@ -23,4 +23,4 @@
|
||||||
{{d-button label="no_value" action=(route-action "closeModal")}}
|
{{d-button label="no_value" action=(route-action "closeModal")}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<hr>
|
<hr />
|
||||||
|
|
||||||
{{outlet}}
|
{{outlet}}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -2,4 +2,4 @@
|
||||||
{{login-required}}
|
{{login-required}}
|
||||||
{{/unless}}
|
{{/unless}}
|
||||||
|
|
||||||
{{product-list products=model isLoggedIn=isLoggedIn}}
|
{{product-list products=model isLoggedIn=isLoggedIn}}
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
{{model.product.name}}
|
{{model.product.name}}
|
||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
<hr>
|
<hr />
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
{{html-safe model.product.description}}
|
{{html-safe model.product.description}}
|
||||||
|
|
@ -17,11 +17,11 @@
|
||||||
{{i18n "discourse_subscriptions.subscribe.card.title"}}
|
{{i18n "discourse_subscriptions.subscribe.card.title"}}
|
||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
<hr>
|
<hr />
|
||||||
|
|
||||||
{{payment-options plans=model.plans selectedPlan=selectedPlan}}
|
{{payment-options plans=model.plans selectedPlan=selectedPlan}}
|
||||||
|
|
||||||
<hr>
|
<hr />
|
||||||
|
|
||||||
{{subscribe-card cardElement=cardElement}}
|
{{subscribe-card cardElement=cardElement}}
|
||||||
|
|
||||||
|
|
@ -57,4 +57,4 @@
|
||||||
{{/link-to}}
|
{{/link-to}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -24,4 +24,4 @@
|
||||||
|
|
||||||
<section class="user-content">
|
<section class="user-content">
|
||||||
{{outlet}}
|
{{outlet}}
|
||||||
</section>
|
</section>
|
||||||
|
|
@ -1 +1 @@
|
||||||
BILLING INDEX
|
BILLING INDEX
|
||||||
|
|
@ -19,4 +19,4 @@
|
||||||
<div class="alert alert-info">
|
<div class="alert alert-info">
|
||||||
{{i18n "discourse_subscriptions.user.payments_help"}}
|
{{i18n "discourse_subscriptions.user.payments_help"}}
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
<h3>{{i18n "discourse_subscriptions.user.subscriptions.update_card.heading" sub_id=model}}</h3>
|
<h3>{{i18n
|
||||||
|
"discourse_subscriptions.user.subscriptions.update_card.heading"
|
||||||
|
sub_id=model
|
||||||
|
}}</h3>
|
||||||
|
|
||||||
<div class="form-vertical">
|
<div class="form-vertical">
|
||||||
<div class="control-group">
|
<div class="control-group">
|
||||||
{{subscribe-card
|
{{subscribe-card cardElement=cardElement class="input-xxlarge"}}
|
||||||
cardElement=cardElement
|
|
||||||
class="input-xxlarge"
|
|
||||||
}}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{save-controls
|
{{save-controls
|
||||||
|
|
@ -14,4 +14,4 @@
|
||||||
saveDisabled=loading
|
saveDisabled=loading
|
||||||
savingText="discourse_subscriptions.user.subscriptions.update_card.single"
|
savingText="discourse_subscriptions.user.subscriptions.update_card.single"
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
}}
|
}}
|
||||||
{{else}}
|
{{else}}
|
||||||
{{d-button
|
{{d-button
|
||||||
action= (route-action "updateCard" subscription.id)
|
action=(route-action "updateCard" subscription.id)
|
||||||
icon="far-edit"
|
icon="far-edit"
|
||||||
class="btn no-text btn-icon"
|
class="btn no-text btn-icon"
|
||||||
}}
|
}}
|
||||||
|
|
@ -52,4 +52,4 @@
|
||||||
<div class="alert alert-info">
|
<div class="alert alert-info">
|
||||||
{{i18n "discourse_subscriptions.user.subscriptions_help"}}
|
{{i18n "discourse_subscriptions.user.subscriptions_help"}}
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
@ -423,7 +423,9 @@ body:not(.archetype-regular):not(.success-animation-off) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
body.subscription-campaign-sidebar:not(.archetype-regular):not(.success-animation-off) {
|
body.subscription-campaign-sidebar:not(.archetype-regular):not(
|
||||||
|
.success-animation-off
|
||||||
|
) {
|
||||||
.fireworks > .before,
|
.fireworks > .before,
|
||||||
.fireworks > .after {
|
.fireworks > .after {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue