From a2c6bc643d67d808847e1c52081d9eff392b2b12 Mon Sep 17 00:00:00 2001 From: Cameron Perera Date: Tue, 26 Apr 2022 14:56:13 -0500 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20the=20.templat?= =?UTF-8?q?e-lintrc.js=20file=20in=20addons/rose=20(#1073)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ Closes: ICU-4123 --- addons/rose/.template-lintrc.js | 3 +- .../addon/components/rose/badge/index.hbs | 14 ++- .../addon/components/rose/button/index.hbs | 33 +++---- .../addon/components/rose/card/link/index.hbs | 24 +++--- .../addon/components/rose/cards/index.hbs | 11 +-- .../components/rose/dialog/body/index.hbs | 4 +- .../components/rose/dialog/cover/index.hbs | 22 ++--- .../addon/components/rose/dialog/index.hbs | 73 +++++++++------- .../components/rose/dropdown/button/index.hbs | 21 +++-- .../addon/components/rose/dropdown/index.hbs | 61 +++++++------ .../rose/dropdown/key-value/index.hbs | 4 +- .../components/rose/dropdown/link/index.hbs | 14 +-- .../rose/dropdown/section/index.hbs | 11 ++- .../components/rose/footer/brand/index.hbs | 6 +- .../rose/footer/copyright/index.hbs | 10 +-- .../addon/components/rose/footer/index.hbs | 19 ++-- .../components/rose/footer/nav/index.hbs | 6 +- .../components/rose/footer/nav/link/index.hbs | 11 +-- .../components/rose/footer/product/index.hbs | 6 +- .../rose/form/actions/edit-toggle/index.hbs | 9 +- .../components/rose/form/actions/index.hbs | 14 ++- .../rose/form/checkbox/group/index.hbs | 23 ++--- .../components/rose/form/checkbox/index.hbs | 28 +++--- .../components/rose/form/errors/index.hbs | 8 +- .../rose/form/errors/message/index.hbs | 6 +- .../components/rose/form/fieldset/index.hbs | 40 +++++---- .../rose/form/helper-text/index.hbs | 12 ++- .../rose/addon/components/rose/form/index.hbs | 55 ++++++------ .../components/rose/form/input/index.hbs | 73 ++++++++-------- .../rose/form/input/input/index.hbs | 5 +- .../components/rose/form/label/index.hbs | 8 +- .../rose/form/radio/group/index.hbs | 24 +++++- .../rose/form/radio/radio/index.hbs | 29 ++++--- .../components/rose/form/select/index.hbs | 86 ++++++++++--------- .../rose/form/select/select/index.hbs | 4 +- .../components/rose/form/textarea/index.hbs | 63 ++++++++------ .../rose/form/textarea/textarea/index.hbs | 5 +- .../addon/components/rose/frame/index.hbs | 12 +-- .../components/rose/header/brand/index.hbs | 8 +- .../addon/components/rose/header/index.hbs | 19 ++-- .../components/rose/header/nav/index.hbs | 14 +-- .../rose/header/utilities/index.hbs | 8 +- .../rose/addon/components/rose/icon/index.hbs | 4 +- .../components/rose/layout/centered/index.hbs | 4 +- .../components/rose/layout/global/index.hbs | 18 ++-- .../components/rose/layout/page/index.hbs | 24 ++++-- .../components/rose/layout/sidebar/index.hbs | 16 ++-- .../components/rose/link-button/index.hbs | 30 +++---- .../components/rose/list/key-value/index.hbs | 8 +- .../rose/list/key-value/item/index.hbs | 31 ++++--- .../addon/components/rose/message/index.hbs | 27 +++--- .../components/rose/nav/breadcrumbs/index.hbs | 8 +- .../addon/components/rose/nav/link/index.hbs | 6 +- .../components/rose/nav/sidebar/index.hbs | 13 ++- .../addon/components/rose/nav/tabs/index.hbs | 10 +-- .../components/rose/notification/index.hbs | 31 ++++--- .../addon/components/rose/separator/index.hbs | 2 +- .../addon/components/rose/table/index.hbs | 31 ++++--- .../addon/components/rose/table/row/index.hbs | 19 ++-- .../components/rose/table/section/index.hbs | 4 +- .../addon/components/rose/toolbar/index.hbs | 4 +- .../tests/dummy/app/templates/application.hbs | 2 +- .../rose/tests/dummy/app/templates/index.hbs | 51 ++++++----- .../tests/dummy/app/templates/playground.hbs | 44 +++++----- 64 files changed, 690 insertions(+), 603 deletions(-) diff --git a/addons/rose/.template-lintrc.js b/addons/rose/.template-lintrc.js index 5399c1736..cf69ffde1 100644 --- a/addons/rose/.template-lintrc.js +++ b/addons/rose/.template-lintrc.js @@ -1,7 +1,8 @@ 'use strict'; module.exports = { - extends: 'octane', + plugins: ['ember-template-lint-plugin-prettier'], + extends: ['octane', 'ember-template-lint-plugin-prettier:recommended'], overrides: [ { files: [ diff --git a/addons/rose/addon/components/rose/badge/index.hbs b/addons/rose/addon/components/rose/badge/index.hbs index 6ef77906f..8111a0eac 100644 --- a/addons/rose/addon/components/rose/badge/index.hbs +++ b/addons/rose/addon/components/rose/badge/index.hbs @@ -1,14 +1,12 @@ - {{#if @icon}} - + {{/if}} - + {{yield}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/button/index.hbs b/addons/rose/addon/components/rose/button/index.hbs index cd87dd8d8..7dc30c066 100644 --- a/addons/rose/addon/components/rose/button/index.hbs +++ b/addons/rose/addon/components/rose/button/index.hbs @@ -1,34 +1,29 @@ + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/card/link/index.hbs b/addons/rose/addon/components/rose/card/link/index.hbs index ead6f0ee9..610185779 100644 --- a/addons/rose/addon/components/rose/card/link/index.hbs +++ b/addons/rose/addon/components/rose/card/link/index.hbs @@ -1,34 +1,32 @@ - \ No newline at end of file diff --git a/addons/rose/addon/components/rose/cards/index.hbs b/addons/rose/addon/components/rose/cards/index.hbs index eafcba07d..1df7ccb51 100644 --- a/addons/rose/addon/components/rose/cards/index.hbs +++ b/addons/rose/addon/components/rose/cards/index.hbs @@ -1,8 +1,3 @@ -
- {{yield (hash - link=(component "rose/card/link") - )}} -
+
+ {{yield (hash link=(component 'rose/card/link'))}} +
\ No newline at end of file diff --git a/addons/rose/addon/components/rose/dialog/body/index.hbs b/addons/rose/addon/components/rose/dialog/body/index.hbs index 143d0758f..e77e9c6b0 100644 --- a/addons/rose/addon/components/rose/dialog/body/index.hbs +++ b/addons/rose/addon/components/rose/dialog/body/index.hbs @@ -1,3 +1,3 @@ -
+
{{yield}} -
+
\ No newline at end of file diff --git a/addons/rose/addon/components/rose/dialog/cover/index.hbs b/addons/rose/addon/components/rose/dialog/cover/index.hbs index 4d56b0d2d..4a75cd737 100644 --- a/addons/rose/addon/components/rose/dialog/cover/index.hbs +++ b/addons/rose/addon/components/rose/dialog/cover/index.hbs @@ -1,21 +1,21 @@ -
+
+ \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dialog/index.hbs b/addons/rose/addon/components/rose/dialog/index.hbs index 927faa072..4a47238a9 100644 --- a/addons/rose/addon/components/rose/dialog/index.hbs +++ b/addons/rose/addon/components/rose/dialog/index.hbs @@ -1,41 +1,44 @@ {{#if @modal}} -
+
@@ -43,36 +46,42 @@ -{{/if}} +{{/if}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/button/index.hbs b/addons/rose/addon/components/rose/dropdown/button/index.hbs index 364a2ef18..835937e70 100644 --- a/addons/rose/addon/components/rose/dropdown/button/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/button/index.hbs @@ -1,19 +1,18 @@ + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/index.hbs b/addons/rose/addon/components/rose/dropdown/index.hbs index d3679b3a6..1b272e92c 100644 --- a/addons/rose/addon/components/rose/dropdown/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/index.hbs @@ -1,22 +1,23 @@
{{#if @icon}} - + {{/if}} - + {{@text}} {{#if @count}} {{@count}} @@ -26,27 +27,35 @@ {{#if @ignoreClickInside}} -
- {{yield (hash - link=(component "rose/dropdown/link" style=this.style) - button=(component "rose/dropdown/button" style=this.style) - item=(component "rose/anonymous" class="rose-dropdown-item") - separator=(component "rose/anonymous" tagName="hr" class="rose-dropdown-separator") - section=(component "rose/dropdown/section" style=this.style) - key-value=(component "rose/dropdown/key-value") - )}} +
+ {{yield + (hash + link=(component 'rose/dropdown/link' style=this.style) + button=(component 'rose/dropdown/button' style=this.style) + item=(component 'rose/anonymous' class='rose-dropdown-item') + separator=(component + 'rose/anonymous' tagName='hr' class='rose-dropdown-separator' + ) + section=(component 'rose/dropdown/section' style=this.style) + key-value=(component 'rose/dropdown/key-value') + ) + }}
{{else}} -
- {{yield (hash - link=(component "rose/dropdown/link" style=this.style) - button=(component "rose/dropdown/button" style=this.style) - item=(component "rose/anonymous" class="rose-dropdown-item") - separator=(component "rose/anonymous" tagName="hr" class="rose-dropdown-separator") - section=(component "rose/dropdown/section" style=this.style) - key-value=(component "rose/dropdown/key-value") - )}} +
+ {{yield + (hash + link=(component 'rose/dropdown/link' style=this.style) + button=(component 'rose/dropdown/button' style=this.style) + item=(component 'rose/anonymous' class='rose-dropdown-item') + separator=(component + 'rose/anonymous' tagName='hr' class='rose-dropdown-separator' + ) + section=(component 'rose/dropdown/section' style=this.style) + key-value=(component 'rose/dropdown/key-value') + ) + }}
{{/if}} -
+ \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/key-value/index.hbs b/addons/rose/addon/components/rose/dropdown/key-value/index.hbs index a160906c5..b6494bb26 100644 --- a/addons/rose/addon/components/rose/dropdown/key-value/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/key-value/index.hbs @@ -4,6 +4,6 @@
- {{yield to='value'}} + {{yield to='value'}}
- + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/link/index.hbs b/addons/rose/addon/components/rose/dropdown/link/index.hbs index a7593fe8d..c3a8e0baf 100644 --- a/addons/rose/addon/components/rose/dropdown/link/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/link/index.hbs @@ -10,7 +10,8 @@ @route={{@route}} @query={{@query}} @model={{@model}} - class="rose-dropdown-link {{if @style (concat "rose-dropdown-link-" @style)}}" + class='rose-dropdown-link + {{if @style (concat 'rose-dropdown-link-' @style)}}' > {{yield}} @@ -19,7 +20,8 @@ ...attributes @route={{@route}} @model={{@model}} - class="rose-dropdown-link {{if @style (concat "rose-dropdown-link-" @style)}}" + class='rose-dropdown-link + {{if @style (concat 'rose-dropdown-link-' @style)}}' > {{yield}} @@ -30,7 +32,8 @@ ...attributes @route={{@route}} @query={{@query}} - class="rose-dropdown-link {{if @style (concat "rose-dropdown-link-" @style)}}" + class='rose-dropdown-link + {{if @style (concat 'rose-dropdown-link-' @style)}}' > {{yield}} @@ -38,9 +41,10 @@ {{yield}} {{/if}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/dropdown/section/index.hbs b/addons/rose/addon/components/rose/dropdown/section/index.hbs index 10476dd8c..d5d700b6d 100644 --- a/addons/rose/addon/components/rose/dropdown/section/index.hbs +++ b/addons/rose/addon/components/rose/dropdown/section/index.hbs @@ -1,12 +1,15 @@ -
+
{{#if @title}}

{{@title}}

{{/if}} {{yield}} -
+
\ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/brand/index.hbs b/addons/rose/addon/components/rose/footer/brand/index.hbs index 27b91417f..0f8da67fd 100644 --- a/addons/rose/addon/components/rose/footer/brand/index.hbs +++ b/addons/rose/addon/components/rose/footer/brand/index.hbs @@ -1,12 +1,12 @@ {{#if @logo}} {{inline-svg @logo}} {{/if}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/copyright/index.hbs b/addons/rose/addon/components/rose/footer/copyright/index.hbs index 47e582dcb..9925a930f 100644 --- a/addons/rose/addon/components/rose/footer/copyright/index.hbs +++ b/addons/rose/addon/components/rose/footer/copyright/index.hbs @@ -1,11 +1,11 @@ - - + + © - + {{this.currentYear}} - + {{@text}} - + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/index.hbs b/addons/rose/addon/components/rose/footer/index.hbs index bbe5ecc72..aa755b113 100644 --- a/addons/rose/addon/components/rose/footer/index.hbs +++ b/addons/rose/addon/components/rose/footer/index.hbs @@ -1,10 +1,9 @@ -
- {{yield (hash - nav=(component 'rose/footer/nav') - brand=(component 'rose/footer/brand') - text=(component "rose/anonymous" class="rose-footer-text") - )}} -
+
+ {{yield + (hash + nav=(component 'rose/footer/nav') + brand=(component 'rose/footer/brand') + text=(component 'rose/anonymous' class='rose-footer-text') + ) + }} +
\ No newline at end of file diff --git a/addons/rose/addon/components/rose/footer/nav/index.hbs b/addons/rose/addon/components/rose/footer/nav/index.hbs index c03ac88c9..7c3cd491d 100644 --- a/addons/rose/addon/components/rose/footer/nav/index.hbs +++ b/addons/rose/addon/components/rose/footer/nav/index.hbs @@ -1,5 +1,3 @@ -