From e1d105fb75ee22306f99d5d0197ec8425f321948 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 24 Sep 2020 15:49:37 -0400 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20convert=20radio=20an?= =?UTF-8?q?d=20checkbox=20to=20nested=20structure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/addon/components/rose/form/checkbox.js | 11 ----------- .../rose/form/checkbox/index.hbs} | 0 .../addon/components/rose/form/checkbox/index.js | 10 ++++++++++ .../index.stories.mdx} | 0 .../rose/addon/components/rose/form/radio/group.js | 10 ---------- .../rose/form/radio/group/index.hbs} | 0 .../{group.stories.mdx => group/index.stories.mdx} | 0 .../rose/addon/components/rose/form/radio/radio.js | 13 ------------- .../rose/form/radio/radio/index.hbs} | 0 .../addon/components/rose/form/radio/radio/index.js | 10 ++++++++++ .../{radio.stories.mdx => radio/index.stories.mdx} | 0 11 files changed, 20 insertions(+), 34 deletions(-) delete mode 100644 addons/rose/addon/components/rose/form/checkbox.js rename addons/rose/addon/{templates/components/rose/form/checkbox.hbs => components/rose/form/checkbox/index.hbs} (100%) create mode 100644 addons/rose/addon/components/rose/form/checkbox/index.js rename addons/rose/addon/components/rose/form/{checkbox.stories.mdx => checkbox/index.stories.mdx} (100%) delete mode 100644 addons/rose/addon/components/rose/form/radio/group.js rename addons/rose/addon/{templates/components/rose/form/radio/group.hbs => components/rose/form/radio/group/index.hbs} (100%) rename addons/rose/addon/components/rose/form/radio/{group.stories.mdx => group/index.stories.mdx} (100%) delete mode 100644 addons/rose/addon/components/rose/form/radio/radio.js rename addons/rose/addon/{templates/components/rose/form/radio/radio.hbs => components/rose/form/radio/radio/index.hbs} (100%) create mode 100644 addons/rose/addon/components/rose/form/radio/radio/index.js rename addons/rose/addon/components/rose/form/radio/{radio.stories.mdx => radio/index.stories.mdx} (100%) diff --git a/addons/rose/addon/components/rose/form/checkbox.js b/addons/rose/addon/components/rose/form/checkbox.js deleted file mode 100644 index ad6ad3f38..000000000 --- a/addons/rose/addon/components/rose/form/checkbox.js +++ /dev/null @@ -1,11 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../templates/components/rose/form/checkbox'; -import ComponentAutoId from '../../../mixins/component-auto-id'; - -/** - * A simple HTML `` element. - */ -export default Component.extend(ComponentAutoId, { - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/form/checkbox.hbs b/addons/rose/addon/components/rose/form/checkbox/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/form/checkbox.hbs rename to addons/rose/addon/components/rose/form/checkbox/index.hbs diff --git a/addons/rose/addon/components/rose/form/checkbox/index.js b/addons/rose/addon/components/rose/form/checkbox/index.js new file mode 100644 index 000000000..b13f24e4f --- /dev/null +++ b/addons/rose/addon/components/rose/form/checkbox/index.js @@ -0,0 +1,10 @@ +import Component from '@glimmer/component'; +import { generateComponentID } from '../../../../utilities/component-auto-id'; + +export default class RoseFormCheckboxComponent extends Component { + + // =attributes + + id = generateComponentID(); + +} diff --git a/addons/rose/addon/components/rose/form/checkbox.stories.mdx b/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/form/checkbox.stories.mdx rename to addons/rose/addon/components/rose/form/checkbox/index.stories.mdx diff --git a/addons/rose/addon/components/rose/form/radio/group.js b/addons/rose/addon/components/rose/form/radio/group.js deleted file mode 100644 index 80bba183e..000000000 --- a/addons/rose/addon/components/rose/form/radio/group.js +++ /dev/null @@ -1,10 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../../templates/components/rose/form/radio/group'; - -/** - * A `` element. - */ -export default Component.extend({ - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/form/radio/group.hbs b/addons/rose/addon/components/rose/form/radio/group/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/form/radio/group.hbs rename to addons/rose/addon/components/rose/form/radio/group/index.hbs diff --git a/addons/rose/addon/components/rose/form/radio/group.stories.mdx b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/form/radio/group.stories.mdx rename to addons/rose/addon/components/rose/form/radio/group/index.stories.mdx diff --git a/addons/rose/addon/components/rose/form/radio/radio.js b/addons/rose/addon/components/rose/form/radio/radio.js deleted file mode 100644 index 196e47951..000000000 --- a/addons/rose/addon/components/rose/form/radio/radio.js +++ /dev/null @@ -1,13 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../../templates/components/rose/form/radio/radio'; -import ComponentAutoId from '../../../../mixins/component-auto-id'; - -/** - * A `` element. - * `value` and `selectedValue` must be equal to select - * radiofield. - */ -export default Component.extend(ComponentAutoId, { - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/form/radio/radio.hbs b/addons/rose/addon/components/rose/form/radio/radio/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/form/radio/radio.hbs rename to addons/rose/addon/components/rose/form/radio/radio/index.hbs diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.js b/addons/rose/addon/components/rose/form/radio/radio/index.js new file mode 100644 index 000000000..ac2c2a6ec --- /dev/null +++ b/addons/rose/addon/components/rose/form/radio/radio/index.js @@ -0,0 +1,10 @@ +import Component from '@glimmer/component'; +import { generateComponentID } from '../../../../../utilities/component-auto-id'; + +export default class RoseFormRadioRadioComponent extends Component { + + // =attributes + + id = generateComponentID(); + +} diff --git a/addons/rose/addon/components/rose/form/radio/radio.stories.mdx b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/form/radio/radio.stories.mdx rename to addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx