diff --git a/app/components/button.hbs b/app/components/button.hbs index b238443..aa15bff 100644 --- a/app/components/button.hbs +++ b/app/components/button.hbs @@ -20,7 +20,7 @@ ...attributes > {{#if this.icon}} - + {{/if}} {{#if this.text}} {{this.text}} diff --git a/app/components/button.js b/app/components/button.js index 99c0d8f..36f9eb2 100644 --- a/app/components/button.js +++ b/app/components/button.js @@ -1,6 +1,9 @@ import Component from '@glimmer/component'; import { action } from '@ember/object'; import { tracked } from '@glimmer/tracking'; +import ClockOutline from 'ember-mdi/components/md-icon/clock-outline'; +import Check from 'ember-mdi/components/md-icon/check'; +import AlertCircleOutline from 'ember-mdi/components/md-icon/alert-circle-outline'; export default class ButtonComponent extends Component { @tracked _state = 'default'; @@ -26,13 +29,13 @@ export default class ButtonComponent extends Component { } get icon() { - if (this.isPending && this.args.pendingIcon) { - return this.args.pendingIcon; - } else if (this.isFulfilled && this.args.fulfilledIcon) { - return this.args.fulfilledIcon; - } else if (this.isRejected && this.args.rejectedIcon) { - return this.args.rejectedIcon; - } else if (this.isSettled && this.args.settledIcon) { + if (this.isPending) { + return this.args.pendingIcon ?? ClockOutline; + } else if (this.isFulfilled) { + return this.args.fulfilledIcon ?? Check; + } else if (this.isRejected) { + return this.args.rejectedIcon ?? AlertCircleOutline; + } else if (this.isSettled) { return this.args.settledIcon; } diff --git a/app/components/input-checkbox.hbs b/app/components/input-checkbox.hbs index 64d50e1..632496d 100644 --- a/app/components/input-checkbox.hbs +++ b/app/components/input-checkbox.hbs @@ -1,4 +1,8 @@ diff --git a/app/components/input-text.hbs b/app/components/input-text.hbs index d0afa55..827c42f 100644 --- a/app/components/input-text.hbs +++ b/app/components/input-text.hbs @@ -1,15 +1,13 @@
{{#if @label}} - + {{/if}}
{{#if @prefixIcon}} - + <@prefixIcon class="h-8 w-8 pl-2" /> {{/if}} - + />
{{#if @helper}} -
{{@helper}}
+
+ {{@helper}} +
{{/if}}
diff --git a/app/components/input-textarea.hbs b/app/components/input-textarea.hbs index 72be797..22206c4 100644 --- a/app/components/input-textarea.hbs +++ b/app/components/input-textarea.hbs @@ -1,15 +1,13 @@
{{#if @label}} - + {{/if}}
{{#if @prefixIcon}} - + <@prefixIcon class="h-8 w-8 pl-2" /> {{/if}} - + > + {{@value}} +
{{#if @helper}} -
{{@helper}}
+
+ {{@helper}} +
{{/if}}
diff --git a/app/components/menu-item.hbs b/app/components/menu-item.hbs index aec65cf..d29a48f 100644 --- a/app/components/menu-item.hbs +++ b/app/components/menu-item.hbs @@ -1,6 +1,6 @@ {{#if @icon}} - + <@icon /> {{/if}} {{@name}} diff --git a/app/components/pagination.hbs b/app/components/pagination.hbs index 786fefd..b78f0fe 100644 --- a/app/components/pagination.hbs +++ b/app/components/pagination.hbs @@ -1,6 +1,8 @@ {{#if (gt this.totalPages 1)}}