From 12aacd1b60cb66327542f4acd4c1d12838bad0ca Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 24 Sep 2020 17:03:08 -0400 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20convert=20nav=20comp?= =?UTF-8?q?onents=20to=20nested=20structure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/addon/components/rose/nav/breadcrumbs.js | 10 ---------- .../rose/nav/breadcrumbs/index.hbs} | 0 .../index.stories.mdx} | 0 addons/rose/addon/components/rose/nav/sidebar.js | 11 ----------- .../rose/nav/sidebar/index.hbs} | 0 .../rose/addon/components/rose/nav/sidebar/index.js | 10 ++++++++++ .../rose/nav/{ => sidebar}/sidebar.stories.mdx | 0 addons/rose/addon/components/rose/nav/tabs.js | 6 ------ .../tabs.hbs => components/rose/nav/tabs/index.hbs} | 0 .../nav/{tabs.stories.mdx => tabs/index.stories.mdx} | 0 10 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 addons/rose/addon/components/rose/nav/breadcrumbs.js rename addons/rose/addon/{templates/components/rose/nav/breadcrumbs.hbs => components/rose/nav/breadcrumbs/index.hbs} (100%) rename addons/rose/addon/components/rose/nav/{breadcrumbs.stories.mdx => breadcrumbs/index.stories.mdx} (100%) delete mode 100644 addons/rose/addon/components/rose/nav/sidebar.js rename addons/rose/addon/{templates/components/rose/nav/sidebar.hbs => components/rose/nav/sidebar/index.hbs} (100%) create mode 100644 addons/rose/addon/components/rose/nav/sidebar/index.js rename addons/rose/addon/components/rose/nav/{ => sidebar}/sidebar.stories.mdx (100%) delete mode 100644 addons/rose/addon/components/rose/nav/tabs.js rename addons/rose/addon/{templates/components/rose/nav/tabs.hbs => components/rose/nav/tabs/index.hbs} (100%) rename addons/rose/addon/components/rose/nav/{tabs.stories.mdx => tabs/index.stories.mdx} (100%) 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