diff --git a/addons/rose/addon/templates/components/rose/anonymous.hbs b/addons/rose/addon/components/rose/anonymous/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/anonymous.hbs rename to addons/rose/addon/components/rose/anonymous/index.hbs diff --git a/addons/rose/addon/components/rose/anonymous.js b/addons/rose/addon/components/rose/anonymous/index.js similarity index 80% rename from addons/rose/addon/components/rose/anonymous.js rename to addons/rose/addon/components/rose/anonymous/index.js index c5321f53a..1f1715d28 100644 --- a/addons/rose/addon/components/rose/anonymous.js +++ b/addons/rose/addon/components/rose/anonymous/index.js @@ -1,5 +1,5 @@ import Component from '@ember/component'; -import layout from '../../templates/components/rose/anonymous'; +import layout from './index'; /** * An otherwise empty component that renders a block. Used only by components diff --git a/addons/rose/addon/components/rose/anonymous.stories.mdx b/addons/rose/addon/components/rose/anonymous/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/anonymous.stories.mdx rename to addons/rose/addon/components/rose/anonymous/index.stories.mdx diff --git a/addons/rose/addon/components/rose/layout/centered.js b/addons/rose/addon/components/rose/layout/centered.js deleted file mode 100644 index ddebf0b09..000000000 --- a/addons/rose/addon/components/rose/layout/centered.js +++ /dev/null @@ -1,7 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../templates/components/rose/layout/centered'; - -export default Component.extend({ - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/layout/centered.hbs b/addons/rose/addon/components/rose/layout/centered/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/layout/centered.hbs rename to addons/rose/addon/components/rose/layout/centered/index.hbs diff --git a/addons/rose/addon/components/rose/layout/centered.stories.mdx b/addons/rose/addon/components/rose/layout/centered/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/layout/centered.stories.mdx rename to addons/rose/addon/components/rose/layout/centered/index.stories.mdx diff --git a/addons/rose/addon/components/rose/layout/global.js b/addons/rose/addon/components/rose/layout/global.js deleted file mode 100644 index c9beb6f91..000000000 --- a/addons/rose/addon/components/rose/layout/global.js +++ /dev/null @@ -1,7 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../templates/components/rose/layout/global'; - -export default Component.extend({ - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/layout/global.hbs b/addons/rose/addon/components/rose/layout/global/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/layout/global.hbs rename to addons/rose/addon/components/rose/layout/global/index.hbs diff --git a/addons/rose/addon/components/rose/layout/global.stories.mdx b/addons/rose/addon/components/rose/layout/global/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/layout/global.stories.mdx rename to addons/rose/addon/components/rose/layout/global/index.stories.mdx diff --git a/addons/rose/addon/components/rose/layout/page.js b/addons/rose/addon/components/rose/layout/page.js deleted file mode 100644 index 10190bcba..000000000 --- a/addons/rose/addon/components/rose/layout/page.js +++ /dev/null @@ -1,7 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../templates/components/rose/layout/page'; - -export default Component.extend({ - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/layout/page.hbs b/addons/rose/addon/components/rose/layout/page/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/layout/page.hbs rename to addons/rose/addon/components/rose/layout/page/index.hbs diff --git a/addons/rose/addon/components/rose/layout/page.stories.mdx b/addons/rose/addon/components/rose/layout/page/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/layout/page.stories.mdx rename to addons/rose/addon/components/rose/layout/page/index.stories.mdx diff --git a/addons/rose/addon/components/rose/layout/sidebar.js b/addons/rose/addon/components/rose/layout/sidebar.js deleted file mode 100644 index b58f2003a..000000000 --- a/addons/rose/addon/components/rose/layout/sidebar.js +++ /dev/null @@ -1,7 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../templates/components/rose/layout/sidebar'; - -export default Component.extend({ - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/layout/sidebar.hbs b/addons/rose/addon/components/rose/layout/sidebar/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/layout/sidebar.hbs rename to addons/rose/addon/components/rose/layout/sidebar/index.hbs diff --git a/addons/rose/addon/components/rose/layout/sidebar.stories.mdx b/addons/rose/addon/components/rose/layout/sidebar/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/layout/sidebar.stories.mdx rename to addons/rose/addon/components/rose/layout/sidebar/index.stories.mdx diff --git a/addons/rose/addon/templates/components/rose/link-button.hbs b/addons/rose/addon/components/rose/link-button/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/link-button.hbs rename to addons/rose/addon/components/rose/link-button/index.hbs diff --git a/addons/rose/addon/components/rose/link-button.js b/addons/rose/addon/components/rose/link-button/index.js similarity index 92% rename from addons/rose/addon/components/rose/link-button.js rename to addons/rose/addon/components/rose/link-button/index.js index f2e283b63..97f6601ba 100644 --- a/addons/rose/addon/components/rose/link-button.js +++ b/addons/rose/addon/components/rose/link-button/index.js @@ -1,5 +1,5 @@ import LinkComponent from '@ember/routing/link-component'; -import layout from '../../templates/components/rose/link-button'; +import layout from './index'; import { computed } from '@ember/object'; /** diff --git a/addons/rose/addon/components/rose/link-button.stories.mdx b/addons/rose/addon/components/rose/link-button/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/link-button.stories.mdx rename to addons/rose/addon/components/rose/link-button/index.stories.mdx diff --git a/addons/rose/addon/components/rose/list/key-value.js b/addons/rose/addon/components/rose/list/key-value.js deleted file mode 100644 index 279a84e82..000000000 --- a/addons/rose/addon/components/rose/list/key-value.js +++ /dev/null @@ -1,7 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../templates/components/rose/list/key-value'; - -export default Component.extend({ - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/list/key-value.hbs b/addons/rose/addon/components/rose/list/key-value/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/list/key-value.hbs rename to addons/rose/addon/components/rose/list/key-value/index.hbs diff --git a/addons/rose/addon/components/rose/list/key-value.stories.mdx b/addons/rose/addon/components/rose/list/key-value/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/list/key-value.stories.mdx rename to addons/rose/addon/components/rose/list/key-value/index.stories.mdx diff --git a/addons/rose/addon/components/rose/list/key-value/item.js b/addons/rose/addon/components/rose/list/key-value/item.js deleted file mode 100644 index 37c30217d..000000000 --- a/addons/rose/addon/components/rose/list/key-value/item.js +++ /dev/null @@ -1,8 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../../templates/components/rose/list/key-value/item'; -import ComponentAutoId from '../../../../mixins/component-auto-id'; - -export default Component.extend(ComponentAutoId, { - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/list/key-value/item.hbs b/addons/rose/addon/components/rose/list/key-value/item/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/list/key-value/item.hbs rename to addons/rose/addon/components/rose/list/key-value/item/index.hbs diff --git a/addons/rose/addon/components/rose/list/key-value/item/index.js b/addons/rose/addon/components/rose/list/key-value/item/index.js new file mode 100644 index 000000000..a166c7897 --- /dev/null +++ b/addons/rose/addon/components/rose/list/key-value/item/index.js @@ -0,0 +1,10 @@ +import Component from '@glimmer/component'; +import { generateComponentID } from '../../../../../utilities/component-auto-id'; + +export default class RoseListKeyValueItemComponent extends Component { + + // =attributes + + id = generateComponentID(); + +} diff --git a/addons/rose/addon/components/rose/nav/breadcrumbs.js b/addons/rose/addon/components/rose/nav/breadcrumbs.js deleted file mode 100644 index 0f915d890..000000000 --- a/addons/rose/addon/components/rose/nav/breadcrumbs.js +++ /dev/null @@ -1,10 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../templates/components/rose/nav/breadcrumbs'; - -/** - * A navigation component with links. - */ -export default Component.extend({ - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/nav/breadcrumbs.hbs b/addons/rose/addon/components/rose/nav/breadcrumbs/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/nav/breadcrumbs.hbs rename to addons/rose/addon/components/rose/nav/breadcrumbs/index.hbs diff --git a/addons/rose/addon/components/rose/nav/breadcrumbs.stories.mdx b/addons/rose/addon/components/rose/nav/breadcrumbs/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/nav/breadcrumbs.stories.mdx rename to addons/rose/addon/components/rose/nav/breadcrumbs/index.stories.mdx diff --git a/addons/rose/addon/components/rose/nav/sidebar.js b/addons/rose/addon/components/rose/nav/sidebar.js deleted file mode 100644 index 40b8900e4..000000000 --- a/addons/rose/addon/components/rose/nav/sidebar.js +++ /dev/null @@ -1,11 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../templates/components/rose/nav/sidebar'; -import ComponentAutoId from '../../../mixins/component-auto-id'; - -/** - * A simple navigation component intended for the sidebar layout region. - */ -export default Component.extend(ComponentAutoId, { - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/nav/sidebar.hbs b/addons/rose/addon/components/rose/nav/sidebar/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/nav/sidebar.hbs rename to addons/rose/addon/components/rose/nav/sidebar/index.hbs diff --git a/addons/rose/addon/components/rose/nav/sidebar/index.js b/addons/rose/addon/components/rose/nav/sidebar/index.js new file mode 100644 index 000000000..1d3b63115 --- /dev/null +++ b/addons/rose/addon/components/rose/nav/sidebar/index.js @@ -0,0 +1,10 @@ +import Component from '@glimmer/component'; +import { generateComponentID } from '../../../../utilities/component-auto-id'; + +export default class RoseNavSidebarComponent extends Component { + + // =attributes + + id = generateComponentID(); + +} diff --git a/addons/rose/addon/components/rose/nav/sidebar.stories.mdx b/addons/rose/addon/components/rose/nav/sidebar/sidebar.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/nav/sidebar.stories.mdx rename to addons/rose/addon/components/rose/nav/sidebar/sidebar.stories.mdx diff --git a/addons/rose/addon/components/rose/nav/tabs.js b/addons/rose/addon/components/rose/nav/tabs.js deleted file mode 100644 index 5ee542903..000000000 --- a/addons/rose/addon/components/rose/nav/tabs.js +++ /dev/null @@ -1,6 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../templates/components/rose/nav/tabs'; - -export default Component.extend({ - layout, -}); diff --git a/addons/rose/addon/templates/components/rose/nav/tabs.hbs b/addons/rose/addon/components/rose/nav/tabs/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/nav/tabs.hbs rename to addons/rose/addon/components/rose/nav/tabs/index.hbs diff --git a/addons/rose/addon/components/rose/nav/tabs.stories.mdx b/addons/rose/addon/components/rose/nav/tabs/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/nav/tabs.stories.mdx rename to addons/rose/addon/components/rose/nav/tabs/index.stories.mdx diff --git a/addons/rose/addon/templates/components/rose/table/row.hbs b/addons/rose/addon/components/rose/table/row/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/table/row.hbs rename to addons/rose/addon/components/rose/table/row/index.hbs diff --git a/addons/rose/addon/components/rose/table/row.js b/addons/rose/addon/components/rose/table/row/index.js similarity index 75% rename from addons/rose/addon/components/rose/table/row.js rename to addons/rose/addon/components/rose/table/row/index.js index e94f0cf28..042f937b8 100644 --- a/addons/rose/addon/components/rose/table/row.js +++ b/addons/rose/addon/components/rose/table/row/index.js @@ -1,5 +1,5 @@ import Component from '@ember/component'; -import layout from '../../../templates/components/rose/table/row'; +import layout from './index'; /** * A table row component that uses tr table element and diff --git a/addons/rose/addon/templates/components/rose/table/section.hbs b/addons/rose/addon/components/rose/table/section/index.hbs similarity index 92% rename from addons/rose/addon/templates/components/rose/table/section.hbs rename to addons/rose/addon/components/rose/table/section/index.hbs index d39e97260..d14bfc6a4 100644 --- a/addons/rose/addon/templates/components/rose/table/section.hbs +++ b/addons/rose/addon/components/rose/table/section/index.hbs @@ -1,3 +1,3 @@ {{yield (hash row=(component 'rose/table/row') -)}} \ No newline at end of file +)}} diff --git a/addons/rose/addon/components/rose/table/section.js b/addons/rose/addon/components/rose/table/section/index.js similarity index 76% rename from addons/rose/addon/components/rose/table/section.js rename to addons/rose/addon/components/rose/table/section/index.js index 503ed969b..03d0ab453 100644 --- a/addons/rose/addon/components/rose/table/section.js +++ b/addons/rose/addon/components/rose/table/section/index.js @@ -1,5 +1,5 @@ import Component from '@ember/component'; -import layout from '../../../templates/components/rose/table/section'; +import layout from './index'; /** * A table section component that configures a row component. diff --git a/addons/rose/addon/mixins/component-auto-id.js b/addons/rose/addon/mixins/component-auto-id.js deleted file mode 100644 index f970284b8..000000000 --- a/addons/rose/addon/mixins/component-auto-id.js +++ /dev/null @@ -1,15 +0,0 @@ -import Mixin from '@ember/object/mixin'; -import { v1 } from 'ember-uuid'; - -/** - * Add this mixin to components for an auto-generated ID. - */ -export default Mixin.create({ - /** - * Generates an ID for this component and assigns it to `this.id`. - */ - init() { - this.id = `component-${v1()}`; - return this._super(...arguments); - }, -});