From 37ddd97bf913b3ad1c89363a3799b1eafb9fef33 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Tue, 9 Jun 2020 10:14:16 -0400 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Add=20playground=20r?= =?UTF-8?q?oute=20to=20rose=20addon=20dummy=20app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Playground route in rose addon dummy app contains previous content from index route. Since the number of components is increasing, examples of said components in dummy app index route are causing merge conflicts. Index route will now contain component example for what\'s being added whereas playground route contains full component spectrum examples. --- .../tests/dummy/app/controllers/playground.js | 12 + addons/rose/tests/dummy/app/router.js | 1 + .../rose/tests/dummy/app/templates/index.hbs | 256 ++---------------- .../tests/dummy/app/templates/playground.hbs | 209 ++++++++++++++ 4 files changed, 245 insertions(+), 233 deletions(-) create mode 100644 addons/rose/tests/dummy/app/controllers/playground.js create mode 100644 addons/rose/tests/dummy/app/templates/playground.hbs diff --git a/addons/rose/tests/dummy/app/controllers/playground.js b/addons/rose/tests/dummy/app/controllers/playground.js new file mode 100644 index 000000000..af7c86470 --- /dev/null +++ b/addons/rose/tests/dummy/app/controllers/playground.js @@ -0,0 +1,12 @@ +import Controller from '@ember/controller'; +import { action } from '@ember/object'; + +export default class PlaygroundController extends Controller { + color = 'green'; + + @action + actionHandler(/*value*/) { + // eslint-disable-next-line no-console + //console.log('action handled'); + } +} diff --git a/addons/rose/tests/dummy/app/router.js b/addons/rose/tests/dummy/app/router.js index c5464a74c..5668362d0 100644 --- a/addons/rose/tests/dummy/app/router.js +++ b/addons/rose/tests/dummy/app/router.js @@ -8,4 +8,5 @@ export default class Router extends EmberRouter { Router.map(function () { this.route('about'); + this.route('playground'); }); diff --git a/addons/rose/tests/dummy/app/templates/index.hbs b/addons/rose/tests/dummy/app/templates/index.hbs index 0e4edd731..cd1600429 100644 --- a/addons/rose/tests/dummy/app/templates/index.hbs +++ b/addons/rose/tests/dummy/app/templates/index.hbs @@ -1,233 +1,23 @@ - - - - - - - - - Menu item - Menu item - Button menu item - - Section - Section - - - - - - Menu item - Menu item - Button menu item - - - - - - - - - Item Name - Item Name - Item Name - Item Name - - - - - - Breadcrumbs - Header - Navigation - Actions - Body - - - Dummy app index template - - - An error occurred. - - -

Icon

- - - - -

Button

- Primary -
- Primary -
- - Secondary -
- Secondary -
- -

Form

- - -

Inputs

- - - - - -

Textareas

- - - - - -

Selects

- - - Choose an option - Value 1 - Value 2 - Value 3 - - - - - Choose an option - - - - -

Radio Group

- - - - - - -

Checkboxes

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+ + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/rose/tests/dummy/app/templates/playground.hbs b/addons/rose/tests/dummy/app/templates/playground.hbs new file mode 100644 index 000000000..576a37395 --- /dev/null +++ b/addons/rose/tests/dummy/app/templates/playground.hbs @@ -0,0 +1,209 @@ + + + + + + + + + Menu item + Menu item + Button menu item + + Section + Section + + + + + + Menu item + Menu item + Button menu item + + + + + + + + + Item Name + Item Name + Item Name + Item Name + + + + + + Breadcrumbs + Header + Navigation + Actions + Body + + + Dummy app index template + + + An error occurred. + + +

Icon

+ + + + +

Button

+ Primary +
+ Primary +
+ + Secondary +
+ Secondary +
+ +

Form

+ + +

Inputs

+ + + + + +

Textareas

+ + + + + +

Selects

+ + + Choose an option + Value 1 + Value 2 + Value 3 + + + + + Choose an option + + + + +

Radio Group

+ + + + + + +

Checkboxes

+ + + + + + + +
+ + + + +
+