Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEV: Update linting #152

Merged
merged 1 commit into from
Nov 20, 2024
Merged

DEV: Update linting #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions assets/javascripts/discourse/connectors/admin-user-details/patreon.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
<h1>{{i18n "patreon.title"}}</h1>
<div class="display-row">
<div class="field">{{i18n "patreon.field.id"}}</div>
<div class="value">{{model.patreon_id}}</div>
<div class="value">{{this.model.patreon_id}}</div>
</div>
{{#if model.patreon_email_exists}}
{{#if this.model.patreon_email_exists}}
<div class="display-row">
<div class="field">{{i18n "patreon.field.email"}}</div>
<div class="value">
{{#if patreon_email}}
{{patreon_email}}
{{#if this.patreon_email}}
{{this.patreon_email}}
{{else}}
<DButton
@action={{action "checkPatreonEmail" model}}
@action={{action "checkPatreonEmail" this.model}}
@icon="far-envelope"
@label="admin.users.check_email.text"
@title="admin.users.check_email.title"
Expand All @@ -22,36 +22,36 @@
</div>
</div>
{{/if}}
{{#if model.patreon_amount_cents}}
{{#if this.model.patreon_amount_cents}}
<div class="display-row">
<div class="field">{{i18n "patreon.field.amount_cents"}}</div>
<div class="value">{{model.patreon_amount_cents}}</div>
<div class="value">{{this.model.patreon_amount_cents}}</div>
</div>
{{/if}}
{{#if model.patreon_rewards}}
{{#if this.model.patreon_rewards}}
<div class="display-row">
<div class="field">{{i18n "patreon.field.rewards"}}</div>
<div class="value">{{model.patreon_rewards}}</div>
<div class="value">{{this.model.patreon_rewards}}</div>
</div>
{{/if}}
{{#if model.patreon_declined_since}}
{{#if this.model.patreon_declined_since}}
<div class="display-row">
<div class="field">{{i18n "patreon.field.declined_since"}}</div>
<div class="value">{{html-safe
format-date
model.patreon_declined_since
this.format-date
this.model.patreon_declined_since
}}</div>
</div>
{{/if}}
<div class="display-row">
<div class="field">{{i18n "patreon.field.more_details.label"}}</div>
<div class="value">
<a rel="noopener noreferrer" target="_blank" href={{patron_url}}>
<a rel="noopener noreferrer" target="_blank" href={{this.patron_url}}>
{{d-icon "external-link-alt"}}
</a>
</div>
<div class="controls">
{{#if model.patreon_email}}
{{#if this.model.patreon_email}}
{{i18n "patreon.field.more_details.help_text.email_available"}}
{{else}}
{{i18n "patreon.field.more_details.help_text.email_not_available"}}
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/discourse/connectors/topic-above-footer-buttons/patreon.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{#if showDonationPrompt}}
{{#if this.showDonationPrompt}}
<div class="patreon-donation-prompt">
<span role="button" class="close" {{action "close"}}>
{{d-icon "times"}}
Expand All @@ -7,7 +7,7 @@
{{html-safe
(i18n
"patreon.donation_prompt.body"
campaignUrl=siteSettings.patreon_donation_prompt_campaign_url
campaignUrl=this.siteSettings.patreon_donation_prompt_campaign_url
)
}}
</div>
Expand Down
16 changes: 8 additions & 8 deletions assets/javascripts/discourse/templates/admin/plugins-patreon.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</thead>

<tbody>
{{#each model as |rule|}}
{{#each this.model as |rule|}}
<tr class="">
<td>{{rule.group}}</td>
<td>{{rule.rewards}}</td>
Expand All @@ -32,15 +32,15 @@
<tfoot>
<tr class="new-filter">
<td><ComboBox
@value={{editing.group_id}}
@content={{groups}}
@value={{this.editing.group_id}}
@content={{this.groups}}
@nameProperty="name"
@valueProperty="id"
@none="patreon.select_group"
/></td>
<td><ListSetting
@value={{editing.reward_list}}
@choices={{rewardsNames}}
@value={{this.editing.reward_list}}
@choices={{this.rewardsNames}}
class="rewards"
/></td>
<td>
Expand All @@ -62,15 +62,15 @@
<DButton
@action={{action "updateData"}}
@icon="refresh"
@disabled={{updatingData}}
@disabled={{this.updatingData}}
@title="patreon.update_data"
@label="patreon.update_data"
/>

{{#if last_sync_at}}
{{#if this.last_sync_at}}
<span class="last_synced">
{{i18n "patreon.last_synced"}}:
{{html-safe (format-date last_sync_at leaveAgo="true")}}
{{html-safe (format-date this.last_sync_at leaveAgo="true")}}
</span>
{{/if}}
</section>
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"devDependencies": {
"@discourse/lint-configs": "2.0.1",
"@discourse/lint-configs": "2.2.0",
"ember-template-lint": "6.0.0",
"eslint": "9.14.0",
"prettier": "2.8.8"
Expand Down
Loading