From 3934b00739a603f27e7fabd2ae25efa13dcbc0f9 Mon Sep 17 00:00:00 2001 From: Gabriel Csapo Date: Tue, 2 Jun 2020 22:15:19 -0700 Subject: [PATCH 1/9] wip --- tests/dummy/app/components/doc-content.hbs | 5 + .../components/example-item.hbs | 0 .../{templates => }/components/menu-item.hbs | 0 .../{templates => }/components/not-found.hbs | 0 .../components/page-toolbar.hbs | 0 .../{templates => }/components/paper-api.hbs | 0 .../components/submenu-item.hbs | 0 tests/dummy/app/controllers/components.js | 123 +++++++++++++ .../{demo => components}/autocomplete.js | 0 .../{demo => components}/button.js | 0 .../{demo => components}/checkbox.js | 0 .../controllers/{demo => components}/chips.js | 0 .../{demo => components}/dialog.js | 0 .../{demo => components}/divider.js | 0 .../{demo => components}/grid-list.js | 0 .../controllers/{demo => components}/input.js | 0 .../controllers/{demo => components}/list.js | 0 .../controllers/{demo => components}/menu.js | 0 .../{demo => components}/progress-circular.js | 0 .../{demo => components}/progress-linear.js | 0 .../controllers/{demo => components}/radio.js | 0 .../{demo => components}/select.js | 0 .../{demo => components}/sidenav.js | 0 .../{demo => components}/slider.js | 0 .../{demo => components}/speed-dial.js | 0 .../{demo => components}/switch.js | 0 .../controllers/{demo => components}/tabs.js | 0 .../controllers/{demo => components}/toast.js | 0 .../{demo => components}/tooltip.js | 0 .../controllers/{layout => }/introduction.js | 0 tests/dummy/app/helpers/is-active.js | 26 ++- tests/dummy/app/router.js | 14 +- tests/dummy/app/routes/components/index.js | 7 + .../app/routes/{demo => components}/input.js | 0 .../{demo => components}/progress-circular.js | 0 .../{demo => components}/progress-linear.js | 0 tests/dummy/app/styles/app.scss | 8 - tests/dummy/app/styles/demo.scss | 100 ----------- tests/dummy/app/styles/layout-demo.scss | 162 ------------------ tests/dummy/app/templates/addons.hbs | 2 - tests/dummy/app/templates/application.hbs | 102 ++++------- tests/dummy/app/templates/components.hbs | 20 +++ .../{demo => components}/autocomplete.hbs | 3 - .../templates/{demo => components}/button.hbs | 2 - .../templates/{demo => components}/card.hbs | 22 ++- .../{demo => components}/checkbox.hbs | 2 - .../templates/{demo => components}/chips.hbs | 2 - .../templates/{demo => components}/dialog.hbs | 0 .../{demo => components}/divider.hbs | 2 - .../app/templates/components/doc-content.hbs | 5 - .../app/templates/{ => components}/forms.hbs | 6 +- .../{demo => components}/grid-list.hbs | 2 - .../{demo/icons.hbs => components/icon.hbs} | 2 - .../templates/{demo => components}/input.hbs | 2 - .../templates/{demo => components}/list.hbs | 5 - .../app/templates/components/loading.hbs | 1 + .../templates/{demo => components}/menu.hbs | 4 - .../progress-circular.hbs | 2 - .../{demo => components}/progress-linear.hbs | 2 - .../templates/{demo => components}/radio.hbs | 1 - .../templates/{demo => components}/select.hbs | 2 - .../{demo => components}/sidenav.hbs | 2 - .../templates/{demo => components}/slider.hbs | 2 - .../{demo => components}/speed-dial.hbs | 2 - .../templates/{demo => components}/switch.hbs | 2 - .../templates/{demo => components}/tabs.hbs | 7 +- .../{demo => components}/tabs/index.hbs | 0 .../tabs/nested-route.hbs | 0 .../templates/{demo => components}/toast.hbs | 3 - .../app/templates/components/toggles.hbs | 1 + .../{demo => components}/toolbar.hbs | 2 - .../{demo => components}/tooltip.hbs | 3 - tests/dummy/app/templates/cookbook.hbs | 15 -- tests/dummy/app/templates/index.hbs | 4 +- .../{layout/introduction.hbs => layout.hbs} | 8 +- tests/dummy/app/templates/theme.hbs | 2 - tests/dummy/app/templates/typography.hbs | 2 - tests/dummy/config/environment.js | 2 +- .../{ => assets}/ember-logo-original.png | Bin .../public/{ => assets}/ember-logo-white.png | Bin .../dummy/public/{ => assets}/ember-logo.png | Bin tests/dummy/public/{ => assets}/tomster.png | Bin tests/dummy/public/{ => assets}/washedout.png | Bin 83 files changed, 238 insertions(+), 455 deletions(-) create mode 100644 tests/dummy/app/components/doc-content.hbs rename tests/dummy/app/{templates => }/components/example-item.hbs (100%) rename tests/dummy/app/{templates => }/components/menu-item.hbs (100%) rename tests/dummy/app/{templates => }/components/not-found.hbs (100%) rename tests/dummy/app/{templates => }/components/page-toolbar.hbs (100%) rename tests/dummy/app/{templates => }/components/paper-api.hbs (100%) rename tests/dummy/app/{templates => }/components/submenu-item.hbs (100%) create mode 100644 tests/dummy/app/controllers/components.js rename tests/dummy/app/controllers/{demo => components}/autocomplete.js (100%) rename tests/dummy/app/controllers/{demo => components}/button.js (100%) rename tests/dummy/app/controllers/{demo => components}/checkbox.js (100%) rename tests/dummy/app/controllers/{demo => components}/chips.js (100%) rename tests/dummy/app/controllers/{demo => components}/dialog.js (100%) rename tests/dummy/app/controllers/{demo => components}/divider.js (100%) rename tests/dummy/app/controllers/{demo => components}/grid-list.js (100%) rename tests/dummy/app/controllers/{demo => components}/input.js (100%) rename tests/dummy/app/controllers/{demo => components}/list.js (100%) rename tests/dummy/app/controllers/{demo => components}/menu.js (100%) rename tests/dummy/app/controllers/{demo => components}/progress-circular.js (100%) rename tests/dummy/app/controllers/{demo => components}/progress-linear.js (100%) rename tests/dummy/app/controllers/{demo => components}/radio.js (100%) rename tests/dummy/app/controllers/{demo => components}/select.js (100%) rename tests/dummy/app/controllers/{demo => components}/sidenav.js (100%) rename tests/dummy/app/controllers/{demo => components}/slider.js (100%) rename tests/dummy/app/controllers/{demo => components}/speed-dial.js (100%) rename tests/dummy/app/controllers/{demo => components}/switch.js (100%) rename tests/dummy/app/controllers/{demo => components}/tabs.js (100%) rename tests/dummy/app/controllers/{demo => components}/toast.js (100%) rename tests/dummy/app/controllers/{demo => components}/tooltip.js (100%) rename tests/dummy/app/controllers/{layout => }/introduction.js (100%) create mode 100644 tests/dummy/app/routes/components/index.js rename tests/dummy/app/routes/{demo => components}/input.js (100%) rename tests/dummy/app/routes/{demo => components}/progress-circular.js (100%) rename tests/dummy/app/routes/{demo => components}/progress-linear.js (100%) delete mode 100644 tests/dummy/app/styles/layout-demo.scss create mode 100644 tests/dummy/app/templates/components.hbs rename tests/dummy/app/templates/{demo => components}/autocomplete.hbs (98%) rename tests/dummy/app/templates/{demo => components}/button.hbs (98%) rename tests/dummy/app/templates/{demo => components}/card.hbs (91%) rename tests/dummy/app/templates/{demo => components}/checkbox.hbs (95%) rename tests/dummy/app/templates/{demo => components}/chips.hbs (98%) rename tests/dummy/app/templates/{demo => components}/dialog.hbs (100%) rename tests/dummy/app/templates/{demo => components}/divider.hbs (97%) delete mode 100644 tests/dummy/app/templates/components/doc-content.hbs rename tests/dummy/app/templates/{ => components}/forms.hbs (94%) rename tests/dummy/app/templates/{demo => components}/grid-list.hbs (97%) rename tests/dummy/app/templates/{demo/icons.hbs => components/icon.hbs} (95%) rename tests/dummy/app/templates/{demo => components}/input.hbs (99%) rename tests/dummy/app/templates/{demo => components}/list.hbs (99%) create mode 100644 tests/dummy/app/templates/components/loading.hbs rename tests/dummy/app/templates/{demo => components}/menu.hbs (99%) rename tests/dummy/app/templates/{demo => components}/progress-circular.hbs (98%) rename tests/dummy/app/templates/{demo => components}/progress-linear.hbs (96%) rename tests/dummy/app/templates/{demo => components}/radio.hbs (97%) rename tests/dummy/app/templates/{demo => components}/select.hbs (98%) rename tests/dummy/app/templates/{demo => components}/sidenav.hbs (98%) rename tests/dummy/app/templates/{demo => components}/slider.hbs (98%) rename tests/dummy/app/templates/{demo => components}/speed-dial.hbs (99%) rename tests/dummy/app/templates/{demo => components}/switch.hbs (93%) rename tests/dummy/app/templates/{demo => components}/tabs.hbs (97%) rename tests/dummy/app/templates/{demo => components}/tabs/index.hbs (100%) rename tests/dummy/app/templates/{demo => components}/tabs/nested-route.hbs (100%) rename tests/dummy/app/templates/{demo => components}/toast.hbs (99%) create mode 100644 tests/dummy/app/templates/components/toggles.hbs rename tests/dummy/app/templates/{demo => components}/toolbar.hbs (96%) rename tests/dummy/app/templates/{demo => components}/tooltip.hbs (98%) delete mode 100644 tests/dummy/app/templates/cookbook.hbs rename tests/dummy/app/templates/{layout/introduction.hbs => layout.hbs} (97%) rename tests/dummy/public/{ => assets}/ember-logo-original.png (100%) rename tests/dummy/public/{ => assets}/ember-logo-white.png (100%) rename tests/dummy/public/{ => assets}/ember-logo.png (100%) rename tests/dummy/public/{ => assets}/tomster.png (100%) rename tests/dummy/public/{ => assets}/washedout.png (100%) diff --git a/tests/dummy/app/components/doc-content.hbs b/tests/dummy/app/components/doc-content.hbs new file mode 100644 index 000000000..b069c8241 --- /dev/null +++ b/tests/dummy/app/components/doc-content.hbs @@ -0,0 +1,5 @@ + +
+ {{yield}} +
+ diff --git a/tests/dummy/app/templates/components/example-item.hbs b/tests/dummy/app/components/example-item.hbs similarity index 100% rename from tests/dummy/app/templates/components/example-item.hbs rename to tests/dummy/app/components/example-item.hbs diff --git a/tests/dummy/app/templates/components/menu-item.hbs b/tests/dummy/app/components/menu-item.hbs similarity index 100% rename from tests/dummy/app/templates/components/menu-item.hbs rename to tests/dummy/app/components/menu-item.hbs diff --git a/tests/dummy/app/templates/components/not-found.hbs b/tests/dummy/app/components/not-found.hbs similarity index 100% rename from tests/dummy/app/templates/components/not-found.hbs rename to tests/dummy/app/components/not-found.hbs diff --git a/tests/dummy/app/templates/components/page-toolbar.hbs b/tests/dummy/app/components/page-toolbar.hbs similarity index 100% rename from tests/dummy/app/templates/components/page-toolbar.hbs rename to tests/dummy/app/components/page-toolbar.hbs diff --git a/tests/dummy/app/templates/components/paper-api.hbs b/tests/dummy/app/components/paper-api.hbs similarity index 100% rename from tests/dummy/app/templates/components/paper-api.hbs rename to tests/dummy/app/components/paper-api.hbs diff --git a/tests/dummy/app/templates/components/submenu-item.hbs b/tests/dummy/app/components/submenu-item.hbs similarity index 100% rename from tests/dummy/app/templates/components/submenu-item.hbs rename to tests/dummy/app/components/submenu-item.hbs diff --git a/tests/dummy/app/controllers/components.js b/tests/dummy/app/controllers/components.js new file mode 100644 index 000000000..a8f3bd020 --- /dev/null +++ b/tests/dummy/app/controllers/components.js @@ -0,0 +1,123 @@ +import Controller from '@ember/controller'; + +export default class extends Controller { + get links() { + return [ + { + text: 'Autocomplete', + route: 'components.autocomplete', + icon: 'done' + }, + { + text: 'Button', + route: 'components.button', + icon: 'smart_button' + }, + { + text: 'Card', + route: 'components.card', + icon: 'view_carousel' + }, + { + text: 'Chips', + route: 'components.chips', + icon: 'label' + }, + { + text: 'Dialog', + route: 'components.dialog', + icon: 'call' + }, + { + text: 'Divider', + route: 'components.divider', + icon: 'linear_scale' + }, + { + text: 'Forms', + route: 'components.forms', + icon: 'edit' + }, + { + text: 'Grid List', + route: 'components.grid-list', + icon: 'view_compact' + }, + { + text: 'Icon', + route: 'components.icon', + icon: 'category' + }, + { + text: 'Input', + route: 'components.input', + icon: 'keyboard' + }, + { + text: 'List', + route: 'components.list', + icon: 'reorder' + }, + { + text: 'Menu', + route: 'components.menu', + icon: 'menu' + }, + { + text: 'Loading', + route: 'components.loading', + icon: 'hourglass_top' + }, + { + text: 'Toggles', + route: 'components.toggles', + icon: 'toggle_on' + }, + { + text: 'Select', + route: 'components.select', + icon: 'select_all' + }, + { + text: 'Sidenav', + route: 'components.sidenav', + icon: 'menu_open' + }, + { + text: 'Slider', + route: 'components.slider', + icon: 'linear_scale' + }, + { + text: 'Sidenav', + route: 'components.sidenav', + icon: 'menu_open' + }, + { + text: 'Speed Dial', + route: 'components.speed-dial', + icon: 'dialpad' + }, + { + text: 'Tabs', + route: 'components.tabs.index', + icon: 'table_chart' + }, + { + text: 'Toast', + route: 'components.toast', + icon: 'notifications_active' + }, + { + text: 'Toolbar', + route: 'components.toolbar', + icon: 'call_to_action' + }, + { + text: 'Tooltip', + route: 'components.tooltip', + icon: 'speaker_notes' + }, + ] + } +} diff --git a/tests/dummy/app/controllers/demo/autocomplete.js b/tests/dummy/app/controllers/components/autocomplete.js similarity index 100% rename from tests/dummy/app/controllers/demo/autocomplete.js rename to tests/dummy/app/controllers/components/autocomplete.js diff --git a/tests/dummy/app/controllers/demo/button.js b/tests/dummy/app/controllers/components/button.js similarity index 100% rename from tests/dummy/app/controllers/demo/button.js rename to tests/dummy/app/controllers/components/button.js diff --git a/tests/dummy/app/controllers/demo/checkbox.js b/tests/dummy/app/controllers/components/checkbox.js similarity index 100% rename from tests/dummy/app/controllers/demo/checkbox.js rename to tests/dummy/app/controllers/components/checkbox.js diff --git a/tests/dummy/app/controllers/demo/chips.js b/tests/dummy/app/controllers/components/chips.js similarity index 100% rename from tests/dummy/app/controllers/demo/chips.js rename to tests/dummy/app/controllers/components/chips.js diff --git a/tests/dummy/app/controllers/demo/dialog.js b/tests/dummy/app/controllers/components/dialog.js similarity index 100% rename from tests/dummy/app/controllers/demo/dialog.js rename to tests/dummy/app/controllers/components/dialog.js diff --git a/tests/dummy/app/controllers/demo/divider.js b/tests/dummy/app/controllers/components/divider.js similarity index 100% rename from tests/dummy/app/controllers/demo/divider.js rename to tests/dummy/app/controllers/components/divider.js diff --git a/tests/dummy/app/controllers/demo/grid-list.js b/tests/dummy/app/controllers/components/grid-list.js similarity index 100% rename from tests/dummy/app/controllers/demo/grid-list.js rename to tests/dummy/app/controllers/components/grid-list.js diff --git a/tests/dummy/app/controllers/demo/input.js b/tests/dummy/app/controllers/components/input.js similarity index 100% rename from tests/dummy/app/controllers/demo/input.js rename to tests/dummy/app/controllers/components/input.js diff --git a/tests/dummy/app/controllers/demo/list.js b/tests/dummy/app/controllers/components/list.js similarity index 100% rename from tests/dummy/app/controllers/demo/list.js rename to tests/dummy/app/controllers/components/list.js diff --git a/tests/dummy/app/controllers/demo/menu.js b/tests/dummy/app/controllers/components/menu.js similarity index 100% rename from tests/dummy/app/controllers/demo/menu.js rename to tests/dummy/app/controllers/components/menu.js diff --git a/tests/dummy/app/controllers/demo/progress-circular.js b/tests/dummy/app/controllers/components/progress-circular.js similarity index 100% rename from tests/dummy/app/controllers/demo/progress-circular.js rename to tests/dummy/app/controllers/components/progress-circular.js diff --git a/tests/dummy/app/controllers/demo/progress-linear.js b/tests/dummy/app/controllers/components/progress-linear.js similarity index 100% rename from tests/dummy/app/controllers/demo/progress-linear.js rename to tests/dummy/app/controllers/components/progress-linear.js diff --git a/tests/dummy/app/controllers/demo/radio.js b/tests/dummy/app/controllers/components/radio.js similarity index 100% rename from tests/dummy/app/controllers/demo/radio.js rename to tests/dummy/app/controllers/components/radio.js diff --git a/tests/dummy/app/controllers/demo/select.js b/tests/dummy/app/controllers/components/select.js similarity index 100% rename from tests/dummy/app/controllers/demo/select.js rename to tests/dummy/app/controllers/components/select.js diff --git a/tests/dummy/app/controllers/demo/sidenav.js b/tests/dummy/app/controllers/components/sidenav.js similarity index 100% rename from tests/dummy/app/controllers/demo/sidenav.js rename to tests/dummy/app/controllers/components/sidenav.js diff --git a/tests/dummy/app/controllers/demo/slider.js b/tests/dummy/app/controllers/components/slider.js similarity index 100% rename from tests/dummy/app/controllers/demo/slider.js rename to tests/dummy/app/controllers/components/slider.js diff --git a/tests/dummy/app/controllers/demo/speed-dial.js b/tests/dummy/app/controllers/components/speed-dial.js similarity index 100% rename from tests/dummy/app/controllers/demo/speed-dial.js rename to tests/dummy/app/controllers/components/speed-dial.js diff --git a/tests/dummy/app/controllers/demo/switch.js b/tests/dummy/app/controllers/components/switch.js similarity index 100% rename from tests/dummy/app/controllers/demo/switch.js rename to tests/dummy/app/controllers/components/switch.js diff --git a/tests/dummy/app/controllers/demo/tabs.js b/tests/dummy/app/controllers/components/tabs.js similarity index 100% rename from tests/dummy/app/controllers/demo/tabs.js rename to tests/dummy/app/controllers/components/tabs.js diff --git a/tests/dummy/app/controllers/demo/toast.js b/tests/dummy/app/controllers/components/toast.js similarity index 100% rename from tests/dummy/app/controllers/demo/toast.js rename to tests/dummy/app/controllers/components/toast.js diff --git a/tests/dummy/app/controllers/demo/tooltip.js b/tests/dummy/app/controllers/components/tooltip.js similarity index 100% rename from tests/dummy/app/controllers/demo/tooltip.js rename to tests/dummy/app/controllers/components/tooltip.js diff --git a/tests/dummy/app/controllers/layout/introduction.js b/tests/dummy/app/controllers/introduction.js similarity index 100% rename from tests/dummy/app/controllers/layout/introduction.js rename to tests/dummy/app/controllers/introduction.js diff --git a/tests/dummy/app/helpers/is-active.js b/tests/dummy/app/helpers/is-active.js index 3e7995d7e..493eed7b5 100644 --- a/tests/dummy/app/helpers/is-active.js +++ b/tests/dummy/app/helpers/is-active.js @@ -1,7 +1,25 @@ import Helper from '@ember/component/helper'; +import { inject as service } from '@ember/service'; -export default Helper.extend({ - compute([routeName, activeRoute]) { - return activeRoute === routeName; +export default class extends Helper { + @service router; + + compute([routeName]) { + if(this.router.currentRouteName.indexOf('.') > -1) { + const routeParts = this.router.currentRouteName.split('.'); + let isParentRoute = false; + let fullRoute = ''; + routeParts.forEach((part, i) => { + fullRoute += i === 0 ? part : '.' + part; + + if(fullRoute === routeName) { + isParentRoute = true; + } + }); + + if(isParentRoute) return true; + } + + return this.router.currentRouteName === routeName; } -}); +} diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index 0d2e12927..59ee41be4 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/app/router.js @@ -7,14 +7,11 @@ export default class Router extends EmberRouter { } Router.map(function() { - this.route('introduction'); - this.route('forms'); this.route('typography'); this.route('theme'); - this.route('cookbook'); this.route('addons'); - this.route('demo', { path: 'components' }, function() { + this.route('components', function() { this.route('autocomplete'); this.route('button'); this.route('card'); @@ -22,22 +19,21 @@ Router.map(function() { this.route('chips'); this.route('dialog'); this.route('divider'); + this.route('forms'); this.route('grid-list'); - this.route('icons', { path: 'icon' }); + this.route('icon'); this.route('input'); this.route('list'); this.route('menu'); this.route('tabs', function() { this.route('nested-route'); }); - this.route('progress-circular'); - this.route('progress-linear'); - this.route('radio'); + this.route('loading'); + this.route('toggles'); this.route('select'); this.route('sidenav'); this.route('slider'); this.route('speed-dial'); - this.route('switch'); this.route('toast'); this.route('toolbar'); this.route('tooltip'); diff --git a/tests/dummy/app/routes/components/index.js b/tests/dummy/app/routes/components/index.js new file mode 100644 index 000000000..a49db4500 --- /dev/null +++ b/tests/dummy/app/routes/components/index.js @@ -0,0 +1,7 @@ +import Route from '@ember/routing/route'; + +export default Route.extend({ + beforeModel() { + this.transitionTo('components.autocomplete') + } +}); diff --git a/tests/dummy/app/routes/demo/input.js b/tests/dummy/app/routes/components/input.js similarity index 100% rename from tests/dummy/app/routes/demo/input.js rename to tests/dummy/app/routes/components/input.js diff --git a/tests/dummy/app/routes/demo/progress-circular.js b/tests/dummy/app/routes/components/progress-circular.js similarity index 100% rename from tests/dummy/app/routes/demo/progress-circular.js rename to tests/dummy/app/routes/components/progress-circular.js diff --git a/tests/dummy/app/routes/demo/progress-linear.js b/tests/dummy/app/routes/components/progress-linear.js similarity index 100% rename from tests/dummy/app/routes/demo/progress-linear.js rename to tests/dummy/app/routes/components/progress-linear.js diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss index 64b50ec70..1eff848e1 100644 --- a/tests/dummy/app/styles/app.scss +++ b/tests/dummy/app/styles/app.scss @@ -26,14 +26,6 @@ body > div.ember-view { display: flex; } -.site-nav-container { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; -} - md-toolbar.md-warn { a, button { &.md-button.md-default-theme:not(.md-primary):not(.md-accent) { diff --git a/tests/dummy/app/styles/demo.scss b/tests/dummy/app/styles/demo.scss index b69d51002..cfce1521d 100644 --- a/tests/dummy/app/styles/demo.scss +++ b/tests/dummy/app/styles/demo.scss @@ -3,7 +3,6 @@ ***************/ @import 'highlight-overrides'; @import 'modules/all'; -@import 'layout-demo'; html { font-size: 62.5%; @@ -175,16 +174,6 @@ ul li:first-child { padding: 20px; } -md-toolbar.md-default-theme.page-main-toolbar { - background-color: paper-color('grey', '100'); - color: $dark-contrast-color; - - md-icon, .md-button md-icon { - color: $dark-contrast-color; - margin-top: -2px; - } -} - .nav-github { vertical-align: middle; display: inline-block; @@ -239,95 +228,6 @@ md-toolbar.md-default-theme.page-main-toolbar { background: paper-color($color-grey, '500'); } -.site-sidenav, -.site-sidenav.md-locked-open-add-active, -.site-sidenav.md-locked-open { - width: 272px; - min-width: 272px; - max-width: 272px; -} -.site-sidenav > * { - min-width: 218px; -} -md-sidenav.site-sidenav { - background-color: paper-color($primary, '400'); - background-color: paper-var(--primary-400); - - md-toolbar.md-default-theme { - background: linear-gradient(to bottom, paper-color($primary, '600'), paper-color($primary, '400')); - background: linear-gradient(to bottom, paper-var(--primary-600), paper-var(--primary-400)); - border-bottom: 1px solid rgba(#fff, .1); - color: #fff; - - height: 180px; - min-height: 180px; - max-height: 180px; - - .logo { - font-size: 54px; - font-weight: 500; - width: 100%; - height: 100%; - - img { - width: 150px; - } - - div { - font-weight: bold; - margin-top: -20px; - } - } - } - - md-content { - background: transparent; - color: $light-contrast-color; - md-icon { - color: inherit; - } - } - - .menu-item { - text-transform: uppercase; - font-size: 14px; - font-weight: 500; - - .expand-icon { - position: relative; - right: -36px; - transition: transform 250ms linear; - } - - &.expanded .expand-icon { - transform: rotate(-180deg); - } - } - - .submenu-item { - .md-list-item-inner { - padding-left: 36px; - } - } - - .menu-item, .submenu-item { - min-height: 40px; - - &.active, &:hover { - background-color: rgba(#fff, .1); - } - - .md-list-item-inner { - min-height: 40px; - - md-icon { - margin-top: 0; - margin-bottom: 0; - } - } - } -} - /* DEMO PAGE STYLES */ .doc-content { max-width: 864px; diff --git a/tests/dummy/app/styles/layout-demo.scss b/tests/dummy/app/styles/layout-demo.scss deleted file mode 100644 index eb8efc5d3..000000000 --- a/tests/dummy/app/styles/layout-demo.scss +++ /dev/null @@ -1,162 +0,0 @@ -$flexbox-shadow: inset 0px 0px 5px 0 rgba(0,0,0,0.16); -$flexbox-color1: paper-color('deep-purple', '200'); -$flexbox-color2: paper-color('orange', '400'); -$flexbox-color3: paper-color('blue', '300'); -$flexbox-color4: paper-color('teal', '200'); -$flexbox-color5: paper-color('pink', '300'); -$flexbox-color6: paper-color('lime', '300'); -$flexbox-color7: paper-color('amber', '300'); - -.doc-content.layout-docs { - .demo-group h4 { - color: paper-color('grey'); - font-size: 90%; - } - - md-card { - margin-bottom: 24px; - - md-toolbar { - border-radius: 3px 3px 0 0; - } - } - - .example { - border-radius: 3px 3px 0 0; - overflow: hidden; - } - - .example div div { - box-shadow: $flexbox-shadow; - text-align: center; - color: $dark-contrast-color; - } - - .introduction-example { - height: 350px; - - .box-one { - background-color: $flexbox-color1; - } - - .box-two-one { - background-color: $flexbox-color2; - } - .box-two-two { - background-color: $flexbox-color3; - } - .box-two-three { - background-color: $flexbox-color4; - } - .box-three { - background-color: $flexbox-color5; - } - } - - &.containers { - .example { - height: 150px; - - div:nth-child(1) > div { - padding: 12px; - - &:nth-child(1) { - background-color: $flexbox-color1; - } - &:nth-child(2) { - background-color: $flexbox-color2; - } - } - div:nth-child(2) > div { - padding: 12px; - - &:nth-child(1) { - background-color: $flexbox-color3; - } - &:nth-child(2) { - background-color: $flexbox-color4; - } - } - } - - .example-2 > div { - height: 100%; - } - } - - &.children { - .example { - > div { - height: 100%; - } - - div > div { - padding: 12px; - - &:nth-child(1) { - background-color: $flexbox-color1; - } - &:nth-child(2) { - background-color: $flexbox-color2; - } - &:nth-child(3) { - background-color: $flexbox-color3; - } - &:nth-child(4) { - background-color: $flexbox-color4; - } - &:nth-child(5) { - background-color: $flexbox-color5; - } - &:nth-child(6) { - background-color: $flexbox-color6; - } - &:nth-child(7) { - background-color: $flexbox-color7; - } - } - } - - .example-1, .example-3, .example-5 { - height: 128px; - } - - .example-2, .example-4 { - height: 150px; - } - } - - &.alignment { - .example { - border-radius: 0; - border-bottom: 1px dotted paper-color('grey', '300'); - } - - .layout-class { - margin-right: 24px; - display: inline-block; - } - - .interactive-demo { - height: 180px; - - > div { - height: 100%; - } - - div > div { - padding: 12px; - } - - .one { - background-color: $flexbox-color1; - } - .two { - background-color: $flexbox-color2; - } - .three { - background-color: $flexbox-color3; - } - } - } -} diff --git a/tests/dummy/app/templates/addons.hbs b/tests/dummy/app/templates/addons.hbs index fb7ef2976..21fb931db 100644 --- a/tests/dummy/app/templates/addons.hbs +++ b/tests/dummy/app/templates/addons.hbs @@ -1,5 +1,3 @@ - -

diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs index 70f96b484..0a9937c84 100644 --- a/tests/dummy/app/templates/application.hbs +++ b/tests/dummy/app/templates/application.hbs @@ -1,71 +1,39 @@ - - - -

- - - - - - Introduction - - Components - -
- {{#liquid-if demosExpanded}} - Autocomplete - Button - Card - Checkbox - Chips - Dialog - Divider - Grid List - Icons - Input - List - Menu - Progress Circular - Progress Linear - Radio - Select - Sidenav - Slider - Speed Dial - Switch - Tabs - Toast - Toolbar - Tooltip - {{/liquid-if}} -
- Forms - Typography - Color & Theme - - Layout -
- {{#liquid-if layoutExpanded}} - Introduction - Layout Containers - Layout Children - Child Alignment - {{/liquid-if}} +
+
+ + + + + {{paper-icon "menu"}} + + +
+ Introduction + Components + Layout + Typography + Theme + Addons + +
+ +
+ + + GitHub + + + +
- - Cookbook - Addons - - - - - -
- {{outlet}} + + +
+
+
+ {{outlet}} +
- +
diff --git a/tests/dummy/app/templates/components.hbs b/tests/dummy/app/templates/components.hbs new file mode 100644 index 000000000..c2d96608d --- /dev/null +++ b/tests/dummy/app/templates/components.hbs @@ -0,0 +1,20 @@ + + + + + {{#each this.links as |link|}} + + {{paper-icon link.icon class="md-avatar-icon"}} +
+ {{link.text}} +
+ + {{/each}} + + + + +
+ {{outlet}} +
+ diff --git a/tests/dummy/app/templates/demo/autocomplete.hbs b/tests/dummy/app/templates/components/autocomplete.hbs similarity index 98% rename from tests/dummy/app/templates/demo/autocomplete.hbs rename to tests/dummy/app/templates/components/autocomplete.hbs index 64fb34f1e..36924282b 100644 --- a/tests/dummy/app/templates/demo/autocomplete.hbs +++ b/tests/dummy/app/templates/components/autocomplete.hbs @@ -1,7 +1,4 @@ - - -

Basic Usage

diff --git a/tests/dummy/app/templates/demo/button.hbs b/tests/dummy/app/templates/components/button.hbs similarity index 98% rename from tests/dummy/app/templates/demo/button.hbs rename to tests/dummy/app/templates/components/button.hbs index 740d75ad3..3dd79a068 100644 --- a/tests/dummy/app/templates/demo/button.hbs +++ b/tests/dummy/app/templates/components/button.hbs @@ -1,5 +1,3 @@ - - {{! BEGIN-SNIPPET buttons.example }}
diff --git a/tests/dummy/app/templates/demo/card.hbs b/tests/dummy/app/templates/components/card.hbs similarity index 91% rename from tests/dummy/app/templates/demo/card.hbs rename to tests/dummy/app/templates/components/card.hbs index 3afe61f46..b43bb99bd 100644 --- a/tests/dummy/app/templates/demo/card.hbs +++ b/tests/dummy/app/templates/components/card.hbs @@ -1,5 +1,3 @@ - -

Basic Usage

{{! BEGIN-SNIPPET card.basic-usage }} @@ -11,7 +9,7 @@ Card with image Large - + Action 1 @@ -45,7 +43,7 @@ Card with image Small - + Action 1 @@ -80,7 +78,7 @@
- + Action buttons @@ -107,7 +105,7 @@ - + Vertical action buttons @@ -128,7 +126,7 @@
- + Icon action buttons @@ -148,7 +146,7 @@ - + {{paper-icon "favorite"}} {{paper-icon "settings"}} @@ -166,7 +164,7 @@ Paper - + Card header @@ -191,7 +189,7 @@
- + In-card mixed actions @@ -223,7 +221,7 @@ subhead - + In-card mixed actions @@ -257,7 +255,7 @@ subhead - + In-card mixed actions diff --git a/tests/dummy/app/templates/demo/checkbox.hbs b/tests/dummy/app/templates/components/checkbox.hbs similarity index 95% rename from tests/dummy/app/templates/demo/checkbox.hbs rename to tests/dummy/app/templates/components/checkbox.hbs index 96ad25bdf..e0d70002c 100644 --- a/tests/dummy/app/templates/demo/checkbox.hbs +++ b/tests/dummy/app/templates/components/checkbox.hbs @@ -1,5 +1,3 @@ - - {{! BEGIN-SNIPPET checkbox }}
diff --git a/tests/dummy/app/templates/demo/chips.hbs b/tests/dummy/app/templates/components/chips.hbs similarity index 98% rename from tests/dummy/app/templates/demo/chips.hbs rename to tests/dummy/app/templates/components/chips.hbs index c9a6e2705..b9d0ed9c4 100644 --- a/tests/dummy/app/templates/demo/chips.hbs +++ b/tests/dummy/app/templates/components/chips.hbs @@ -1,5 +1,3 @@ - - diff --git a/tests/dummy/app/templates/demo/dialog.hbs b/tests/dummy/app/templates/components/dialog.hbs similarity index 100% rename from tests/dummy/app/templates/demo/dialog.hbs rename to tests/dummy/app/templates/components/dialog.hbs diff --git a/tests/dummy/app/templates/demo/divider.hbs b/tests/dummy/app/templates/components/divider.hbs similarity index 97% rename from tests/dummy/app/templates/demo/divider.hbs rename to tests/dummy/app/templates/components/divider.hbs index bcd4281ef..e73ea5ea0 100644 --- a/tests/dummy/app/templates/demo/divider.hbs +++ b/tests/dummy/app/templates/components/divider.hbs @@ -1,5 +1,3 @@ - - diff --git a/tests/dummy/app/templates/components/doc-content.hbs b/tests/dummy/app/templates/components/doc-content.hbs deleted file mode 100644 index 2762b5054..000000000 --- a/tests/dummy/app/templates/components/doc-content.hbs +++ /dev/null @@ -1,5 +0,0 @@ - -
- {{yield}} -
- \ No newline at end of file diff --git a/tests/dummy/app/templates/forms.hbs b/tests/dummy/app/templates/components/forms.hbs similarity index 94% rename from tests/dummy/app/templates/forms.hbs rename to tests/dummy/app/templates/components/forms.hbs index 75e98cbe8..591fed29b 100644 --- a/tests/dummy/app/templates/forms.hbs +++ b/tests/dummy/app/templates/components/forms.hbs @@ -16,9 +16,9 @@ the html form tag by default, so expected form behavior will occur. (For example, pressing the enter key from within one of the form's inputs will submit the form.) - paper-form yields paper-input, - paper-select - and paper-autocomplete controls. + paper-form yields paper-input, + paper-select + and paper-autocomplete controls. In the following example you can see how we use the yielded form controls:

diff --git a/tests/dummy/app/templates/demo/grid-list.hbs b/tests/dummy/app/templates/components/grid-list.hbs similarity index 97% rename from tests/dummy/app/templates/demo/grid-list.hbs rename to tests/dummy/app/templates/components/grid-list.hbs index 84df46194..c939796ca 100644 --- a/tests/dummy/app/templates/demo/grid-list.hbs +++ b/tests/dummy/app/templates/components/grid-list.hbs @@ -1,5 +1,3 @@ - -

Basic Usage

{{! BEGIN-SNIPPET grid-list.basic-usage }} diff --git a/tests/dummy/app/templates/demo/icons.hbs b/tests/dummy/app/templates/components/icon.hbs similarity index 95% rename from tests/dummy/app/templates/demo/icons.hbs rename to tests/dummy/app/templates/components/icon.hbs index 4d38cfc18..df9cd79f2 100644 --- a/tests/dummy/app/templates/demo/icons.hbs +++ b/tests/dummy/app/templates/components/icon.hbs @@ -1,5 +1,3 @@ - -

Available Icons

diff --git a/tests/dummy/app/templates/demo/input.hbs b/tests/dummy/app/templates/components/input.hbs similarity index 99% rename from tests/dummy/app/templates/demo/input.hbs rename to tests/dummy/app/templates/components/input.hbs index a9218d847..a632f8547 100644 --- a/tests/dummy/app/templates/demo/input.hbs +++ b/tests/dummy/app/templates/components/input.hbs @@ -1,5 +1,3 @@ - - {{! BEGIN-SNIPPET input.basic-usage}}
diff --git a/tests/dummy/app/templates/demo/list.hbs b/tests/dummy/app/templates/components/list.hbs similarity index 99% rename from tests/dummy/app/templates/demo/list.hbs rename to tests/dummy/app/templates/components/list.hbs index 9825d9a20..12c714946 100644 --- a/tests/dummy/app/templates/demo/list.hbs +++ b/tests/dummy/app/templates/components/list.hbs @@ -1,5 +1,3 @@ - - @@ -220,6 +218,3 @@ - - - diff --git a/tests/dummy/app/templates/components/loading.hbs b/tests/dummy/app/templates/components/loading.hbs new file mode 100644 index 000000000..88098149d --- /dev/null +++ b/tests/dummy/app/templates/components/loading.hbs @@ -0,0 +1 @@ +// put progress-circular and progress-linear here diff --git a/tests/dummy/app/templates/demo/menu.hbs b/tests/dummy/app/templates/components/menu.hbs similarity index 99% rename from tests/dummy/app/templates/demo/menu.hbs rename to tests/dummy/app/templates/components/menu.hbs index 37c332241..8069106de 100644 --- a/tests/dummy/app/templates/demo/menu.hbs +++ b/tests/dummy/app/templates/components/menu.hbs @@ -1,8 +1,4 @@ - - - - diff --git a/tests/dummy/app/templates/demo/progress-circular.hbs b/tests/dummy/app/templates/components/progress-circular.hbs similarity index 98% rename from tests/dummy/app/templates/demo/progress-circular.hbs rename to tests/dummy/app/templates/components/progress-circular.hbs index fac61e23c..35c53a7e8 100644 --- a/tests/dummy/app/templates/demo/progress-circular.hbs +++ b/tests/dummy/app/templates/components/progress-circular.hbs @@ -1,5 +1,3 @@ - -

Basic Usage

Determinate

diff --git a/tests/dummy/app/templates/demo/progress-linear.hbs b/tests/dummy/app/templates/components/progress-linear.hbs similarity index 96% rename from tests/dummy/app/templates/demo/progress-linear.hbs rename to tests/dummy/app/templates/components/progress-linear.hbs index 7e9abfb0a..76c66835f 100644 --- a/tests/dummy/app/templates/demo/progress-linear.hbs +++ b/tests/dummy/app/templates/components/progress-linear.hbs @@ -1,5 +1,3 @@ - -

Basic Usage

diff --git a/tests/dummy/app/templates/demo/radio.hbs b/tests/dummy/app/templates/components/radio.hbs similarity index 97% rename from tests/dummy/app/templates/demo/radio.hbs rename to tests/dummy/app/templates/components/radio.hbs index 40c62fb78..1c50b7866 100644 --- a/tests/dummy/app/templates/demo/radio.hbs +++ b/tests/dummy/app/templates/components/radio.hbs @@ -1,4 +1,3 @@ - diff --git a/tests/dummy/app/templates/demo/select.hbs b/tests/dummy/app/templates/components/select.hbs similarity index 98% rename from tests/dummy/app/templates/demo/select.hbs rename to tests/dummy/app/templates/components/select.hbs index bab349cc0..c6af3b2f1 100644 --- a/tests/dummy/app/templates/demo/select.hbs +++ b/tests/dummy/app/templates/components/select.hbs @@ -1,5 +1,3 @@ - -

Basic Usage

diff --git a/tests/dummy/app/templates/demo/sidenav.hbs b/tests/dummy/app/templates/components/sidenav.hbs similarity index 98% rename from tests/dummy/app/templates/demo/sidenav.hbs rename to tests/dummy/app/templates/components/sidenav.hbs index 776ac90ca..ffac64bcb 100644 --- a/tests/dummy/app/templates/demo/sidenav.hbs +++ b/tests/dummy/app/templates/components/sidenav.hbs @@ -1,5 +1,3 @@ - - diff --git a/tests/dummy/app/templates/demo/slider.hbs b/tests/dummy/app/templates/components/slider.hbs similarity index 98% rename from tests/dummy/app/templates/demo/slider.hbs rename to tests/dummy/app/templates/components/slider.hbs index 0c966a624..bafcafc08 100644 --- a/tests/dummy/app/templates/demo/slider.hbs +++ b/tests/dummy/app/templates/components/slider.hbs @@ -1,5 +1,3 @@ - - diff --git a/tests/dummy/app/templates/demo/speed-dial.hbs b/tests/dummy/app/templates/components/speed-dial.hbs similarity index 99% rename from tests/dummy/app/templates/demo/speed-dial.hbs rename to tests/dummy/app/templates/components/speed-dial.hbs index 44a1d4745..073ff2c27 100644 --- a/tests/dummy/app/templates/demo/speed-dial.hbs +++ b/tests/dummy/app/templates/components/speed-dial.hbs @@ -1,5 +1,3 @@ - -
diff --git a/tests/dummy/app/templates/demo/switch.hbs b/tests/dummy/app/templates/components/switch.hbs similarity index 93% rename from tests/dummy/app/templates/demo/switch.hbs rename to tests/dummy/app/templates/components/switch.hbs index 57bfe0b51..c25f8745c 100644 --- a/tests/dummy/app/templates/demo/switch.hbs +++ b/tests/dummy/app/templates/components/switch.hbs @@ -1,5 +1,3 @@ - -

{{! BEGIN-SNIPPET switch }} diff --git a/tests/dummy/app/templates/demo/tabs.hbs b/tests/dummy/app/templates/components/tabs.hbs similarity index 97% rename from tests/dummy/app/templates/demo/tabs.hbs rename to tests/dummy/app/templates/components/tabs.hbs index eaa722ff1..634e5720c 100644 --- a/tests/dummy/app/templates/demo/tabs.hbs +++ b/tests/dummy/app/templates/components/tabs.hbs @@ -1,7 +1,4 @@ - - -

@@ -186,10 +183,10 @@ {{! BEGIN-SNIPPET routable-usage}} - + Index - + Nested Route diff --git a/tests/dummy/app/templates/demo/tabs/index.hbs b/tests/dummy/app/templates/components/tabs/index.hbs similarity index 100% rename from tests/dummy/app/templates/demo/tabs/index.hbs rename to tests/dummy/app/templates/components/tabs/index.hbs diff --git a/tests/dummy/app/templates/demo/tabs/nested-route.hbs b/tests/dummy/app/templates/components/tabs/nested-route.hbs similarity index 100% rename from tests/dummy/app/templates/demo/tabs/nested-route.hbs rename to tests/dummy/app/templates/components/tabs/nested-route.hbs diff --git a/tests/dummy/app/templates/demo/toast.hbs b/tests/dummy/app/templates/components/toast.hbs similarity index 99% rename from tests/dummy/app/templates/demo/toast.hbs rename to tests/dummy/app/templates/components/toast.hbs index ca377475c..255fa727f 100644 --- a/tests/dummy/app/templates/demo/toast.hbs +++ b/tests/dummy/app/templates/components/toast.hbs @@ -1,7 +1,4 @@ - - - diff --git a/tests/dummy/app/templates/components/toggles.hbs b/tests/dummy/app/templates/components/toggles.hbs new file mode 100644 index 000000000..72daf1dcb --- /dev/null +++ b/tests/dummy/app/templates/components/toggles.hbs @@ -0,0 +1 @@ +// put checkbox, radiobox, switch diff --git a/tests/dummy/app/templates/demo/toolbar.hbs b/tests/dummy/app/templates/components/toolbar.hbs similarity index 96% rename from tests/dummy/app/templates/demo/toolbar.hbs rename to tests/dummy/app/templates/components/toolbar.hbs index ff186d0e8..75fbcf114 100644 --- a/tests/dummy/app/templates/demo/toolbar.hbs +++ b/tests/dummy/app/templates/components/toolbar.hbs @@ -1,5 +1,3 @@ - - {{! BEGIN-SNIPPET toolbar }} {{! without contextual components }} diff --git a/tests/dummy/app/templates/demo/tooltip.hbs b/tests/dummy/app/templates/components/tooltip.hbs similarity index 98% rename from tests/dummy/app/templates/demo/tooltip.hbs rename to tests/dummy/app/templates/components/tooltip.hbs index c25dbcd60..7f1f32019 100644 --- a/tests/dummy/app/templates/demo/tooltip.hbs +++ b/tests/dummy/app/templates/components/tooltip.hbs @@ -1,7 +1,4 @@ - - - diff --git a/tests/dummy/app/templates/cookbook.hbs b/tests/dummy/app/templates/cookbook.hbs deleted file mode 100644 index 6540f8860..000000000 --- a/tests/dummy/app/templates/cookbook.hbs +++ /dev/null @@ -1,15 +0,0 @@ - - - -
-

Hiding the \{{paper-input}} character counts

-

- Material Design requires that a character count is displayed for input elements which have a length restriction. However, when forms have many input elements, some may prefer to display the count only when the element is focused or invalid. This CSS achieves this. -

- -

Recipe contributions

-

- Have a great tip or solution for ember-paper? Submit a pull request on GitHub or discuss it with the team on Discord #e-paper for inclusion here. -

-
- diff --git a/tests/dummy/app/templates/index.hbs b/tests/dummy/app/templates/index.hbs index e8b1bc7e4..95b98a904 100644 --- a/tests/dummy/app/templates/index.hbs +++ b/tests/dummy/app/templates/index.hbs @@ -1,6 +1,4 @@ - - - +

Welcome to Ember Paper.

diff --git a/tests/dummy/app/templates/layout/introduction.hbs b/tests/dummy/app/templates/layout.hbs similarity index 97% rename from tests/dummy/app/templates/layout/introduction.hbs rename to tests/dummy/app/templates/layout.hbs index 06d084bec..1923d9ba9 100644 --- a/tests/dummy/app/templates/layout/introduction.hbs +++ b/tests/dummy/app/templates/layout.hbs @@ -1,7 +1,4 @@ - - - - +

Overview

@@ -125,5 +122,4 @@ - - + diff --git a/tests/dummy/app/templates/theme.hbs b/tests/dummy/app/templates/theme.hbs index dcaf9fdef..6fcdbcf43 100644 --- a/tests/dummy/app/templates/theme.hbs +++ b/tests/dummy/app/templates/theme.hbs @@ -1,5 +1,3 @@ - -

diff --git a/tests/dummy/app/templates/typography.hbs b/tests/dummy/app/templates/typography.hbs index 3068efa79..fb54b573c 100644 --- a/tests/dummy/app/templates/typography.hbs +++ b/tests/dummy/app/templates/typography.hbs @@ -1,5 +1,3 @@ - -

Headings

diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 1f4b7c3f3..bffd6545d 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -5,7 +5,7 @@ module.exports = function(environment) { modulePrefix: 'dummy', environment, rootURL: '/', - locationType: 'hash', + locationType: 'auto', EmberENV: { FEATURES: { // Here you can enable experimental features on an ember canary build diff --git a/tests/dummy/public/ember-logo-original.png b/tests/dummy/public/assets/ember-logo-original.png similarity index 100% rename from tests/dummy/public/ember-logo-original.png rename to tests/dummy/public/assets/ember-logo-original.png diff --git a/tests/dummy/public/ember-logo-white.png b/tests/dummy/public/assets/ember-logo-white.png similarity index 100% rename from tests/dummy/public/ember-logo-white.png rename to tests/dummy/public/assets/ember-logo-white.png diff --git a/tests/dummy/public/ember-logo.png b/tests/dummy/public/assets/ember-logo.png similarity index 100% rename from tests/dummy/public/ember-logo.png rename to tests/dummy/public/assets/ember-logo.png diff --git a/tests/dummy/public/tomster.png b/tests/dummy/public/assets/tomster.png similarity index 100% rename from tests/dummy/public/tomster.png rename to tests/dummy/public/assets/tomster.png diff --git a/tests/dummy/public/washedout.png b/tests/dummy/public/assets/washedout.png similarity index 100% rename from tests/dummy/public/washedout.png rename to tests/dummy/public/assets/washedout.png From ba5fcc69503e2893eda01e03f69c1acaba55edd6 Mon Sep 17 00:00:00 2001 From: Gabriel Csapo Date: Wed, 3 Jun 2020 21:55:47 -0700 Subject: [PATCH 2/9] updates button example and upgrades ember-code-snippet --- README.md | 69 +++ ember-cli-build.js | 1 - package-lock.json | 484 +++++++++--------- package.json | 5 +- tests/dummy/app/components/custom-button.js | 12 - tests/dummy/app/components/paper-api.hbs | 68 ++- tests/dummy/app/controllers/application.js | 1 + .../app/controllers/components/button.js | 20 +- tests/dummy/app/helpers/is-active.js | 6 +- tests/dummy/app/router.js | 14 +- tests/dummy/app/styles/app.scss | 67 ++- tests/dummy/app/styles/demo.scss | 204 ++------ .../dummy/app/styles/highlight-overrides.scss | 13 - tests/dummy/app/styles/modules/_all.scss | 1 - .../dummy/app/styles/modules/codeinline.scss | 3 - tests/dummy/app/templates/application.hbs | 18 +- .../dummy/app/templates/components/button.hbs | 123 +++-- tests/dummy/app/templates/index.hbs | 89 +--- tests/dummy/app/templates/layout.hbs | 2 +- tests/dummy/app/templates/typography.hbs | 115 ----- tests/dummy/snippets/install.sh | 1 - .../dummy/snippets/typography.code-block.hbs | 2 - 22 files changed, 531 insertions(+), 787 deletions(-) delete mode 100644 tests/dummy/app/components/custom-button.js delete mode 100644 tests/dummy/app/styles/highlight-overrides.scss delete mode 100644 tests/dummy/app/styles/modules/_all.scss delete mode 100644 tests/dummy/app/styles/modules/codeinline.scss delete mode 100644 tests/dummy/app/templates/typography.hbs delete mode 100644 tests/dummy/snippets/install.sh delete mode 100644 tests/dummy/snippets/typography.code-block.hbs diff --git a/README.md b/README.md index 053ff85a9..a345c5cff 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,75 @@ Sass is an important part of Ember-paper. Using sass you can override default va All the components and styles are ready to use in your application templates. Navigate through the docs to understand how to use each component. +# Content Security Policy + +This is no longer used in newer ember-cli apps. However, here are the instructions if you need them. Ember Paper uses fonts from Google Fonts, so the URL to them has to be white listed. You can set this by adding to the Content Security Policy defined in config/environment.js like so: + +```js +ENV.contentSecurityPolicy = { + 'default-src': "'none'", + 'script-src': "'self' 'unsafe-inline'", + 'style-src': "'self' 'unsafe-inline' https://fonts.googleapis.com", + 'font-src': "'self' fonts.gstatic.com", + 'connect-src': "'self'", + 'img-src': "'self' data:", + 'media-src': "'self'" +}; +``` + +You can find out more information on the CSP addon page here. We also need to allow data: in img-src because of a current hack in paper-button styles. + +# Options + +Ember-paper supports the following options, specified in your ember-cli-build.js file: + +``` +ENV['autoprefixer'] (defaults to { browsers: ['last 2 versions'] }) +``` + +By default ember-paper will run autoprefixer on your styles. This option allows you to override the default autoprefixer target. + +``` +ENV['ember-paper'].insertFontLinks (defaults to true) +``` + +Consuming apps can specify this option to prevent the insertion of google fonts links inside the head tag. This is especially useful if you want to include your own fonts. + +``` +ENV['ember-paper'].whitelist (defaults to []) +``` + +Consuming apps can optionally specify this array to only include these components into the build. You should use either whitelist or blacklist, not both. + +```js +ENV['ember-paper'] = { + whitelist: [ + 'paper-card', + 'paper-tooltip', + 'paper-button' + ] +}; +``` + +The dependencies of the specified components will be included as well. This is the recommended approach, blacklist is harder to get right. + +``` +ENV['ember-paper'].blacklist (defaults to []) +``` + +Consuming apps can optionally specify this array to exclude these components from the build. + +``` +ENV['ember-paper'] = { + blacklist: [ + 'paper-card', + 'paper-item' + ] +}; +``` + +This only bans from the build the specified components, not its dependencies. whitelist is easier to maintain. + ## Resources - Contributors can often be found on the [#e-paper channel on discord](https://discord.gg/zT3asNS). diff --git a/ember-cli-build.js b/ember-cli-build.js index 8e1ebdaa4..1a7d6bdb0 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -3,7 +3,6 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); module.exports = function(defaults) { let app = new EmberAddon(defaults, { - // Add options here snippetPaths: ['tests/dummy/snippets'], snippetSearchPaths: ['tests/dummy/app'] }); diff --git a/package-lock.json b/package-lock.json index 9fe547b66..667e303f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4510,7 +4510,6 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/broccoli-flatiron/-/broccoli-flatiron-0.1.3.tgz", "integrity": "sha512-dD/4ck+LKOLTBzFlxP2zX7fhWt1TFMVR/88b9/wd8LkAHUyAzWs1vBah94ObSvajYGZ7ic+XvMXw+OhmvdlYoQ==", - "dev": true, "requires": { "broccoli-plugin": "^1.3.0", "mkdirp": "^0.5.1" @@ -4899,59 +4898,6 @@ } } }, - "broccoli-static-compiler": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/broccoli-static-compiler/-/broccoli-static-compiler-0.1.4.tgz", - "integrity": "sha1-cT0Y8I6zExUwV1oMWtKVG7oQr0E=", - "dev": true, - "requires": { - "broccoli-kitchen-sink-helpers": "^0.2.0", - "broccoli-writer": "^0.1.1", - "mkdirp": "^0.3.5" - }, - "dependencies": { - "broccoli-kitchen-sink-helpers": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz", - "integrity": "sha1-peCYbtjXb7WYS2jD8EUNOpbjbsw=", - "dev": true, - "requires": { - "glob": "^5.0.10", - "mkdirp": "^0.5.1" - }, - "dependencies": { - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - } - } - }, - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "mkdirp": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", - "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=", - "dev": true - } - } - }, "broccoli-stew": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/broccoli-stew/-/broccoli-stew-1.6.0.tgz", @@ -5132,16 +5078,6 @@ } } }, - "broccoli-writer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/broccoli-writer/-/broccoli-writer-0.1.1.tgz", - "integrity": "sha1-1NcaqPKvvGejhmuRotp5CEuWqy0=", - "dev": true, - "requires": { - "quick-temp": "^0.1.0", - "rsvp": "^3.0.6" - } - }, "brorand": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", @@ -5689,6 +5625,18 @@ "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "dev": true }, + "clipboard": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz", + "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==", + "dev": true, + "optional": true, + "requires": { + "good-listener": "^1.2.2", + "select": "^1.1.2", + "tiny-emitter": "^2.0.0" + } + }, "clone": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", @@ -6419,6 +6367,13 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, + "delegate": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", + "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==", + "dev": true, + "optional": true + }, "delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -8786,174 +8741,40 @@ } }, "ember-cli-fastboot": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/ember-cli-fastboot/-/ember-cli-fastboot-1.1.3.tgz", - "integrity": "sha512-9TuF4O/rTF82LdefWvNm8mLiLP1RpAAuufrC6EnTiHmhdyL0Ni4kb7uhkYd356zF+n1F2Cj6fNQu/JfwMbjG1g==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/ember-cli-fastboot/-/ember-cli-fastboot-2.2.2.tgz", + "integrity": "sha512-j3pCxBRZdZIRVtfzbQ9TqkR0LLmnxa4Isjns9HD/ZnO7u8uzWfYmncqqJbgIwcWHHG8v6x8opNeYnx99WQhy9g==", "dev": true, "requires": { - "broccoli-concat": "^3.2.2", - "broccoli-funnel": "^2.0.0", - "broccoli-merge-trees": "^2.0.0", - "broccoli-plugin": "^1.2.1", - "chalk": "^2.0.1", - "ember-cli-babel": "^6.7.2", + "broccoli-concat": "^3.7.1", + "broccoli-file-creator": "^2.1.1", + "broccoli-funnel": "^2.0.1", + "broccoli-merge-trees": "^3.0.1", + "broccoli-plugin": "^1.3.1", + "chalk": "^2.4.1", + "ember-cli-babel": "^7.1.0", "ember-cli-lodash-subset": "2.0.1", - "ember-cli-preprocess-registry": "^3.1.0", - "ember-cli-version-checker": "^2.1.0", - "fastboot": "^1.1.3", - "fastboot-express-middleware": "^1.1.0", - "fastboot-transform": "^0.1.2", - "fs-extra": "^4.0.2", + "ember-cli-preprocess-registry": "^3.1.2", + "ember-cli-version-checker": "^3.0.0", + "fastboot": "^2.0.0", + "fastboot-express-middleware": "^2.0.0", + "fastboot-transform": "^0.1.3", + "fs-extra": "^7.0.0", "json-stable-stringify": "^1.0.1", "md5-hex": "^2.0.0", - "silent-error": "^1.0.0" + "silent-error": "^1.1.0" }, "dependencies": { - "amd-name-resolver": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/amd-name-resolver/-/amd-name-resolver-1.2.0.tgz", - "integrity": "sha512-hlSTWGS1t6/xq5YCed7YALg7tKZL3rkl7UwEZ/eCIkn8JxmM6fU6Qs/1hwtjQqfuYxlffuUcgYEm0f5xP4YKaA==", - "dev": true, - "requires": { - "ensure-posix-path": "^1.0.1" - } - }, - "babel-plugin-debug-macros": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz", - "integrity": "sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==", - "dev": true, - "requires": { - "semver": "^5.3.0" - } - }, - "broccoli-babel-transpiler": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.5.1.tgz", - "integrity": "sha512-w6GcnkxvHcNCte5FcLGEG1hUdQvlfvSN/6PtGWU/otg69Ugk8rUk51h41R0Ugoc+TNxyeFG1opRt2RlA87XzNw==", - "dev": true, - "requires": { - "babel-core": "^6.26.0", - "broccoli-funnel": "^2.0.1", - "broccoli-merge-trees": "^2.0.0", - "broccoli-persistent-filter": "^1.4.3", - "clone": "^2.0.0", - "hash-for-dep": "^1.2.3", - "heimdalljs-logger": "^0.1.7", - "json-stable-stringify": "^1.0.0", - "rsvp": "^4.8.2", - "workerpool": "^2.3.0" - } - }, - "broccoli-merge-trees": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-2.0.1.tgz", - "integrity": "sha512-WjaexJ+I8BxP5V5RNn6um/qDRSmKoiBC/QkRi79FT9ClHfldxRyCDs9mcV7mmoaPlsshmmPaUz5jdtcKA6DClQ==", - "dev": true, - "requires": { - "broccoli-plugin": "^1.3.0", - "merge-trees": "^1.0.1" - } - }, - "broccoli-persistent-filter": { - "version": "1.4.6", - "resolved": "https://registry.npmjs.org/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.6.tgz", - "integrity": "sha512-0RejLwoC95kv4kta8KAa+FmECJCK78Qgm8SRDEK7YyU0N9Cx6KpY3UCDy9WELl3mCXLN8TokNxc7/hp3lL4lfw==", - "dev": true, - "requires": { - "async-disk-cache": "^1.2.1", - "async-promise-queue": "^1.0.3", - "broccoli-plugin": "^1.0.0", - "fs-tree-diff": "^0.5.2", - "hash-for-dep": "^1.0.2", - "heimdalljs": "^0.2.1", - "heimdalljs-logger": "^0.1.7", - "mkdirp": "^0.5.1", - "promise-map-series": "^0.2.1", - "rimraf": "^2.6.1", - "rsvp": "^3.0.18", - "symlink-or-copy": "^1.0.1", - "walk-sync": "^0.3.1" - }, - "dependencies": { - "rsvp": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz", - "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==", - "dev": true - } - } - }, - "ember-cli-babel": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz", - "integrity": "sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==", - "dev": true, - "requires": { - "amd-name-resolver": "1.2.0", - "babel-plugin-debug-macros": "^0.2.0-beta.6", - "babel-plugin-ember-modules-api-polyfill": "^2.6.0", - "babel-plugin-transform-es2015-modules-amd": "^6.24.0", - "babel-polyfill": "^6.26.0", - "babel-preset-env": "^1.7.0", - "broccoli-babel-transpiler": "^6.5.0", - "broccoli-debug": "^0.6.4", - "broccoli-funnel": "^2.0.0", - "broccoli-source": "^1.1.0", - "clone": "^2.0.0", - "ember-cli-version-checker": "^2.1.2", - "semver": "^5.5.0" - } - }, - "ember-cli-version-checker": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz", - "integrity": "sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==", - "dev": true, - "requires": { - "resolve": "^1.3.3", - "semver": "^5.3.0" - } - }, "fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "dev": true, "requires": { "graceful-fs": "^4.1.2", "jsonfile": "^4.0.0", "universalify": "^0.1.0" } - }, - "merge-trees": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-trees/-/merge-trees-1.0.1.tgz", - "integrity": "sha1-zL5nRWl4f53vF/1G5lJfVwC70j4=", - "dev": true, - "requires": { - "can-symlink": "^1.0.0", - "fs-tree-diff": "^0.5.4", - "heimdalljs": "^0.2.1", - "heimdalljs-logger": "^0.1.7", - "rimraf": "^2.4.3", - "symlink-or-copy": "^1.0.0" - } - }, - "rsvp": { - "version": "4.8.5", - "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", - "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==", - "dev": true - }, - "workerpool": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-2.3.3.tgz", - "integrity": "sha512-L1ovlYHp6UObYqElXXpbd214GgbEKDED0d3sj7pRdFXjNkb2+un/AUcCkceHizO0IVI6SOGGncrcjozruCkRgA==", - "dev": true, - "requires": { - "object-assign": "4.1.1" - } } } }, @@ -9094,6 +8915,60 @@ "integrity": "sha1-IMtop5D+D94kiN39jvu332/nZvI=", "dev": true }, + "ember-cli-node-assets": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/ember-cli-node-assets/-/ember-cli-node-assets-0.2.2.tgz", + "integrity": "sha1-0tVWJufMZhn4gtf+VXUfkmYCJwg=", + "dev": true, + "requires": { + "broccoli-funnel": "^1.0.1", + "broccoli-merge-trees": "^1.1.1", + "broccoli-source": "^1.1.0", + "debug": "^2.2.0", + "lodash": "^4.5.1", + "resolve": "^1.1.7" + }, + "dependencies": { + "broccoli-funnel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz", + "integrity": "sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=", + "dev": true, + "requires": { + "array-equal": "^1.0.0", + "blank-object": "^1.0.1", + "broccoli-plugin": "^1.3.0", + "debug": "^2.2.0", + "exists-sync": "0.0.4", + "fast-ordered-set": "^1.0.0", + "fs-tree-diff": "^0.5.3", + "heimdalljs": "^0.2.0", + "minimatch": "^3.0.0", + "mkdirp": "^0.5.0", + "path-posix": "^1.0.0", + "rimraf": "^2.4.3", + "symlink-or-copy": "^1.0.0", + "walk-sync": "^0.3.1" + } + }, + "broccoli-merge-trees": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz", + "integrity": "sha1-oAFRm7UGfwZYnZGvopQkRaLQ/bU=", + "dev": true, + "requires": { + "broccoli-plugin": "^1.3.0", + "can-symlink": "^1.0.0", + "fast-ordered-set": "^1.0.2", + "fs-tree-diff": "^0.5.4", + "heimdalljs": "^0.2.1", + "heimdalljs-logger": "^0.1.7", + "rimraf": "^2.4.3", + "symlink-or-copy": "^1.0.0" + } + } + } + }, "ember-cli-normalize-entity-name": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz", @@ -9768,15 +9643,15 @@ } }, "ember-code-snippet": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/ember-code-snippet/-/ember-code-snippet-2.4.2.tgz", - "integrity": "sha512-JO2HKVsL2tUAGj9atJ7Q3bS9DK2ZijdhXDUsu6iJPS2PBvWGKKktHq572sl5cPc4tj+Girgrq3zp/5Wy95Xmsg==", - "dev": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ember-code-snippet/-/ember-code-snippet-3.0.0.tgz", + "integrity": "sha512-pvIpGPLma7m6WQ5+uOjwkzozIzRAqlUSQk9TMCrQQ/AeEGWtqTJvZyAtH9LoarPtudHtWCZkUqJXIqKsjIqAbw==", "requires": { "broccoli-flatiron": "^0.1.3", "broccoli-merge-trees": "^1.0.0", - "broccoli-static-compiler": "^0.1.4", - "broccoli-writer": "^0.1.1", + "broccoli-plugin": "^1.3.1", + "ember-cli-babel": "^7.7.3", + "ember-cli-htmlbars": "^3.0.1", "es6-promise": "^1.0.0", "glob": "^7.1.3" }, @@ -9785,7 +9660,6 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz", "integrity": "sha1-oAFRm7UGfwZYnZGvopQkRaLQ/bU=", - "dev": true, "requires": { "broccoli-plugin": "^1.3.0", "can-symlink": "^1.0.0", @@ -9796,6 +9670,17 @@ "rimraf": "^2.4.3", "symlink-or-copy": "^1.0.0" } + }, + "ember-cli-htmlbars": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/ember-cli-htmlbars/-/ember-cli-htmlbars-3.1.0.tgz", + "integrity": "sha512-cgvRJM73IT0aePUG7oQ/afB7vSRBV3N0wu9BrWhHX2zkR7A7cUBI7KC9VPk6tbctCXoM7BRGsCC4aIjF7yrfXA==", + "requires": { + "broccoli-persistent-filter": "^2.3.1", + "hash-for-dep": "^1.5.1", + "json-stable-stringify": "^1.0.1", + "strip-bom": "^3.0.0" + } } } }, @@ -11180,6 +11065,75 @@ } } }, + "ember-prism": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/ember-prism/-/ember-prism-0.6.1.tgz", + "integrity": "sha512-owdRVIaL8K66SlB+NtV/N72zi1ZrcBnnWAn9FlxcxCz7qj1mESxFKcCC1Dwic4MsXEvmAERgLlL9EM6fTJOddQ==", + "dev": true, + "requires": { + "ember-cli-babel": "^7.17.2", + "ember-cli-htmlbars": "^4.2.2", + "ember-cli-node-assets": "^0.2.2", + "ember-in-element-polyfill": "^0.3.0", + "prismjs": "^1.19.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ember-cli-version-checker": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-4.1.1.tgz", + "integrity": "sha512-bzEWsTMXUGEJfxcAGWPe6kI7oHEGD3jaxUWDYPTqzqGhNkgPwXTBgoWs9zG1RaSMaOPFnloWuxRcoHi4TrYS3Q==", + "dev": true, + "requires": { + "resolve-package-path": "^2.0.0", + "semver": "^6.3.0", + "silent-error": "^1.1.1" + } + }, + "ember-in-element-polyfill": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/ember-in-element-polyfill/-/ember-in-element-polyfill-0.3.0.tgz", + "integrity": "sha512-tTo2y4M7k/q2RGvD0rqfM/L4ktfGCh4jG6BmjPb6NewJ0DQB8LQDuqoKpwRQmDMxyfMVZSm6GL+wsDoiMbTYXQ==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "ember-cli-babel": "^7.17.2", + "ember-cli-htmlbars": "^4.2.0", + "ember-cli-version-checker": "^4.1.0" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "resolve-package-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-2.0.0.tgz", + "integrity": "sha512-/CLuzodHO2wyyHTzls5Qr+EFeG6RcW4u6//gjYvUfcfyuplIX1SSccU+A5A9A78Gmezkl3NBkFAMxLbzTY9TJA==", + "dev": true, + "requires": { + "path-root": "^0.1.1", + "resolve": "^1.13.1" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, "ember-qunit": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/ember-qunit/-/ember-qunit-4.6.0.tgz", @@ -12257,8 +12211,7 @@ "es6-promise": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-1.0.0.tgz", - "integrity": "sha1-+Q02KfqnwmFmrk33fIm6zeuNyn8=", - "dev": true + "integrity": "sha1-+Q02KfqnwmFmrk33fIm6zeuNyn8=" }, "escalade": { "version": "3.1.1", @@ -13041,31 +12994,25 @@ } }, "fastboot": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/fastboot/-/fastboot-1.2.1.tgz", - "integrity": "sha512-WK5Jy71Q6FPoGkooEnWt7Yc2vb23f6C2RtBUutO459TskFnUhzOF8ZJASNNjURQYq8U/pTha2LI4Ix7UInffgg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/fastboot/-/fastboot-2.0.3.tgz", + "integrity": "sha512-NNH/o+XhITAQUnW2CC9IDXlcnI74W2BONjtRSRmc01N3uJl/7pcvX9iWTUWu2PYQbQZUBu8HzVFt7GmQ9qw9JQ==", "dev": true, "requires": { "chalk": "^2.0.1", - "cookie": "^0.3.1", - "debug": "^3.0.0", - "exists-sync": "0.0.4", - "najax": "^1.0.2", - "rsvp": "^4.7.0", - "simple-dom": "^1.0.0", + "cookie": "^0.4.0", + "debug": "^4.1.0", + "najax": "^1.0.3", + "resolve": "^1.8.1", + "rsvp": "^4.8.0", + "simple-dom": "^1.4.0", "source-map-support": "^0.5.0" }, "dependencies": { - "cookie": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", - "dev": true - }, "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { "ms": "^2.1.1" @@ -13090,9 +13037,9 @@ "dev": true }, "source-map-support": { - "version": "0.5.16", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz", - "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==", + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -13102,13 +13049,13 @@ } }, "fastboot-express-middleware": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fastboot-express-middleware/-/fastboot-express-middleware-1.2.0.tgz", - "integrity": "sha1-PzL7IdjQGtfAx9h2snhgFmXqF/o=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fastboot-express-middleware/-/fastboot-express-middleware-2.0.0.tgz", + "integrity": "sha512-sJHZrHpo/8jh56t+DTzaDcg6cnHbmXlTSAdfhRZbBa8XDY3TfN+TjHsHd4Z7vouLFU+ISuaZkzKfwGwipW5xwQ==", "dev": true, "requires": { "chalk": "^2.0.1", - "fastboot": "^1.2.0", + "fastboot": "^2.0.1", "request": "^2.81.0" } }, @@ -14428,6 +14375,16 @@ } } }, + "good-listener": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", + "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=", + "dev": true, + "optional": true, + "requires": { + "delegate": "^3.1.2" + } + }, "got": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz", @@ -17248,6 +17205,15 @@ "integrity": "sha512-Hn0UuWqTRd94HiCJoiCNGZTnSyXJdIF3t4/4I293hezIzyH4pQ3ai4TlH/SmRCiMvR5aNMxSYWshjQWWW6J8MQ==", "dev": true }, + "prismjs": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.20.0.tgz", + "integrity": "sha512-AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ==", + "dev": true, + "requires": { + "clipboard": "^2.0.0" + } + }, "private": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", @@ -18222,6 +18188,13 @@ "ajv-keywords": "^3.1.0" } }, + "select": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", + "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=", + "dev": true, + "optional": true + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -19414,6 +19387,13 @@ "setimmediate": "^1.0.4" } }, + "tiny-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", + "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==", + "dev": true, + "optional": true + }, "tiny-lr": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz", diff --git a/package.json b/package.json index 00d1ace04..04d429014 100644 --- a/package.json +++ b/package.json @@ -29,12 +29,11 @@ "ember-cli-deploy-build": "^1.1.1", "ember-cli-deploy-git": "^1.3.4", "ember-cli-eslint": "^5.1.0", - "ember-cli-fastboot": "~1.1.0", + "ember-cli-fastboot": "^2.2.2", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", "ember-cli-template-lint": "^1.0.0-beta.3", "ember-cli-uglify": "^3.0.0", - "ember-code-snippet": "^2.3.1", "ember-cp-validations": "^4.0.0-beta.10", "ember-data": "^3.14.0", "ember-deferred-content": "~1.0.0", @@ -43,6 +42,7 @@ "ember-href-to": "^3.1.0", "ember-load-initializers": "^2.1.1", "ember-maybe-import-regenerator": "^0.1.6", + "ember-prism": "^0.6.1", "ember-qunit": "^4.6.0", "ember-resolver": "^7.0.0", "ember-source": "~3.16.0", @@ -70,6 +70,7 @@ "ember-cli-htmlbars": "^4.2.2", "ember-cli-polyfill-importer": "^0.0.4", "ember-cli-sass": "^10.0.1", + "ember-code-snippet": "^3.0.0", "ember-composability-tools": "^0.0.12", "ember-css-transitions": "^0.1.16", "ember-decorators": "^6.1.1", diff --git a/tests/dummy/app/components/custom-button.js b/tests/dummy/app/components/custom-button.js deleted file mode 100644 index f3c45bfdc..000000000 --- a/tests/dummy/app/components/custom-button.js +++ /dev/null @@ -1,12 +0,0 @@ -// BEGIN-SNIPPET buttons.component -// app/components/custom-button.js -import Component from '@ember/component'; - -export default Component.extend({ - actions: { - targetButton() { - alert('You pressed a target button. -from component'); - } - } -}); -// END-SNIPPET diff --git a/tests/dummy/app/components/paper-api.hbs b/tests/dummy/app/components/paper-api.hbs index 83356805d..266714b78 100644 --- a/tests/dummy/app/components/paper-api.hbs +++ b/tests/dummy/app/components/paper-api.hbs @@ -1,40 +1,38 @@ {{#if title}} -

{{title}}

+ {{title}} {{/if}} {{yield}} -
- {{! template-lint-disable table-groups }} - - {{#if header}} - - - {{#each header as |heading|}} - - {{/each}} - - - {{/if}} - {{#each categories as |category|}} - - {{#each category as |row|}} - {{#if (is-subheading row)}} - - - - {{else}} - - {{#each row as |cell index|}} - {{#if index}} - - {{else}} - - {{/if}} - {{/each}} - - {{/if}} +{{! template-lint-disable table-groups }} +
{{heading}}
{{row}}
{{cell}}{{cell}}
+ {{#if header}} + + + {{#each header as |heading|}} + {{/each}} - - {{/each}} -
{{heading}}
-
+ + + {{/if}} + {{#each categories as |category|}} + + {{#each category as |row|}} + {{#if (is-subheading row)}} + + {{row}} + + {{else}} + + {{#each row as |cell index|}} + {{#if index}} + {{cell}} + {{else}} + {{cell}} + {{/if}} + {{/each}} + + {{/if}} + {{/each}} + + {{/each}} + diff --git a/tests/dummy/app/controllers/application.js b/tests/dummy/app/controllers/application.js index 356c54f29..e9314feb1 100644 --- a/tests/dummy/app/controllers/application.js +++ b/tests/dummy/app/controllers/application.js @@ -4,6 +4,7 @@ import { computed } from '@ember/object'; export default Controller.extend({ actions: { + noop() {}, toggleExpandedItem(value, ev) { if (this.get('expandedItem') === value) { value = null; diff --git a/tests/dummy/app/controllers/components/button.js b/tests/dummy/app/controllers/components/button.js index 33b1af65d..7e981d294 100644 --- a/tests/dummy/app/controllers/components/button.js +++ b/tests/dummy/app/controllers/components/button.js @@ -1,17 +1,9 @@ import Controller from '@ember/controller'; +import { action } from '@ember/object'; -export default Controller.extend({ - actions: { - raisedButton() { - alert('You pressed a raised button.'); - }, - - flatButton() { - alert('You pressed a flat button.'); - }, - - targetButton() { - alert('You pressed a target button.'); - } +export default class extends Controller { + @action + click() { + alert('You pressed a target button.'); } -}); +} diff --git a/tests/dummy/app/helpers/is-active.js b/tests/dummy/app/helpers/is-active.js index 493eed7b5..dc7df47cb 100644 --- a/tests/dummy/app/helpers/is-active.js +++ b/tests/dummy/app/helpers/is-active.js @@ -5,19 +5,19 @@ export default class extends Helper { @service router; compute([routeName]) { - if(this.router.currentRouteName.indexOf('.') > -1) { + if (this.router.currentRouteName.indexOf('.') > -1) { const routeParts = this.router.currentRouteName.split('.'); let isParentRoute = false; let fullRoute = ''; routeParts.forEach((part, i) => { fullRoute += i === 0 ? part : '.' + part; - if(fullRoute === routeName) { + if (fullRoute === routeName) { isParentRoute = true; } }); - if(isParentRoute) return true; + if (isParentRoute) return true; } return this.router.currentRouteName === routeName; diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index 59ee41be4..27de4df2d 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/app/router.js @@ -7,10 +7,6 @@ export default class Router extends EmberRouter { } Router.map(function() { - this.route('typography'); - this.route('theme'); - this.route('addons'); - this.route('components', function() { this.route('autocomplete'); this.route('button'); @@ -38,11 +34,7 @@ Router.map(function() { this.route('toolbar'); this.route('tooltip'); }); - - this.route('layout', function() { - this.route('introduction'); - this.route('layout-containers'); - this.route('layout-children'); - this.route('child-alignment'); - }); + this.route('layout'); + this.route('theme'); + this.route('addons'); }); diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss index 1eff848e1..4a82f290e 100644 --- a/tests/dummy/app/styles/app.scss +++ b/tests/dummy/app/styles/app.scss @@ -1,39 +1,54 @@ -$primary: 'deep-orange'; -$warn: 'amber'; -$accent: 'pink'; - @import 'ember-paper'; @import 'demo'; -/** - * Needed styles to set correct widths. - */ +.application-navbar a { + border: none; + line-height: 64px; + font-size: 18px; + padding: 0 16px; -body { - max-width: 100%; - max-height: 100%; + &.active::after { + bottom: 1px; + content: " "; + display: block; + position: relative; + border-bottom: 3px solid paper-color('cyan', '200'); + } } -body.ember-application { - flex-direction: row; - flex: 1; - display: flex; +@media (max-width: 959px) and (min-width: 0) { + .application-navbar a { + line-height: 50px; + + &.active::after { + bottom: -1px; + } + } } -body > div.ember-view { - flex-direction: row; - flex: 1; - display: flex; +pre.code-block { + background-color: rgba(0,0,0,.06) !important; + margin-left: -15px; + margin-right: -15px; } -md-toolbar.md-warn { - a, button { - &.md-button.md-default-theme:not(.md-primary):not(.md-accent) { - color: $dark-contrast-color; - } - } +.content-section { + padding: 64px; } -.inner-sidenav { - position: relative; +.hero { + height: 300px; + padding: 64px; + align-items: center; + align-content: center; + display: flex; + + &.hero--indigo { + background-color: paper-color('indigo', '200'); + color: #ffffff; + } + &.hero--orange { + background-color: paper-color('orange', '200'); + color: #ffffff; + } } diff --git a/tests/dummy/app/styles/demo.scss b/tests/dummy/app/styles/demo.scss index cfce1521d..5ead1bbe8 100644 --- a/tests/dummy/app/styles/demo.scss +++ b/tests/dummy/app/styles/demo.scss @@ -1,9 +1,6 @@ /*************** * Styles specific for the ember-paper demo site ***************/ -@import 'highlight-overrides'; -@import 'modules/all'; - html { font-size: 62.5%; line-height: 1.4; @@ -14,17 +11,45 @@ body { } table { - margin-bottom: 8px; - max-width: 100%; - width: 100%; - border-spacing: 0; - border-radius: 2px; - overflow: hidden; + position: relative; + border: 1px solid rgba(0,0,0,.12); + border-collapse: collapse; + white-space: nowrap; + font-size: 13px; + background-color: #fff; + box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12) +} + +thead { + padding-bottom: 3px; +} + +th { + position: relative; + vertical-align: bottom; + text-overflow: ellipsis; + font-weight: 700; + line-height: 24px; + letter-spacing: 0; + height: 48px; + font-size: 12px; + color: rgba(0,0,0,.54); + padding-bottom: 8px; + box-sizing: border-box; } -.table-wrapper { - flex: 1; - overflow: auto; +td { + vertical-align: middle; + position: relative; + height: 48px; + border-top: 1px solid rgba(0,0,0,.12); + border-bottom: 1px solid rgba(0,0,0,.12); + padding: 12px 18px; + box-sizing: border-box; +} + +.paper-api--title { + margin: 5px; } #main { @@ -46,112 +71,6 @@ table { align-self: flex-start; } -/*************** - * TYPE DEFAULTS - ***************/ -a { - color: #106CC8; - text-decoration: none; - font-weight: 400; - border-bottom: 1px solid rgba(64, 84, 178, 0.25); - -webkit-transition: border-bottom 0.35s; - -moz-transition: border-bottom 0.35s; - -ms-transition: border-bottom 0.35s; - -o-transition: border-bottom 0.35s; - transition: border-bottom 0.35s; -} - -a:hover, a:focus { - border-bottom: 1px solid #4054B2; -} - -a.md-button { - border-bottom: none; -} - -h1, h2, h3, h4, h5, h6 { - margin-bottom: 1rem; - margin-top: 1rem; -} - -h1 { - font-size: 3.400rem; - font-weight: 400; - line-height: 4rem; -} - -h2 { - font-size: 2.400rem; - font-weight: 400; - line-height: 3.2rem; -} - -h3 { - font-size: 2.000rem; - font-weight: 500; - letter-spacing: 0.005em; -} - -h4 { - font-size: 1.600rem; - font-weight: 400; - letter-spacing: 0.010em; - line-height: 2.4rem; -} - -p { - font-size: 1.6rem; - font-weight: 400; - letter-spacing: 0.010em; - line-height: 1.6em; - margin: 0.8em 0 1.6em; -} - -strong { - font-weight: 500; -} - -td, th { - padding: 12px 16px; - text-align: left; -} - -td { - vertical-align: top; -} - -td.description *:first-child { - margin-top: 0; -} - -td.description *:last-child { - margin-bottom: 0; -} - -tr:nth-child(odd) td { - background-color: lighten(paper-color($primary, '50'), 2); -} - -tr:nth-child(even) td { - background-color: lighten(paper-color($primary, '50'), 4); -} - -th { - background-color: paper-color($primary, '400'); - color: white; -} - -tr.subheading td { - background-color: paper-color($primary, '100'); -} - -blockquote { - border-left: 3px solid rgba(0, 0, 0, 0.12); - font-style: italic; - margin-left: 0; - padding-left: 16px; -} - /* ul { margin: 0; @@ -1386,53 +1305,4 @@ ul li:first-child { .bg-78909c { background: #78909c; } - -} - -/* Inputs demo */ -md-input-container .hint { - position: absolute; - left: 2px; - right: auto; - bottom: 7px; - font-size: 12px; - line-height: 14px; - transition: all 0.3s cubic-bezier(0.55, 0, 0.55, 0.2); - color: grey; -} - -/* CHIPS demo */ -.chipsdemoContactChips .ember-power-select-trigger { - min-width: 400px; -} - -/* Slider demo */ -.slider-demo { - .slider-container > :first-child { - margin-right: 16px; - } - - .slider-container > md-input-container { - max-width: 56px; - margin-left: 16px; - } -} - -/* tabs demo */ -.tabs-demo .md-padding h1:first-child { - margin-top: 0; -} - -md-tabs.md-primary { - border-radius: 0px; -} - -/* toast demo */ -md-toast { - &.md-accent > .md-toast-content { - background: paper-color($accent, '400'); - } - &.md-warn > .md-toast-content { - background: paper-color($warn, '400'); - } } diff --git a/tests/dummy/app/styles/highlight-overrides.scss b/tests/dummy/app/styles/highlight-overrides.scss deleted file mode 100644 index 556bd979d..000000000 --- a/tests/dummy/app/styles/highlight-overrides.scss +++ /dev/null @@ -1,13 +0,0 @@ -code, pre.hljs { - font-size: 16px; - background-color: paper-color('grey', '50'); - text-shadow: 0 1px rgba(#fff, .9); -} - -code { - padding: 3px 6px; -} - -pre.hljs { - padding: 12px; -} diff --git a/tests/dummy/app/styles/modules/_all.scss b/tests/dummy/app/styles/modules/_all.scss deleted file mode 100644 index 044dd1a43..000000000 --- a/tests/dummy/app/styles/modules/_all.scss +++ /dev/null @@ -1 +0,0 @@ -@import "codeinline"; diff --git a/tests/dummy/app/styles/modules/codeinline.scss b/tests/dummy/app/styles/modules/codeinline.scss deleted file mode 100644 index aa1f2108f..000000000 --- a/tests/dummy/app/styles/modules/codeinline.scss +++ /dev/null @@ -1,3 +0,0 @@ -.codeinline { - display: inline-block; -} diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs index 0a9937c84..52e9baac1 100644 --- a/tests/dummy/app/templates/application.hbs +++ b/tests/dummy/app/templates/application.hbs @@ -2,18 +2,12 @@
- - - {{paper-icon "menu"}} - - -
- Introduction - Components - Layout - Typography - Theme - Addons +
+ Introduction + Components + Layout + Theme + Addons
diff --git a/tests/dummy/app/templates/components/button.hbs b/tests/dummy/app/templates/components/button.hbs index 3dd79a068..8084e7ac7 100644 --- a/tests/dummy/app/templates/components/button.hbs +++ b/tests/dummy/app/templates/components/button.hbs @@ -1,69 +1,92 @@ - - {{! BEGIN-SNIPPET buttons.example }} -
- Button with action + +
+ {{! BEGIN-SNIPPET button.basic-usage }} + Button with action Primary (noink) disabled warn accent href link + {{! END-SNIPPET }}
-

- Button with action + + {{#let (get-code-snippet "button.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

+ {{! BEGIN-SNIPPET button.raised }} + Button with action Primary disabled warn accent -

- -

- Button with target - Button with bubble - Button no bubble -

- + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "button.raised.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +
+ {{! BEGIN-SNIPPET button.target }} + Button with target + Button with bubble + Button no bubble + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "button.target.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} -

+

+ {{! BEGIN-SNIPPET button.fab }} Fab Fab Mini Mini {{paper-icon "accessibility"}} -

- -

- -

- {{! END-SNIPPET }} -

Template

- + {{! END-SNIPPET }} +
-

Controller

- + {{#let (get-code-snippet "button.fab.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} - {{paper-api - (p-section - (p-row "onClick" "closure" "Action sent when the button is clicked.") - (p-row "type" "string" "Sets the html5 `type` attribute. Defaults to `\"button\"`, except for `` link buttons.") - (p-row "bubbles" "boolean" "Determines whether the Ember click event handler bubbles. Default is `undefined`, which bubbles.") - (p-row "disabled" "boolean" "Whether the button is displayed as disabled and does not accept clicks.") - ) - (p-section - "Link buttons" - (p-row "href" "string" "Displays the button as an `` link to the specified destination URL.") - (p-row "target" "string" "Sets the `` link target attribute, such as `\"_blank\"`.") - ) - (p-section - "Appearance" - (p-row "fab" "boolean" "Display as a Floating Action Button.") - (p-row "iconButton" "boolean" "Set when the contents contains an icon and adjusts CSS appropriately.") - (p-row "label" "string" "Set the content of the button when used as a blockless component.") - (p-row "mini" "boolean" "Display as a mini-sized button. Implies `fab`, unless `fab` is explicity set falsy.") - (p-row "noInk" "boolean" "Suppresses the ripple effect when clicked.") - (p-row "primary" "boolean" "Display as the primary button, more prominent that other buttons.") - (p-row "raised" "boolean" "Display button with a 3-D effect.") - ) - "color" - }} +
+ {{paper-api + (p-section + (p-row "onClick" "closure" "Action sent when the button is clicked.") + (p-row "type" "string" "Sets the html5 `type` attribute. Defaults to `\"button\"`, except for `` link buttons.") + (p-row "bubbles" "boolean" "Determines whether the Ember click event handler bubbles. Default is `undefined`, which bubbles.") + (p-row "disabled" "boolean" "Whether the button is displayed as disabled and does not accept clicks.") + ) + (p-section + "Link buttons" + (p-row "href" "string" "Displays the button as an `` link to the specified destination URL.") + (p-row "target" "string" "Sets the `` link target attribute, such as `\"_blank\"`.") + ) + (p-section + "Appearance" + (p-row "fab" "boolean" "Display as a Floating Action Button.") + (p-row "iconButton" "boolean" "Set when the contents contains an icon and adjusts CSS appropriately.") + (p-row "label" "string" "Set the content of the button when used as a blockless component.") + (p-row "mini" "boolean" "Display as a mini-sized button. Implies `fab`, unless `fab` is explicity set falsy.") + (p-row "noInk" "boolean" "Suppresses the ripple effect when clicked.") + (p-row "primary" "boolean" "Display as the primary button, more prominent that other buttons.") + (p-row "raised" "boolean" "Display button with a 3-D effect.") + ) + "color" + }} +
- + diff --git a/tests/dummy/app/templates/index.hbs b/tests/dummy/app/templates/index.hbs index 95b98a904..f26b29c7a 100644 --- a/tests/dummy/app/templates/index.hbs +++ b/tests/dummy/app/templates/index.hbs @@ -1,84 +1,41 @@ - -
- +
+

Welcome to Ember Paper.

-

This project aims to bring Google's new Material Design to Ember. The goal is to encapsulate everything possible in Ember components. This project is packaged as an Ember-cli addon.

+

+ This project aims to bring Google's new Material Design to Ember. + The goal is to encapsulate everything possible in Ember components. + This project is packaged as an Ember-cli addon. +

+
+
+
+

Installation

To install run:

- + 
+      $ ember install ember-paper
+

This should also automatically create an scss file under app/styles/app.scss with @import 'ember-paper'; and install ember-cli-sass.

Sass is an important part of Ember-paper. Using sass you can override default variables and easily change the default behavior of Ember-paper.

-

All the components and styles are ready to use in your application templates.

-

Navigate through the docs to understand how to use each component.

- -

Content Security Policy

- -

- This is no longer used in newer ember-cli apps. However, here are the instructions if you need them. - Ember Paper uses fonts from Google Fonts, so the URL to them has to be white listed. - You can set this by adding to the Content Security Policy defined in config/environment.js like so: -

- - - -

- You can find out more information on the CSP addon page here. - We also need to allow data: in img-src because of a current hack in paper-button styles. -

- -

Options

- -

Ember-paper supports the following options, specified in your ember-cli-build.js file:

- -
-
ENV['autoprefixer'] (defaults to { browsers: ['last 2 versions'] })
-
- By default ember-paper will run autoprefixer on your styles. - This option allows you to override the default autoprefixer target. -
-
ENV['ember-paper'].insertFontLinks (defaults to true)
-
- Consuming apps can specify this option to prevent the insertion of google fonts links - inside the head tag. This is especially useful if you want to include your own fonts. -
-
ENV['ember-paper'].whitelist (defaults to [])
-
- Consuming apps can optionally specify this array to only include these components into the build. - You should use either whitelist or blacklist, not both. - - The dependencies of the specified components will be included as well. - This is the recommended approach, blacklist is harder to get right. -
-
ENV['ember-paper'].blacklist (defaults to [])
-
- Consuming apps can optionally specify this array to exclude these components from the build. - - This only bans from the build the specified components, not its dependencies. - whitelist is easier to maintain. -
-
- -

Documentation for Previous Versions

-

Documentation for previous versions can be found here:

- + + Explore the components + +
+
+
+

Contribution

This is a very ambitious project. Google's design specs are extensive, and non-trivial to implement. If you can port or fix a component or two, please drop a pull request or issue on GitHub or join us on Discord. See README.md for more resources.

With everyone's help, we can bring this amazing design spec to Ember in a modular and elegant way. The Ember way.

- Help us on Github! -

-

- {{!-- Place this tag where you want the button to render. --}} - Fork + Help us on Github!

- +
diff --git a/tests/dummy/app/templates/layout.hbs b/tests/dummy/app/templates/layout.hbs index 1923d9ba9..5979d2d56 100644 --- a/tests/dummy/app/templates/layout.hbs +++ b/tests/dummy/app/templates/layout.hbs @@ -1,4 +1,4 @@ - +

Overview

diff --git a/tests/dummy/app/templates/typography.hbs b/tests/dummy/app/templates/typography.hbs deleted file mode 100644 index fb54b573c..000000000 --- a/tests/dummy/app/templates/typography.hbs +++ /dev/null @@ -1,115 +0,0 @@ - -

-

Headings

-
-

<h1>

-

<h2>

-

<h3>

-

<h4>

-
<h5>
-
<h6>
-
- -

Formatting

-
-

<u>Underlined</u>

- -

<b>Bold</b>

- -

<strong>Strong</strong>

- -

<italic>Italic</italic>

- -

<em>Em</em>

- -

<s>Strikethrough</s>

- -

<small>Small</small>

- -

<mark>Mark</mark>

-
- -

Subtitles

-
-

<h1> Subtitle

-

<h2> Subtitle

-

<h3> Subtitle

-

<h4> Subtitle

-
<h5> Subtitle
-
<h6> Subtitle
-
- -

Description

-
-
-
Description lists
-
A description list is perfect for defining terms.
-
Euismod
-
Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
-
Donec id elit non mi porta gravida at eget metus.
-
Malesuada porta
-
Etiam porta sem malesuada magna mollis euismod.
-
-
- -

Quotes

-
-
<blockquote>
-
- -

Addresses

- -
- Googleplex
- 1600 Amphitheatre Pkwy
- Mountain View, CA 94043
- P: (650) 253-0000 -
- -

Code

- -

Multi-line code blocks

-

- Use <pre> for multi-line code blocks. - -

- -

Inline code blocks

-

Code blocks like <main> could be displayed inline.

- -

Tables

- -

Basic table

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameUsername
1LarryPage+LarryPage
2SergeyBrin+SergeyBrin
3EricSchmidt+EricSchmidt
-
- diff --git a/tests/dummy/snippets/install.sh b/tests/dummy/snippets/install.sh deleted file mode 100644 index 41b81a5a9..000000000 --- a/tests/dummy/snippets/install.sh +++ /dev/null @@ -1 +0,0 @@ -$ ember install ember-paper diff --git a/tests/dummy/snippets/typography.code-block.hbs b/tests/dummy/snippets/typography.code-block.hbs deleted file mode 100644 index 183c69df2..000000000 --- a/tests/dummy/snippets/typography.code-block.hbs +++ /dev/null @@ -1,2 +0,0 @@ -

This is the first line of code

-

This is the second line of code

\ No newline at end of file From 795a4c1cb790812579e2c9e3bc1c66c058d22338 Mon Sep 17 00:00:00 2001 From: Gabriel Csapo Date: Mon, 8 Jun 2020 00:46:52 -0700 Subject: [PATCH 3/9] updates multiple examples --- ember-cli-build.js | 10 +- package-lock.json | 173 ------ package.json | 1 - tests/dummy/app/components/doc-content.hbs | 5 - tests/dummy/app/components/doc-content.js | 5 - tests/dummy/app/controllers/components.js | 16 +- .../controllers/components/autocomplete.js | 69 +-- .../app/controllers/components/checkbox.js | 21 - .../dummy/app/controllers/components/chips.js | 211 ++++---- .../app/controllers/components/dialog.js | 98 ++-- .../app/controllers/components/divider.js | 33 +- .../dummy/app/controllers/components/list.js | 82 +-- .../app/controllers/components/loading.js | 66 +++ .../dummy/app/controllers/components/menu.js | 2 +- .../components/progress-circular.js | 50 -- .../controllers/components/progress-linear.js | 47 -- .../dummy/app/controllers/components/radio.js | 8 - .../app/controllers/components/switch.js | 16 - .../dummy/app/controllers/components/toast.js | 128 +++-- .../app/controllers/components/toggles.js | 36 ++ tests/dummy/app/helpers/eq.js | 7 + tests/dummy/app/styles/demo.scss | 20 +- tests/dummy/app/templates/application.hbs | 2 - .../app/templates/components/autocomplete.hbs | 158 +++--- .../dummy/app/templates/components/button.hbs | 4 +- tests/dummy/app/templates/components/card.hbs | 386 +++++--------- .../app/templates/components/checkbox.hbs | 39 -- .../dummy/app/templates/components/chips.hbs | 176 +++--- .../dummy/app/templates/components/dialog.hbs | 302 +++++------ .../app/templates/components/divider.hbs | 112 ++-- .../app/templates/components/grid-list.hbs | 162 +++--- tests/dummy/app/templates/components/icon.hbs | 49 +- tests/dummy/app/templates/components/list.hbs | 485 ++++++++++------- .../app/templates/components/loading.hbs | 143 ++++- tests/dummy/app/templates/components/menu.hbs | 503 +++++++++--------- .../components/progress-circular.hbs | 66 --- .../templates/components/progress-linear.hbs | 31 -- .../dummy/app/templates/components/radio.hbs | 69 --- .../dummy/app/templates/components/toast.hbs | 365 ++++++------- .../app/templates/components/toggles.hbs | 122 ++++- tests/dummy/app/templates/theme.hbs | 10 +- 41 files changed, 2035 insertions(+), 2253 deletions(-) delete mode 100644 tests/dummy/app/components/doc-content.hbs delete mode 100644 tests/dummy/app/components/doc-content.js delete mode 100644 tests/dummy/app/controllers/components/checkbox.js create mode 100644 tests/dummy/app/controllers/components/loading.js delete mode 100644 tests/dummy/app/controllers/components/progress-circular.js delete mode 100644 tests/dummy/app/controllers/components/progress-linear.js delete mode 100644 tests/dummy/app/controllers/components/radio.js delete mode 100644 tests/dummy/app/controllers/components/switch.js create mode 100644 tests/dummy/app/controllers/components/toggles.js create mode 100644 tests/dummy/app/helpers/eq.js delete mode 100644 tests/dummy/app/templates/components/checkbox.hbs delete mode 100644 tests/dummy/app/templates/components/progress-circular.hbs delete mode 100644 tests/dummy/app/templates/components/progress-linear.hbs delete mode 100644 tests/dummy/app/templates/components/radio.hbs diff --git a/ember-cli-build.js b/ember-cli-build.js index 1a7d6bdb0..678c7403b 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -1,18 +1,12 @@ 'use strict'; + const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); module.exports = function(defaults) { - let app = new EmberAddon(defaults, { + const app = new EmberAddon(defaults, { snippetPaths: ['tests/dummy/snippets'], snippetSearchPaths: ['tests/dummy/app'] }); - /* - This build file specifies the options for the dummy test app of this - addon, located in `/tests/dummy` - This build file does *not* influence how the addon or the app using it - behave. You most likely want to be modifying `./index.js` or app's build file - */ - return app.toTree(); }; diff --git a/package-lock.json b/package-lock.json index 667e303f3..1bfe0ebf9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2069,45 +2069,6 @@ "fastq": "^1.6.0" } }, - "@simple-dom/document": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@simple-dom/document/-/document-1.4.0.tgz", - "integrity": "sha512-/RUeVH4kuD3rzo5/91+h4Z1meLSLP66eXqpVAw/4aZmYozkeqUkMprq0znL4psX/adEed5cBgiNJcfMz/eKZLg==", - "dev": true, - "requires": { - "@simple-dom/interface": "^1.4.0" - } - }, - "@simple-dom/interface": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@simple-dom/interface/-/interface-1.4.0.tgz", - "integrity": "sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==", - "dev": true - }, - "@simple-dom/parser": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@simple-dom/parser/-/parser-1.4.0.tgz", - "integrity": "sha512-TNjDkOehueRIKr1df416qk9ELj+qWuVVJNIT25y1aZg3pQvxv4UPGrgaDFte7dsWBTbF3V8NYPNQ5FDUZQ8Wlg==", - "dev": true, - "requires": { - "@simple-dom/interface": "^1.4.0" - } - }, - "@simple-dom/serializer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@simple-dom/serializer/-/serializer-1.4.0.tgz", - "integrity": "sha512-mI1yRahsVs8atXLiQksineDsFEFqeG7RHwnnBTDOK6inbzl4tZQgjR+Z7edjgIJq5j5RhZvwPI6EuCji9B3eQw==", - "dev": true, - "requires": { - "@simple-dom/interface": "^1.4.0" - } - }, - "@simple-dom/void-map": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@simple-dom/void-map/-/void-map-1.4.0.tgz", - "integrity": "sha512-VDhLEyVCbuhOBBgHol9ShzIv9O8UCzdXeH4FoXu2DOcu/nnvTjLTck+BgXsCLv5ynDiUdoqsREEVFnoyPpFKVw==", - "dev": true - }, "@sindresorhus/is": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", @@ -8740,44 +8701,6 @@ } } }, - "ember-cli-fastboot": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/ember-cli-fastboot/-/ember-cli-fastboot-2.2.2.tgz", - "integrity": "sha512-j3pCxBRZdZIRVtfzbQ9TqkR0LLmnxa4Isjns9HD/ZnO7u8uzWfYmncqqJbgIwcWHHG8v6x8opNeYnx99WQhy9g==", - "dev": true, - "requires": { - "broccoli-concat": "^3.7.1", - "broccoli-file-creator": "^2.1.1", - "broccoli-funnel": "^2.0.1", - "broccoli-merge-trees": "^3.0.1", - "broccoli-plugin": "^1.3.1", - "chalk": "^2.4.1", - "ember-cli-babel": "^7.1.0", - "ember-cli-lodash-subset": "2.0.1", - "ember-cli-preprocess-registry": "^3.1.2", - "ember-cli-version-checker": "^3.0.0", - "fastboot": "^2.0.0", - "fastboot-express-middleware": "^2.0.0", - "fastboot-transform": "^0.1.3", - "fs-extra": "^7.0.0", - "json-stable-stringify": "^1.0.1", - "md5-hex": "^2.0.0", - "silent-error": "^1.1.0" - }, - "dependencies": { - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - } - } - }, "ember-cli-get-component-path-option": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz", @@ -12993,72 +12916,6 @@ } } }, - "fastboot": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/fastboot/-/fastboot-2.0.3.tgz", - "integrity": "sha512-NNH/o+XhITAQUnW2CC9IDXlcnI74W2BONjtRSRmc01N3uJl/7pcvX9iWTUWu2PYQbQZUBu8HzVFt7GmQ9qw9JQ==", - "dev": true, - "requires": { - "chalk": "^2.0.1", - "cookie": "^0.4.0", - "debug": "^4.1.0", - "najax": "^1.0.3", - "resolve": "^1.8.1", - "rsvp": "^4.8.0", - "simple-dom": "^1.4.0", - "source-map-support": "^0.5.0" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "rsvp": { - "version": "4.8.5", - "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", - "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - } - } - }, - "fastboot-express-middleware": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fastboot-express-middleware/-/fastboot-express-middleware-2.0.0.tgz", - "integrity": "sha512-sJHZrHpo/8jh56t+DTzaDcg6cnHbmXlTSAdfhRZbBa8XDY3TfN+TjHsHd4Z7vouLFU+ISuaZkzKfwGwipW5xwQ==", - "dev": true, - "requires": { - "chalk": "^2.0.1", - "fastboot": "^2.0.1", - "request": "^2.81.0" - } - }, "fastboot-transform": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/fastboot-transform/-/fastboot-transform-0.1.3.tgz", @@ -15239,12 +15096,6 @@ "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==", "dev": true }, - "jquery-deferred": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/jquery-deferred/-/jquery-deferred-0.3.1.tgz", - "integrity": "sha1-WW7KHKr/VPYbEQlisjyv6nTDU1U=", - "dev": true - }, "js-levenshtein": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", @@ -16256,17 +16107,6 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - "najax": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/najax/-/najax-1.0.4.tgz", - "integrity": "sha512-wsSacA+RkgY1wxRxXCT3tdqzmamEv9PLeoV/ub9SlLf2RngbPMSqc3A7H35XJDfURC0twMmZsnPdsYPkuuFSVg==", - "dev": true, - "requires": { - "jquery-deferred": "^0.3.0", - "lodash.defaultsdeep": "^4.6.0", - "qs": "^6.2.0" - } - }, "nan": { "version": "2.14.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", @@ -18347,19 +18187,6 @@ "debug": "^2.2.0" } }, - "simple-dom": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/simple-dom/-/simple-dom-1.4.0.tgz", - "integrity": "sha512-TnBPkmOyjdaOqyBMb4ick+n8c0Xv9Iwg1PykFV7hz9Se3UCiacTbRb+25cPmvozFNJLBUNvUzX/KsPfXF14ivA==", - "dev": true, - "requires": { - "@simple-dom/document": "^1.4.0", - "@simple-dom/interface": "^1.4.0", - "@simple-dom/parser": "^1.4.0", - "@simple-dom/serializer": "^1.4.0", - "@simple-dom/void-map": "^1.4.0" - } - }, "simple-html-tokenizer": { "version": "0.5.8", "resolved": "https://registry.npmjs.org/simple-html-tokenizer/-/simple-html-tokenizer-0.5.8.tgz", diff --git a/package.json b/package.json index 04d429014..fa4422e0f 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "ember-cli-deploy-build": "^1.1.1", "ember-cli-deploy-git": "^1.3.4", "ember-cli-eslint": "^5.1.0", - "ember-cli-fastboot": "^2.2.2", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", "ember-cli-template-lint": "^1.0.0-beta.3", diff --git a/tests/dummy/app/components/doc-content.hbs b/tests/dummy/app/components/doc-content.hbs deleted file mode 100644 index b069c8241..000000000 --- a/tests/dummy/app/components/doc-content.hbs +++ /dev/null @@ -1,5 +0,0 @@ - -
- {{yield}} -
- diff --git a/tests/dummy/app/components/doc-content.js b/tests/dummy/app/components/doc-content.js deleted file mode 100644 index d4d9beed2..000000000 --- a/tests/dummy/app/components/doc-content.js +++ /dev/null @@ -1,5 +0,0 @@ -import Component from '@ember/component'; - -export default Component.extend({ - tagName: '' // if wrapped in
, the scrollbar doesn't show -}); diff --git a/tests/dummy/app/controllers/components.js b/tests/dummy/app/controllers/components.js index a8f3bd020..737d86f72 100644 --- a/tests/dummy/app/controllers/components.js +++ b/tests/dummy/app/controllers/components.js @@ -58,20 +58,15 @@ export default class extends Controller { route: 'components.list', icon: 'reorder' }, - { - text: 'Menu', - route: 'components.menu', - icon: 'menu' - }, { text: 'Loading', route: 'components.loading', icon: 'hourglass_top' }, { - text: 'Toggles', - route: 'components.toggles', - icon: 'toggle_on' + text: 'Menu', + route: 'components.menu', + icon: 'menu' }, { text: 'Select', @@ -108,6 +103,11 @@ export default class extends Controller { route: 'components.toast', icon: 'notifications_active' }, + { + text: 'Toggles', + route: 'components.toggles', + icon: 'toggle_on' + }, { text: 'Toolbar', route: 'components.toolbar', diff --git a/tests/dummy/app/controllers/components/autocomplete.js b/tests/dummy/app/controllers/components/autocomplete.js index 41d067241..9e8df7c06 100644 --- a/tests/dummy/app/controllers/components/autocomplete.js +++ b/tests/dummy/app/controllers/components/autocomplete.js @@ -1,67 +1,74 @@ import { run } from '@ember/runloop'; import RSVP from 'rsvp'; import Controller from '@ember/controller'; +import { tracked } from '@glimmer/tracking'; +import { action } from '@ember/object'; import { A } from '@ember/array'; // per MDN https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions const escapeRegExp = (input) => { - // $& means the whole matched string return input.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); }; -export default Controller.extend({ - myModel: Object.freeze({ name: 'United States', code: 'US' }), +export default class extends Controller { + myModel = Object.freeze({ name: 'United States', code: 'US' }); + + @tracked + searchText = ''; - searchText: '', + @tracked + enableDefaultHighlighted = false; highlightFirstMatch(api) { if (api && api.results && api.results.length) { return api.results[0]; } return null; - }, + } - actions: { - updateFilter(str) { - this.set('searchText', str); - }, - addCountry(name) { - this.get('items').addObject({ name, code: '' }); - }, + @action + updateFilter(str) { + this.searchText = str; + } - searchCountries(term) { - let XHR_TIMEOUT = Math.floor(Math.random() * 1000) + 100; + @action + addCountry(name) { + this.items.addObject({ name, code: '' }); + } - return new RSVP.Promise((resolve) => { - run.cancel(this.searchTimer); + @action + searchCountries(term) { + let XHR_TIMEOUT = Math.floor(Math.random() * 1000) + 100; - this.searchTimer = run.later(this, () => { - let nameRegExp = new RegExp(escapeRegExp(`${term}`), 'i', 'g'); - let countries = this.get('items'); - let results = countries.filter((c) => nameRegExp.exec(c.name)) || []; - resolve(results); - }, XHR_TIMEOUT); - }); - } - }, + return new RSVP.Promise((resolve) => { + run.cancel(this.searchTimer); + + this.searchTimer = run.later(this, () => { + let nameRegExp = new RegExp(escapeRegExp(`${term}`), 'i', 'g'); + let countries = this.get('items'); + let results = countries.filter((c) => nameRegExp.exec(c.name)) || []; + resolve(results); + }, XHR_TIMEOUT); + }); + } - arrayOfItems: A(['Ember1.0', 'Ember2.0', 'Paper', 'One', 'Two', 'Three', 'Four', 'Five', 'Six', 'Seven', 'Eight', 'Nine', 'Ten', 'Eleven', 'Twelve']), + arrayOfItems = A(['Ember1.0', 'Ember2.0', 'Paper', 'One', 'Two', 'Three', 'Four', 'Five', 'Six', 'Seven', 'Eight', 'Nine', 'Ten', 'Eleven', 'Twelve']); /* * Array of static Objects. * When having objects, use lookupKey="name" on the paper-autocomplete component so it knows to use "name" to search in. */ - shorterItems: A([ + shorterItems = A([ { name: 'Afghanistan', code: 'AF' }, { name: 'Åland Islands', code: 'AX' }, { name: 'Albania', code: 'AL' }, { name: 'Algeria', code: 'DZ' }, { name: 'American Samoa', code: 'AS' }, { name: 'AndorrA', code: 'AD' } - ]), + ]); - items: A([ + items = A([ { name: 'Afghanistan', code: 'AF' }, { name: 'Åland Islands', code: 'AX' }, { name: 'Albania', code: 'AL' }, @@ -305,6 +312,6 @@ export default Controller.extend({ { name: 'Yemen', code: 'YE' }, { name: 'Zambia', code: 'ZM' }, { name: 'Zimbabwe', code: 'ZW' } - ]) + ]); -}); +} diff --git a/tests/dummy/app/controllers/components/checkbox.js b/tests/dummy/app/controllers/components/checkbox.js deleted file mode 100644 index 73179ba98..000000000 --- a/tests/dummy/app/controllers/components/checkbox.js +++ /dev/null @@ -1,21 +0,0 @@ -import Controller from '@ember/controller'; -import { computed } from '@ember/object'; - -export default Controller.extend({ - value1: true, - value2: false, - value3: false, - value4: false, - value5: false, - value6: false, - - isIndeterminate: computed('value7', function() { - return this.get('value7') === undefined; - }), - - actions: { - toggleValue6() { - this.toggleProperty('value6'); - } - } -}); diff --git a/tests/dummy/app/controllers/components/chips.js b/tests/dummy/app/controllers/components/chips.js index 6060c81f2..2a15f1d7f 100644 --- a/tests/dummy/app/controllers/components/chips.js +++ b/tests/dummy/app/controllers/components/chips.js @@ -1,75 +1,60 @@ -import { filter } from '@ember/object/computed'; import Controller from '@ember/controller'; -import { computed } from '@ember/object'; +import { action } from '@ember/object'; import { A } from '@ember/array'; import faker from 'faker'; -export default Controller.extend({ - fruitNames: A(['Apple', 'Banana', 'Orange']), +function getContacts(amount) { + let contacts = []; - customFruitNames: A(['Apple', 'Banana', 'Orange']), + for (let i = 0; i < amount; i++) { + contacts.push({ + name: faker.name.findName(), + email: faker.internet.email(), + image: faker.internet.avatar() + }); + } - numOfContacts: 10, + return contacts; +} - contacts: computed('numOfContacts', function() { - let contacts = []; - let numOfContacts = this.get('numOfContacts'); +function getAltContacts(numOfContacts) { + let contacts = []; - for (let i = 0; i < numOfContacts; i++) { - contacts.push({ - name: faker.name.findName(), - email: faker.internet.email(), - image: faker.internet.avatar() - }); - } + for (let i = 0; i < numOfContacts; i++) { + let firstName = faker.name.firstName(); + let lastName = faker.name.lastName(); - return contacts; - }), + contacts.push({ + shortName: `${firstName} ${lastName[0]}`, + emailAddress: `${firstName.toLowerCase()}.${lastName[0].toLowerCase()}@example.com`, + profileImage: faker.internet.avatar() + }); + } - selectedContacts: filter('contacts', function(c, index) { - return index % 2 === 0; - }), + return contacts; +} - remainingContacts: computed('contacts.[]', 'selectedContacts.[]', function() { - return this.get('contacts').filter((c) => { - return this.get('selectedContacts').indexOf(c) === -1; - }); - }), +export default class extends Controller { + numOfContacts = 10; - altContacts: computed('numOfContacts', function() { - let contacts = []; - let numOfContacts = this.get('numOfContacts'); + contacts = getContacts(10); - for (let i = 0; i < numOfContacts; i++) { - let firstName = faker.name.firstName(); - let lastName = faker.name.lastName(); + selectedContacts = A(this.contacts.filter((c, index) => index % 2 === 0)); - contacts.push({ - shortName: `${firstName} ${lastName[0]}`, - emailAddress: `${firstName.toLowerCase()}.${lastName[0].toLowerCase()}@example.com`, - profileImage: faker.internet.avatar() - }); - } + altContacts = getAltContacts(10); - return contacts; - }), + selectedAltContacts = A(this.altContacts.filter((c, index) => index % 2 === 0)); - selectedAltContacts: filter('altContacts', function(c, index) { - return index % 2 === 0; - }), + fruitNames = A(['Apple', 'Banana', 'Orange']); - remainingAltContacts: computed('altContacts.[]', 'selectedAltContacts.[]', function() { - return this.get('altContacts').filter((c) => { - return this.get('selectedAltContacts').indexOf(c) === -1; - }); - }), + customFruitNames = A(['Apple', 'Banana', 'Orange']); - vegetables: A([{ + vegetables = A([{ name: 'Broccoli', family: 'Brassica' - }]), + }]); - allVegetables: A([{ + allVegetables = A([{ name: 'Broccoli', family: 'Brassica' }, { @@ -84,75 +69,97 @@ export default Controller.extend({ }, { name: 'Spinach', family: 'Goosefoot' - }]), + }]); - remainingVegetables: computed('allVegetables.@each.name', 'vegetables.@each.name', function() { - return this.get('allVegetables').filter((source) => { - return !this.get('vegetables').any(function(myVegetable) { - return source.name === myVegetable.name; - }); + vegeNames = A(['Broccoli']); + + allVegeNames = A(['Broccoli', 'Cabbage', 'Carrot', 'Lettuce', 'Spinach']); + + get remainingContacts() { + return this.contacts.filter((c) => { + return this.selectedContacts.indexOf(c) === -1; }); - }), + } - vegeNames: A(['Broccoli']), + get remainingAltContacts() { + return this.altContacts.filter((c) => { + return this.selectedAltContacts.indexOf(c) === -1; + }); + } - allVegeNames: A(['Broccoli', 'Cabbage', 'Carrot', 'Lettuce', 'Spinach']), + get remainingVegetables() { + return this.allVegetables.filter((source) => { + return !this.vegetables.some(function(myVegetable) { + return source.name === myVegetable.name; + }); + }); + } - remainingVegeNames: computed('vegeNames.length', function() { - return this.get('allVegeNames').filter((source) => { - return !this.get('vegeNames').any(function(myVegeName) { + get remainingVegeNames() { + return this.allVegeNames.filter((source) => { + return !this.vegeNames.some(function(myVegeName) { return source === myVegeName; }); }); - }), + } - actions: { - removeItem(item) { - this.get('fruitNames').removeObject(item); - }, + @action + removeItem(item) { + this.fruitNames.removeObject(item); + } - addItem(item) { - this.get('fruitNames').pushObject(item); - }, + @action + addItem(item) { + this.fruitNames.pushObject(item); + } - removeCustomItem(item) { - this.get('customFruitNames').removeObject(item); - }, + @action + removeCustomItem(item) { + this.customFruitNames.removeObject(item); + } - addCustomItem(item) { - this.get('customFruitNames').pushObject(item); - }, + @action + addCustomItem(item) { + this.customFruitNames.pushObject(item); + } - removeVegetable(item) { - this.get('vegetables').removeObject(item); - }, + @action + removeVegetable(item) { + this.vegetables.removeObject(item); + } - addVegetable(item) { - this.get('vegetables').pushObject(item); - }, + @action + addVegetable(item) { + this.vegetables.pushObject(item); + } - removeVegeName(item) { - this.get('vegeNames').removeObject(item); - }, + @action + removeVegeName(item) { + this.vegeNames.removeObject(item); + } - addVegeName(item) { - this.get('vegeNames').pushObject(item); - }, + @action + addVegeName(item) { + this.vegeNames.pushObject(item); + } - addContact(item) { - this.get('selectedContacts').pushObject(item); - }, + @action + addContact(item) { + this.selectedContacts.pushObject(item); + } - removeContact(item) { - this.get('selectedContacts').removeObject(item); - }, + @action + removeContact(item) { + this.selectedContacts.removeObject(item); + } - addAltContact(item) { - this.get('selectedAltContacts').pushObject(item); - }, + @action + addAltContact(item) { + this.selectedAltContacts.pushObject(item); + } - removeAltContact(item) { - this.get('selectedAltContacts').removeObject(item); - } + @action + removeAltContact(item) { + this.selectedAltContacts.removeObject(item); } -}); +} diff --git a/tests/dummy/app/controllers/components/dialog.js b/tests/dummy/app/controllers/components/dialog.js index ca6f7e33f..e442cb332 100644 --- a/tests/dummy/app/controllers/components/dialog.js +++ b/tests/dummy/app/controllers/components/dialog.js @@ -1,57 +1,51 @@ import Controller from '@ember/controller'; +import { tracked } from '@glimmer/tracking'; +import { action } from '@ember/object'; -export default Controller.extend({ - actions: { - - /* Dialog with parent */ - openDialogWithParent(event) { - this.set('dialogOrigin', event.currentTarget); - this.set('showDialogWithParent', true); - }, - - closeDialogWithParent(result) { - this.set('result', result); - this.set('showDialogWithParent', false); - }, - - /* Dialog */ - openDialog(event) { - this.set('dialogOrigin', event.currentTarget); - this.set('showDialog', true); - }, - - closeDialog(result) { - this.set('result', result); - this.set('showDialog', false); - }, - - /* Prompt dialog */ - dogName: '', - openPromptDialog(/* param, event */) { - this.set('dialogOrigin', null); - this.set('showPromptDialog', true); - }, - - closePromptDialog(result, dogName) { - if (result === 'ok') { - result = `${result} and dog named ${dogName}`; - } - this.set('result', result); - this.set('showPromptDialog', false); - }, - - toggleSourceCode() { - this.toggleProperty('showSourceCode'); - }, - - /* Animated dialog */ - openAnimatedDialog() { - this.set('showAnimatedDialog', true); - }, - - closeAnimatedDialog() { - this.set('showAnimatedDialog', false); +export default class extends Controller { + @tracked + dogName = ''; + + @action + openDialog(event) { + this.set('dialogOrigin', event.currentTarget); + this.set('showDialog', true); + } + + @action + closeDialog(result) { + this.set('result', result); + this.set('showDialog', false); + } + + + @action + openPromptDialog() { + this.set('dialogOrigin', null); + this.set('showPromptDialog', true); + } + + @action + closePromptDialog(result, dogName) { + if (result === 'ok') { + result = `${result} and dog named ${dogName}`; } + this.set('result', result); + this.set('showPromptDialog', false); + } + + @action + toggleSourceCode() { + this.toggleProperty('showSourceCode'); + } + + @action + openAnimatedDialog() { + this.set('showAnimatedDialog', true); + } + @action + closeAnimatedDialog() { + this.set('showAnimatedDialog', false); } -}); +} diff --git a/tests/dummy/app/controllers/components/divider.js b/tests/dummy/app/controllers/components/divider.js index fbaef8764..4d164804c 100644 --- a/tests/dummy/app/controllers/components/divider.js +++ b/tests/dummy/app/controllers/components/divider.js @@ -1,46 +1,31 @@ import Controller from '@ember/controller'; import { A } from '@ember/array'; -export default Controller.extend({ - showSourceCodeFull: false, - showSourceCodeInset: false, - - messages: A([{ - face: 'tomster.png', +export default class extends Controller { + messages = A([{ + face: '/assets/tomster.png', who: 'tomster 1', what: 'a message for you', notes: 'this is a message for you about ember' }, { - face: 'tomster.png', + face: '/assets/tomster.png', who: 'tomster 2', what: 'a message for you', notes: 'this is a message for you about ember' }, { - face: 'tomster.png', + face: '/assets/tomster.png', who: 'tomster 3', what: 'a message for you', notes: 'this is a message for you about ember' }, { - face: 'tomster.png', + face: '/assets/tomster.png', who: 'tomster 4', what: 'a message for you', notes: 'this is a message for you about ember' }, { - face: 'tomster.png', + face: '/assets/tomster.png', who: 'tomster 5', what: 'a message for you', notes: 'this is a message for you about ember' - }]), - - actions: { - - toggleSourceCodeFull() { - this.toggleProperty('showSourceCodeFull'); - }, - - toggleSourceCodeInset() { - this.toggleProperty('showSourceCodeInset'); - } - - } -}); + }]); +} diff --git a/tests/dummy/app/controllers/components/list.js b/tests/dummy/app/controllers/components/list.js index 089220a42..6e500dc7e 100644 --- a/tests/dummy/app/controllers/components/list.js +++ b/tests/dummy/app/controllers/components/list.js @@ -1,15 +1,14 @@ import Controller from '@ember/controller'; -import { computed } from '@ember/object'; +import { action } from '@ember/object'; import faker from 'faker'; -export default Controller.extend({ - numOfRows: 3, +export default class extends Controller { + numOfRows = 3; - listData: computed('numOfRows', function() { + get listData() { let contacts = []; - let numOfRows = this.get('numOfRows'); - for (let i = 0; i < numOfRows; i++) { + for (let i = 0; i < this.numOfRows; i++) { contacts.push({ name: faker.name.findName(), email: faker.internet.email(), @@ -18,9 +17,9 @@ export default Controller.extend({ } return contacts; - }), + } - phoneNumbers: Object.freeze([ + phoneNumbers = Object.freeze([ { number: '(555) 251-1234', type: 'Home' @@ -33,9 +32,9 @@ export default Controller.extend({ number: '(555) 314-1592', type: 'Office' } - ]), + ]); - toppings: Object.freeze([ + toppings = Object.freeze([ { name: 'Pepperoni', enabled: false @@ -49,38 +48,49 @@ export default Controller.extend({ name: 'Green Peppers', enabled: false } - ]), + ]); - messageData: Object.freeze([{ + messageData = Object.freeze([{ message: 'Message A' }, { message: 'Message B' }, { message: 'Message C' - }]), + }]); - actions: { - transitionTo(value) { - alert(`Imagine you transition to "${value}" here.`); - }, - transitionToWifiMenu() { - alert('Imagine you transition to wifi settings here.'); - }, - transitionToBluetoothMenu() { - alert('Imagine you transition to Bluetooth settings here.'); - }, - secondaryMessageClick() { - alert('Secondary actions can be used for one click actions.'); - }, - goToPerson(person) { - alert(`Imagine you transition to the person full view for '${person.name}' here.`); - }, - secondaryPersonClick(person) { - alert(`'${person.name}'. Secondary actions can be used for one click actions.`); - }, - transitionToDataUsage() { - alert('Imagine you would be taken to data-usage.'); - } + @action + transitionTo(value) { + alert(`Imagine you transition to "${value}" here.`); + } + + @action + transitionToWifiMenu() { + alert('Imagine you transition to wifi settings here.'); + } + + @action + transitionToBluetoothMenu() { + alert('Imagine you transition to Bluetooth settings here.'); + } + + @action + secondaryMessageClick() { + alert('Secondary actions can be used for one click actions.'); + } + + @action + goToPerson(person) { + alert(`Imagine you transition to the person full view for '${person.name}' here.`); + } + + @action + secondaryPersonClick(person) { + alert(`'${person.name}'. Secondary actions can be used for one click actions.`); + } + + @action + transitionToDataUsage() { + alert('Imagine you would be taken to data-usage.'); } -}); +} diff --git a/tests/dummy/app/controllers/components/loading.js b/tests/dummy/app/controllers/components/loading.js new file mode 100644 index 000000000..0f13d3731 --- /dev/null +++ b/tests/dummy/app/controllers/components/loading.js @@ -0,0 +1,66 @@ +import Controller from '@ember/controller'; +import { action } from '@ember/object'; +import { tracked } from '@glimmer/tracking'; +import { run } from '@ember/runloop'; + +export default class extends Controller { + @tracked mode = 'query'; + @tracked determinateValue = 0; + @tracked determinateValue2 = 0; + @tracked timer = null; + @tracked timer2 = null; + @tracked sliderDiameter = 100; + @tracked sliderValue = null; + @tracked isIndeterminate = true; + @tracked strokeRatio = 0.1; + + start() { + this.determinateValue = 30; + this.determinateValue = 30; + this.setupTimer(); + this.setupTimer2(); + } + + setupTimer() { + this.timer = run.later(this, function() { + this.determinateValue += 1; + this.determinateValue2 += 1.5; + if (this.determinateValue > 100) { + this.determinateValue = 30; + this.determinateValue2 = 30; + } + this.setupTimer(); + }, 100); + } + + setupTimer2() { + this.timer2 = run.later(this, function() { + this.mode = this.mode === 'query' ? 'determinate' : 'query'; + this.determinateValue = 30; + this.determinateValue2 = 30; + run.later(this, this.setupTimer2); + }, 7200); + } + + stop() { + run.cancel(this.timer); + run.cancel(this.timer2); + } + + @action + setValue(v) { + this.isIndeterminate = false; + this.sliderValue = v; + } + + @action + setIndeterminate(value) { + if (value) { + this.isIndeterminate = true; + this.sliderValue = null; + } else { + this.isIndeterminate = false; + this.sliderValue = 50; + } + } +} diff --git a/tests/dummy/app/controllers/components/menu.js b/tests/dummy/app/controllers/components/menu.js index 2df8da56e..bce4fa48b 100644 --- a/tests/dummy/app/controllers/components/menu.js +++ b/tests/dummy/app/controllers/components/menu.js @@ -2,7 +2,7 @@ import Controller from '@ember/controller'; import { A } from '@ember/array'; import { action } from '@ember/object'; -export default class MenuController extends Controller { +export default class extends Controller { options = A([1, 2, 3, 4, 5]); diff --git a/tests/dummy/app/controllers/components/progress-circular.js b/tests/dummy/app/controllers/components/progress-circular.js deleted file mode 100644 index dec8930fe..000000000 --- a/tests/dummy/app/controllers/components/progress-circular.js +++ /dev/null @@ -1,50 +0,0 @@ -import Controller from '@ember/controller'; -import { run } from '@ember/runloop'; - -export default Controller.extend({ - mode: 'query', - determinateValue: 0, - timer: null, - - start() { - this.set('determinateValue', 30); - this.setupTimer(); - }, - - setupTimer() { - this.set('timer', run.later(this, function() { - let value = this.incrementProperty('determinateValue', 1); - if (value > 100) { - this.set('determinateValue', 30); - } - this.setupTimer(); - }, 100)); - }, - - stop() { - run.cancel(this.get('timer')); - }, - - sliderDiameter: 100, - sliderValue: null, - isIndeterminate: true, - strokeRatio: 0.1, - - actions: { - setValue(v) { - this.set('isIndeterminate', false); - this.set('sliderValue', v); - }, - - setIndeterminate(value) { - if (value) { - this.set('isIndeterminate', true); - this.set('sliderValue', null); - } else { - this.set('isIndeterminate', false); - this.set('sliderValue', 50); - } - } - } - -}); diff --git a/tests/dummy/app/controllers/components/progress-linear.js b/tests/dummy/app/controllers/components/progress-linear.js deleted file mode 100644 index 12aa60e99..000000000 --- a/tests/dummy/app/controllers/components/progress-linear.js +++ /dev/null @@ -1,47 +0,0 @@ -import Controller from '@ember/controller'; -import { run } from '@ember/runloop'; - -export default Controller.extend({ - - mode: 'query', - determinateValue: 0, - determinateValue2: 0, - timer: null, - timer2: null, - - start() { - this.set('determinateValue', 30); - this.set('determinateValue2', 30); - this.setupTimer(); - this.setupTimer2(); - }, - - setupTimer() { - this.set('timer', run.later(this, function() { - let value = this.incrementProperty('determinateValue', 1); - this.incrementProperty('determinateValue2', 1.5); - if (value > 100) { - this.set('determinateValue', 30); - this.set('determinateValue2', 30); - } - - this.setupTimer(); - - }, 100)); - }, - - setupTimer2() { - this.set('timer2', run.later(this, function() { - this.set('mode', this.get('mode') === 'query' ? 'determinate' : 'query'); - this.set('determinateValue', 30); - this.set('determinateValue2', 30); - run.later(this, this.setupTimer2); - }, 7200)); - }, - - stop() { - run.cancel(this.get('timer')); - run.cancel(this.get('timer2')); - } - -}); diff --git a/tests/dummy/app/controllers/components/radio.js b/tests/dummy/app/controllers/components/radio.js deleted file mode 100644 index 40b755ea1..000000000 --- a/tests/dummy/app/controllers/components/radio.js +++ /dev/null @@ -1,8 +0,0 @@ -import Controller from '@ember/controller'; - -export default Controller.extend({ - - selectedFruit: 'Apple', - selectedGraphic: 'graphic-1' - -}); diff --git a/tests/dummy/app/controllers/components/switch.js b/tests/dummy/app/controllers/components/switch.js deleted file mode 100644 index 22259760b..000000000 --- a/tests/dummy/app/controllers/components/switch.js +++ /dev/null @@ -1,16 +0,0 @@ -import Controller from '@ember/controller'; - -export default Controller.extend({ - booleanProp1: true, - booleanProp2: false, - booleanProp3: false, - booleanProp4: false, - booleanProp5: false, - - actions: { - changeBooleanProp(which, newValue) { - this.set(`booleanProp${which}`, newValue); - } - } - -}); diff --git a/tests/dummy/app/controllers/components/toast.js b/tests/dummy/app/controllers/components/toast.js index 171608dd1..4ad0c9bb4 100644 --- a/tests/dummy/app/controllers/components/toast.js +++ b/tests/dummy/app/controllers/components/toast.js @@ -1,59 +1,75 @@ -import { inject as service } from '@ember/service'; import Controller from '@ember/controller'; +import { inject as service } from '@ember/service'; +import { tracked } from '@glimmer/tracking'; +import { action } from '@ember/object'; + +export default class extends Controller { + @service paperToaster; + + @tracked duration = 3000; + @tracked positionX = 'left'; + @tracked positionY = 'bottom'; + @tracked toastText = 'Hello world'; + @tracked toastClass = ''; + + @action + openToast() { + this.showToast = true; + } + + @action + openToastWithout() { + this.showToastWithout = true; + } + + // BEGIN-SNIPPET toast.programatic + @action + openServiceToast() { + this.paperToaster.show(this.toastText, { + duration: 4000, + toastClass: this.toastClass + }); + } -export default Controller.extend({ - duration: 3000, - positionX: 'left', - positionY: 'bottom', - toastText: 'Hello world', - toastClass: '', - - paperToaster: service(), - - actions: { - /* Toast */ - openToast() { - this.set('showToast', true); - }, - openToastWithout() { - this.set('showToastWithout', true); - }, - // BEGIN-SNIPPET toaster - openServiceToast() { - this.get('paperToaster').show(this.get('toastText'), { - duration: 4000, - toastClass: this.get('toastClass') - }); - }, - - openServiceActionToast() { - this.get('paperToaster').show(this.get('toastText'), { - duration: 4000, - toastClass: this.get('toastClass'), - action: { - label: 'Undo', - accent: true, - onClick() { - alert('toast action pressed'); - } + @action + openServiceActionToast() { + console.log({ + duration: 4000, + toastClass: this.toastClass, + position: 'top right', + }); + this.paperToaster.show(this.toastText, { + duration: 4000, + toastClass: this.toastClass, + position: 'top right', + action: { + label: 'Undo', + accent: true, + onClick() { + alert('toast action pressed'); } - }); - }, - // END-SNIPPET - cancelToast(toast) { - this.get('paperToaster').cancelToast(toast); - }, - closeToast() { - this.set('showToast', false); - }, - closeToastWithout() { - this.set('showToastWithout', false); - }, - toggleSourceCode() { - this.toggleProperty('showSourceCode'); - }, - buttonAction() { - alert('You have pressed the button!'); - } - } -}); + } + }); + } + // END-SNIPPET + + @action + cancelToast(toast) { + this.paperToaster.cancelToast(toast); + } + + @action + closeToast() { + this.showToast = false; + } + + @action + closeToastWithout() { + this.showToastWithout = false; + } + + @action + buttonAction() { + alert('You have pressed the button!'); + } +} diff --git a/tests/dummy/app/controllers/components/toggles.js b/tests/dummy/app/controllers/components/toggles.js new file mode 100644 index 000000000..bb13be99d --- /dev/null +++ b/tests/dummy/app/controllers/components/toggles.js @@ -0,0 +1,36 @@ +import Controller from '@ember/controller'; +import { tracked } from '@glimmer/tracking'; +import { action } from '@ember/object'; + +export default class extends Controller { + selectedFruit = 'Apple'; + selectedGraphic = 'graphic-1'; + booleanProp1 = true; + booleanProp2 = false; + booleanProp3 = false; + booleanProp4 = false; + booleanProp5 = false; + value1 = true; + value2 = false; + value3 = false; + value4 = false; + value5 = false; + value6 = false; + + @tracked + value7; + + get isIndeterminate() { + return this.value7 === undefined; + } + + @action + toggleValue6() { + this.value6 = !this.value6; + } + + @action + changeBooleanProp(which, newValue) { + this.set(`booleanProp${which}`, newValue); + } +} diff --git a/tests/dummy/app/helpers/eq.js b/tests/dummy/app/helpers/eq.js new file mode 100644 index 000000000..9e56edab1 --- /dev/null +++ b/tests/dummy/app/helpers/eq.js @@ -0,0 +1,7 @@ +import Helper from '@ember/component/helper'; + +export default class extends Helper { + compute([a, b]) { + return a === b; + } +} diff --git a/tests/dummy/app/styles/demo.scss b/tests/dummy/app/styles/demo.scss index 5ead1bbe8..0afba51cb 100644 --- a/tests/dummy/app/styles/demo.scss +++ b/tests/dummy/app/styles/demo.scss @@ -253,12 +253,11 @@ ul li:first-child { width: 50px; } -.card-demo { - .card-media { - background-color: #999999; - height: 100%; - width: 100%; - } +.card-media { + border-radius: 5px; + background-color: #999999; + height: 100%; + width: 100%; } /************ @@ -1306,3 +1305,12 @@ ul li:first-child { background: #78909c; } } + +md-toast { + &.md-accent > .md-toast-content { + background: paper-color($accent, '400'); + } + &.md-warn > .md-toast-content { + background: paper-color($warn, '400'); + } +} diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs index 52e9baac1..a2a0611d3 100644 --- a/tests/dummy/app/templates/application.hbs +++ b/tests/dummy/app/templates/application.hbs @@ -29,5 +29,3 @@
- - diff --git a/tests/dummy/app/templates/components/autocomplete.hbs b/tests/dummy/app/templates/components/autocomplete.hbs index 36924282b..08d37c19b 100644 --- a/tests/dummy/app/templates/components/autocomplete.hbs +++ b/tests/dummy/app/templates/components/autocomplete.hbs @@ -1,13 +1,26 @@ - - - -

Basic Usage

-
Use \{{paper-autocomplete}} to search for matches from local or remote data sources.
-
- {{! BEGIN-SNIPPET autocomplete.basic-usage }} - - {{! END-SNIPPET }} - + +

Basic Usage

+
Use \{{paper-autocomplete}} to search for matches from local or remote data sources.
+
+
+ + Disable input + + + Simulate query + + + Highlight first match + + + +
+
+ {{! BEGIN-SNIPPET autocomplete.basic-usage }} + + {{! END-SNIPPET }} + +

{{#if selectedCountry}} Selected country is {{selectedCountry.name}} ({{selectedCountry.code}}) @@ -22,80 +35,61 @@ No search text {{/if}}

- - Disable input - - - Simulate query - - - Highlight first match - - - - -

Template

- - - - - - - -

Block Custom template

-
Use \{{paper-autocomplete}} with custom templates to show styled autocomplete results.
+
+
- {{!-- searchText=(readonly templateSeachText) --}} + {{#let (get-code-snippet "autocomplete.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} -
- {{! BEGIN-SNIPPET autocomplete.block-custom-template }} - {{#paper-autocomplete - placeholder="Type e.g. ember, paper, one, two etc." - options=arrayOfItems - selected=selectedItem - onSelectionChange=(action (mut selectedItem)) - as |item term|}} - - {{paper-icon "star"}} - - - +

Block Custom template

+
Use \{{paper-autocomplete}} with custom templates to show styled autocomplete results.
+
+ + {{! BEGIN-SNIPPET autocomplete.block-custom-template }} + {{#paper-autocomplete + placeholder="Type e.g. ember, paper, one, two etc." + options=arrayOfItems + selected=selectedItem + onSelectionChange=(action (mut selectedItem)) + as |item term|}} + + {{paper-icon "star"}} + + - {{else}} - Whoops! could not find! - {{/paper-autocomplete}} - {{! END-SNIPPET }} - - + + {{else}} + Whoops! could not find! + {{/paper-autocomplete}} + {{! END-SNIPPET }} + +

Selected: {{if selectedItem selectedItem "None"}}

+
+
-

Template

- -
- + {{#let (get-code-snippet "autocomplete.block-custom-template.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} - - -

Floating Label

-
The following example demonstrates floating labels being used as a normal form element.
-
- {{! BEGIN-SNIPPET autocomplete.floating-label }} - - - - - - {{! END-SNIPPET }} - -

+

Floating Label

+
The following example demonstrates floating labels being used as a normal form element.
+
+
+
{{#if selectedCountry2}} Selected country is {{selectedCountry2.name}} ({{selectedCountry2.code}}) {{else}} Nothing is selected. {{/if}} -

+
Disable input @@ -108,11 +102,19 @@ Allow Clear +
+
+ {{! BEGIN-SNIPPET autocomplete.floating-label }} + + + + {{! END-SNIPPET }} +
+
-

Template

- - -
- - - + {{#let (get-code-snippet "autocomplete.floating-label.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + diff --git a/tests/dummy/app/templates/components/button.hbs b/tests/dummy/app/templates/components/button.hbs index 8084e7ac7..da1ddeb6e 100644 --- a/tests/dummy/app/templates/components/button.hbs +++ b/tests/dummy/app/templates/components/button.hbs @@ -1,6 +1,6 @@
- {{! BEGIN-SNIPPET button.basic-usage }} + {{! BEGIN-SNIPPET button.basic }} Button with action Primary (noink) disabled @@ -10,7 +10,7 @@ {{! END-SNIPPET }}
- {{#let (get-code-snippet "button.basic-usage.hbs") as |snippet|}} + {{#let (get-code-snippet "button.basic.hbs") as |snippet|}} {{snippet.source}} diff --git a/tests/dummy/app/templates/components/card.hbs b/tests/dummy/app/templates/components/card.hbs index b43bb99bd..57e38d7f6 100644 --- a/tests/dummy/app/templates/components/card.hbs +++ b/tests/dummy/app/templates/components/card.hbs @@ -1,283 +1,137 @@ - +

Basic Usage

- {{! BEGIN-SNIPPET card.basic-usage }} -
-
- - - - Card with image - Large - - - - - Action 1 - Action 2 - - - - - - - Card with block - Extra large - - - - -
- - - {{paper-icon "favorite"}} - {{paper-icon "settings"}} - {{paper-icon "share"}} - - - -
-
- - - - Card with image - Small - - - - - Action 1 - Action 2 - - - - - - - Card with block - Medium - - -
- - - - Action 1 - Action 2 - - -
-
- {{! END-SNIPPET }} +
+ {{! BEGIN-SNIPPET card.basic }} + + + + Card with image + Large + + + + + Action 1 + Action 2 + + -

Template

- - -

Card Action Buttons

- {{! BEGIN-SNIPPET card.action-buttons }} -
-
- - - - - Action buttons - - - -

- The titles of Washed Out's breakthrough song and the first single from Paracosm share the - two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... -

-

- The titles of Washed Out's breakthrough song and the first single from Paracosm share the - two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... -

-

- The titles of Washed Out's breakthrough song and the first single from Paracosm share the - two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... -

- - - Action 1 - Action 2 - - - - - - - - Vertical action buttons - - - -

- The titles of Washed Out's breakthrough song and the first single from Paracosm share the - two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... -

- + + + + Card with block + Extra large + + + + +
+ - Action 1 - Action 2 - - -
- -
- - - - - Icon action buttons - - - -

- The titles of Washed Out's breakthrough song and the first single from Paracosm share the - two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... -

- - {{paper-icon "favorite"}} {{paper-icon "settings"}} {{paper-icon "share"}} - + + + {{! END-SNIPPET }} +
- - - - {{paper-icon "favorite"}} - {{paper-icon "settings"}} - {{paper-icon "share"}} - - + {{#let (get-code-snippet "card.basic.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Card Action Buttons

+
+ {{! BEGIN-SNIPPET card.action-buttons }} + + + + + Vertical action buttons + + + +

+ The titles of Washed Out's breakthrough song and the first single from Paracosm share the + two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... +

+ + + Action 1 + Action 2 + + - - - - tomster - - - Ember - Paper - - - - - - Card header - - - -

- The titles of Washed Out's breakthrough song and the first single from Paracosm share the - two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... -

- - -
+ + + + + Icon action buttons + + + +

+ The titles of Washed Out's breakthrough song and the first single from Paracosm share the + two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... +

+ + + {{paper-icon "favorite"}} + {{paper-icon "settings"}} + {{paper-icon "share"}} + + + {{! END-SNIPPET }}
- {{! END-SNIPPET }} -

Template

- + {{#let (get-code-snippet "card.action-buttons.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}}

In Card Actions

- {{! BEGIN-SNIPPET card.in-card-actions }} -
-
- - - - - In-card mixed actions - - - - - {{paper-icon "favorite"}} - {{paper-icon "share"}} - - Action 1 - Action 2 - - -

- The titles of Washed Out's breakthrough song and the first single from Paracosm share the - two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... -

- - - - - - - tomster - - - User - subhead - - - - - - In-card mixed actions - Reversed - - - - Action 1 - Action 2 - - {{paper-icon "expand-less"}} - - - -

- The titles of Washed Out's breakthrough song and the first single from Paracosm share the - two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... -

- - -
+
+ {{! BEGIN-SNIPPET card.in-card-actions }} + + + + + In-card mixed actions + + + + {{paper-icon "favorite"}} + {{paper-icon "share"}} -
- - - - tomster - - - Title - subhead - - - - - - In-card mixed actions - Description - - - - Action 1 - Action 2 - - -

- The titles of Washed Out's breakthrough song and the first single from Paracosm share the - two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... -

- - -
+ + {{paper-icon "expand-less"}} + + + +

+ The titles of Washed Out's breakthrough song and the first single from Paracosm share the + two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well... +

+ + + {{! END-SNIPPET }}
- {{! END-SNIPPET }} -

Template

- + {{#let (get-code-snippet "card.in-card-actions.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} - +
+ {{paper-api + (p-section + (p-row "tbd" "tbd" "tbd") + ) + }} +
+ diff --git a/tests/dummy/app/templates/components/checkbox.hbs b/tests/dummy/app/templates/components/checkbox.hbs deleted file mode 100644 index e0d70002c..000000000 --- a/tests/dummy/app/templates/components/checkbox.hbs +++ /dev/null @@ -1,39 +0,0 @@ - - {{! BEGIN-SNIPPET checkbox }} -
- - A checkbox: {{value1}} - - - - A checkbox: {{if value2 "yep" "nope"}} - - - - Checkbox (disabled) - - - - Checkbox (disabled and value) - - - - Checkbox (no ink) - - - - - - Indeterminate checkbox - - - - Indeterminate checkbox (disabled) - -
- {{! END-SNIPPET }} - -

Template

- - - diff --git a/tests/dummy/app/templates/components/chips.hbs b/tests/dummy/app/templates/components/chips.hbs index b9d0ed9c4..1c85c883c 100644 --- a/tests/dummy/app/templates/components/chips.hbs +++ b/tests/dummy/app/templates/components/chips.hbs @@ -1,73 +1,103 @@ - - - - - -

Basic Usage

- - - - {{! BEGIN-SNIPPET chips.example }} -

Default Template

- - -

Custom Template

- - {{item}} - (fruit) - - -

Chips with Autocomplete

- - {{item.name}} - {{#if item.family}} - {{item.family}} - {{/if}} - - -

Chips with Autocomplete (requires match)

- - {{! END-SNIPPET }} - -

Template

- - - - - - - - - -

Contact chips

- - - - - {{! BEGIN-SNIPPET chips.contacts-example }} -

Contact Chips

- - -
- paper-contact-chips expects the name, email address and image - to be supplied as name, email and image - respectively. If your field names differ from these, specify them using the - nameField, emailField and imageField - parameters, and specify searchField to configure which field the - autocomplete should search against: -
- - - - - Read Only - - {{! END-SNIPPET }} - -

Template

- - - - - - + + + + Read Only + + +

Default Template

+
+ {{! BEGIN-SNIPPET chips.default }} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "chips.default.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Custom Template

+
+ {{! BEGIN-SNIPPET chips.custom }} + + {{item}} + (fruit) + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "chips.custom.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Chips with Autocomplete

+
+ {{! BEGIN-SNIPPET chips.autocomplete }} + + {{item.name}} + {{#if item.family}} + {{item.family}} + {{/if}} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "chips.autocomplete.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Chips with Autocomplete (requires match)

+
+ {{! BEGIN-SNIPPET chips.autocomplete-requires-match }} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "chips.autocomplete-requires-match.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + + +

Contact Chips

+
+ {{! BEGIN-SNIPPET chips.contact }} + + {{! END-SNIPPET }} + +
+ paper-contact-chips expects the name, email address and image + to be supplied as name, email and image + respectively. If your field names differ from these, specify them using the + nameField, emailField and imageField + parameters, and specify searchField to configure which field the + autocomplete should search against: +
+
+ + {{#let (get-code-snippet "chips.contact.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Contact Alt Chips

+
+ {{! BEGIN-SNIPPET chips.contact-alt }} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "chips.contact-alt.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + + diff --git a/tests/dummy/app/templates/components/dialog.hbs b/tests/dummy/app/templates/components/dialog.hbs index 8838c1e09..847567a5b 100644 --- a/tests/dummy/app/templates/components/dialog.hbs +++ b/tests/dummy/app/templates/components/dialog.hbs @@ -1,166 +1,138 @@ - - - - - - - -

Basic Usage

- - - - - - - -
- -
- -
-
- -

Open a dialog over the app's content. Press escape or click outside to close the dialog and send focus back to the triggering button.

- -
- - Dialog with parent - - - Custom dialog - - - Prompt dialog - - - Animated dialog - -
- - {{#if result}} -

You dismissed the dialog with a result of "{{result}}".

- {{/if}} - - {{paper-api - (p-section - (p-row "parent" "element or selector" "Existing element where the modal and backdrop will be rendered") - (p-row "origin" "element or selector" "If present, the dialog will use it as openFrom and closeTo. Also, focus will be returned to this element once the dialog closes.") - (p-row "closeTo" "element or selector" "Target for closing the dialog with a transition.") - (p-row "openFrom" "element or selector" "Source for opening the dialog with a transition.") - (p-row "fullscreen" "boolean" "Causes the dialog to become fullscreen at smaller breakpoints.") - (p-row "opaque" "boolean" "Causes the backdrop to become opaque. Defaults to `true`.") - (p-row "clickOutsideToClose" "boolean" "Causes clicking on the backdrop to trigger the `onClose` handler. Defaults to `false`.") - (p-row "focusOnOpen" "boolean" "Causes the initial focus to be on an inner element with the autofocus attribute, rather than the last button inside `{{paper-dialog-actions}}`. Defaults to `true`.") - (p-row "escapeToClose" "boolean" "Causes pressing escape to close the dialog. Defaults to `true`.") - ) - (p-section - "Actions" - (p-row "onClose" "action" "An action to be executed when the dialog is closed, e.g. by pressing escape.") - ) - }} - - -
- - - - - - - -{{! BEGIN-SNIPPET dialog }} -{{#if showDialogWithParent}} - -
- - -

Mango (Fruit)

+ + +
+
+ {{#if showDialog}} + {{! BEGIN-SNIPPET dialog.custom }} + + + +

Mango (Fruit)

+ + + + + + +

+ The mango is a juicy stone fruit belonging to the genus Mangifera, consisting of numerous tropical fruiting trees, cultivated mostly for edible fruit. The majority of these species are found in nature as wild mangoes. They all belong to the flowering plant family Anacardiaceae. The mango is native to South and Southeast Asia, from where it has been distributed worldwide to become one of the most cultivated fruits in the tropics. +

+ Lush mango tree + + + + More on Wikipedia + + Cancel + OK + + + {{! END-SNIPPET }} + {{/if}} + + {{#if result}} +

You dismissed the dialog with a result of "{{result}}".

+ {{/if}} + + + Custom dialog + +
+ + {{#let (get-code-snippet "dialog.custom.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +
+
+ {{#if showPromptDialog}} + {{! BEGIN-SNIPPET dialog.prompt }} + + +

What would you name your dog?

+

Bowser is a common name.

+ +
+ Display fullscreen at small window size breakpoints +
+ + + - - - - - - - -

- This is a dialog rendered into a specific element. Clicking outside the dialog will close it. -

- - - - - - Cancel - - - OK - - - - -{{/if}} - -{{#if showDialog}} - - - -

Mango (Fruit)

- - - - - - -

- The mango is a juicy stone fruit belonging to the genus Mangifera, consisting of numerous tropical fruiting trees, cultivated mostly for edible fruit. The majority of these species are found in nature as wild mangoes. They all belong to the flowering plant family Anacardiaceae. The mango is native to South and Southeast Asia, from where it has been distributed worldwide to become one of the most cultivated fruits in the tropics. -

- Lush mango tree - - - - More on Wikipedia - - Cancel - OK - - -{{/if}} - -{{#if showPromptDialog}} - - - -

What would you name your dog?

-

Bowser is a common name.

- -
- Display fullscreen at small window size breakpoints -
- - - - - I'm a cat person - Okay! - - - -{{/if}} - -{{#if showAnimatedDialog}} - - - -

This dialog is animated!

-

It opened from above, but it will close to below.

- - - - - Okay! - - - -{{/if}} -{{! END-SNIPPET }} + I'm a cat person + Okay! + + + {{! END-SNIPPET }} + {{/if}} + + {{#if result}} +

You dismissed the dialog with a result of "{{result}}".

+ {{/if}} + + + Prompt dialog + +
+ + {{#let (get-code-snippet "dialog.prompt.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +
+
+ {{#if showAnimatedDialog}} + {{! BEGIN-SNIPPET dialog.animated }} + + + +

This dialog is animated!

+

It opened from above, but it will close to below.

+ + + + + Okay! + + + + {{! END-SNIPPET }} + {{/if}} + + + Animated dialog + +
+ + {{#let (get-code-snippet "dialog.animated.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +
+ +
+ {{paper-api + (p-section + (p-row "parent" "element or selector" "Existing element where the modal and backdrop will be rendered") + (p-row "origin" "element or selector" "If present, the dialog will use it as openFrom and closeTo. Also, focus will be returned to this element once the dialog closes.") + (p-row "closeTo" "element or selector" "Target for closing the dialog with a transition.") + (p-row "openFrom" "element or selector" "Source for opening the dialog with a transition.") + (p-row "fullscreen" "boolean" "Causes the dialog to become fullscreen at smaller breakpoints.") + (p-row "opaque" "boolean" "Causes the backdrop to become opaque. Defaults to `true`.") + (p-row "clickOutsideToClose" "boolean" "Causes clicking on the backdrop to trigger the `onClose` handler. Defaults to `false`.") + (p-row "focusOnOpen" "boolean" "Causes the initial focus to be on an inner element with the autofocus attribute, rather than the last button inside `{{paper-dialog-actions}}`. Defaults to `true`.") + (p-row "escapeToClose" "boolean" "Causes pressing escape to close the dialog. Defaults to `true`.") + ) + (p-section + "Actions" + (p-row "onClose" "action" "An action to be executed when the dialog is closed, e.g. by pressing escape.") + ) + }} +
+ diff --git a/tests/dummy/app/templates/components/divider.hbs b/tests/dummy/app/templates/components/divider.hbs index e73ea5ea0..2a7792c6d 100644 --- a/tests/dummy/app/templates/components/divider.hbs +++ b/tests/dummy/app/templates/components/divider.hbs @@ -1,67 +1,51 @@ - + - - - -

Full Bleed

- - - - - - - -
- -
- {{! BEGIN-SNIPPET divider.full }} - - {{#each messages as |item|}} - -
-

{{item.what}}

-

{{item.who}}

-

{{item.notes}}

-
- - Respond - - {{/each}} - - {{! END-SNIPPET }} - +
+ {{! BEGIN-SNIPPET divider.full }} + + {{#each messages as |item|}} + +
+

{{item.what}}

+

{{item.who}}

+

{{item.notes}}

+
+ + Respond + + {{/each}} + + {{! END-SNIPPET }} +
- + {{#let (get-code-snippet "divider.full.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} - - - -

Inset

- - - - - - - -
- -
- {{! BEGIN-SNIPPET divider.inset }} - - {{#each messages as |item|}} - - {{item.who}} -
-

{{item.what}}

-

{{item.who}}

-

{{item.notes}}

-
- - - {{/each}} - - {{! END-SNIPPET }} - - - +
+ {{! BEGIN-SNIPPET divider.inset }} + + {{#each messages as |item|}} + + {{item.who}} +
+

{{item.what}}

+

{{item.who}}

+

{{item.notes}}

+
+ + + {{/each}} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "divider.inset.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + + diff --git a/tests/dummy/app/templates/components/grid-list.hbs b/tests/dummy/app/templates/components/grid-list.hbs index c939796ca..607734524 100644 --- a/tests/dummy/app/templates/components/grid-list.hbs +++ b/tests/dummy/app/templates/components/grid-list.hbs @@ -1,92 +1,100 @@ - -

Basic Usage

- {{! BEGIN-SNIPPET grid-list.basic-usage }} - - - - - - -

#1: (3r x 2c)

- - - - - -

#2: (1r x 1c)

- - - - - -

#3: (1r x 1c)

- - - - - -

#4: (2r x 1c)

- - - - - -

#5: (2r x 2c)

- - - - - -

#6: (2r x 1c)

- - + - - - - {{ END-SNIPPET }} - -

Template

- +

Basic Usage

+
+ -

Dynamic Tiles

- {{! BEGIN-SNIPPET grid-list.dynamic-tiles }} - - + {{! BEGIN-SNIPPET grid-list.basic-usage }} + - {{#each tiles as |dynamicTile|}} - - + -

{{dynamicTile.title}}

+

#1: (3r x 2c)

 - {{/each}} - - - {{! END-SNIPPET }} - -

Template

- + + +

#2: (1r x 1c)

+ + -

Responsive and Animated Usage

- {{! BEGIN-SNIPPET grid-list.responsive }} - + + +

#3: (1r x 1c)

+ + - + + +

#4: (2r x 1c)

+ + - {{#each colorTiles as |tile|}} + + +

#5: (2r x 2c)

+ + - + + +

#6: (2r x 1c)

+ - {{/each}} - - - {{! END-SNIPPET }} + + {{! END-SNIPPET }} + +
-

Template

- + {{#let (get-code-snippet "grid-list.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} - +

Dynamic Tiles

+
+ + {{! BEGIN-SNIPPET grid-list.dynamic-tiles }} + + {{#each tiles as |dynamicTile|}} + + + +

{{dynamicTile.title}}

+ + + {{/each}} + + {{! END-SNIPPET }} + +
+ + {{#let (get-code-snippet "grid-list.dynamic-tiles.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Responsive and Animated Usage

+
+ + {{! BEGIN-SNIPPET grid-list.responsive }} + + {{#each colorTiles as |tile|}} + + {{/each}} + + {{! END-SNIPPET }} + +
+ + {{#let (get-code-snippet "grid-list.responsive.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + + diff --git a/tests/dummy/app/templates/components/icon.hbs b/tests/dummy/app/templates/components/icon.hbs index df9cd79f2..c0aeb83b1 100644 --- a/tests/dummy/app/templates/components/icon.hbs +++ b/tests/dummy/app/templates/components/icon.hbs @@ -1,4 +1,4 @@ - +

Available Icons

@@ -6,34 +6,47 @@ available icons.

-

Usage

-

Basic Icons

-
+
{{! BEGIN-SNIPPET icons.basic-usage }} - {{paper-icon "check-circle"}} + {{! END-SNIPPET }}
- + + {{#let (get-code-snippet "icons.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}}

Changing Sizes

-
+
{{! BEGIN-SNIPPET icons.sizes }} - {{paper-icon "check-circle" size=12}} - {{paper-icon "check-circle" size=18}} - {{paper-icon "check-circle" size=24}} - {{paper-icon "check-circle" size=36}} - {{paper-icon "check-circle" size=48}} + + + + + {{! END-SNIPPET }}
- + + {{#let (get-code-snippet "icons.sizes.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}}

Spinners

-
+
{{! BEGIN-SNIPPET icons.spinners }} - {{paper-icon "rotate-right" spin=true}} - {{paper-icon "rotate-left" reverseSpin=true}} + + {{! END-SNIPPET }}
- - + + {{#let (get-code-snippet "icons.spinners.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + diff --git a/tests/dummy/app/templates/components/list.hbs b/tests/dummy/app/templates/components/list.hbs index 12c714946..1659fd1b6 100644 --- a/tests/dummy/app/templates/components/list.hbs +++ b/tests/dummy/app/templates/components/list.hbs @@ -1,220 +1,301 @@ - - - - - -

Basic Usage

- - - - {{! BEGIN-SNIPPET list }} - - 3 line item - {{#each listData as |item|}} - - {{item.name}} -
-

{{item.name}}

-

{{item.email}}

-

Some longer notes here could be here. But they aren't.

-
- - {{/each}} - - - - 2 line item - {{#each listData as |item|}} - - {{item.name}} -
-

{{item.name}}

-

{{item.email}}

-
- - {{/each}} - - - - 3 line item, long paragraph - {{#each listData as |item|}} - - {{item.name}} -
-

{{item.name}}

-

- Secondary line text Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam massa quam. - Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque volutpat condimentum - velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. -

-
- - {{/each}} - - - - Icons - {{#each phoneNumbers as |phone|}} - - {{paper-icon "phone" class="md-avatar-icon"}} -
-

{{phone.number}}

-

{{phone.type}}

-
- - {{/each}} - - - {{! END-SNIPPET }} - - - -

Template

- - - - - -

List Controls

- - - - {{! BEGIN-SNIPPET list-controls }} - - - Single Action Checkboxes - {{#each toppings as |topping|}} - -

{{topping.name}}

-
- -
- - {{/each}} - - - - Secondary Buttons + + +
+ {{! BEGIN-SNIPPET list.3-line }} + + 3 line item + {{#each listData as |item|}} + + {{item.name}} +
+

{{item.name}}

+

{{item.email}}

+

Some longer notes here could be here. But they aren't.

+
+ + {{/each}} + + + + 3 line item, long paragraph + {{#each listData as |item|}} + + {{item.name}} +
+

{{item.name}}

+

+ Secondary line text Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam massa quam. + Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque volutpat condimentum + velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. +

+
+ + {{/each}} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "list.3-line.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +
+ {{! BEGIN-SNIPPET list.2-line }} + + 2 line item + {{#each listData as |item|}} + + {{item.name}} +
+

{{item.name}}

+

{{item.email}}

+
+ + {{/each}} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "list.2-line.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +
+ {{! BEGIN-SNIPPET list.icons }} + + Icons + {{#each phoneNumbers as |phone|}} + + {{paper-icon "phone" class="md-avatar-icon"}} +
+

{{phone.number}}

+

{{phone.type}}

+
+ + {{/each}} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "list.icons.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +
+ {{! BEGIN-SNIPPET list.singe-actions }} + + Single Action Checkboxes + {{#each toppings as |topping|}} -

Clicking the button to the right will fire the secondary action

+

{{topping.name}}

- - More Info - +
- -

Click anywhere to fire the primary action, or the button to fire the secondary

+ {{/each}} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "list.singe-actions.hbs") as |snippet|}} + + {{snippet.source}} + + {{/let}} + +
+ {{! BEGIN-SNIPPET list.secondary-buttons }} + + Secondary Buttons + +

Clicking the button to the right will fire the secondary action

+
+ + More Info + +
+ + +

Click anywhere to fire the primary action, or the button to fire the secondary

+
+ + More Info + +
+ + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "list.secondary-buttons.hbs") as |snippet|}} + + {{snippet.source}} + + {{/let}} + +
+ {{! BEGIN-SNIPPET list.clickable-secondary-controls }} + + Clickable Items with Secondary Controls + + {{paper-icon "network-wifi"}} +

Wi-Fi

+
+ +
+ + + {{paper-icon "bluetooth"}} +

Bluetooth

+
+ +
+ + + {{paper-icon "data-usage"}} +

Data Usage

+ + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "list.clickable-secondary-controls.hbs") as |snippet|}} + + {{snippet.source}} + + {{/let}} + +
+ {{! BEGIN-SNIPPET list.checkbox-secondary-controls }} + + Checkbox with Secondary Action + {{#each messageData as |item|}} + + +

{{item.message}}

- - More Info + + {{paper-icon "message"}}
+ {{/each}} + + {{! END-SNIPPET }} +
- + {{#let (get-code-snippet "list.checkbox-secondary-controls.hbs") as |snippet|}} + + {{snippet.source}} + + {{/let}} - Clickable Items with Secondary Controls - - {{paper-icon "network-wifi"}} -

Wi-Fi

+
+ {{! BEGIN-SNIPPET list.avatar-secondary-controls }} + + Avatar with Secondary Action Icon + {{#each listData as |item|}} + + {{item.name}} +

{{item.name}}

- + + + {{paper-icon "email"}} + + + {{paper-icon "message"}} +
- - {{paper-icon "bluetooth"}} -

Bluetooth

-
- + {{/each}} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "list.avatar-secondary-controls.hbs") as |snippet|}} + + {{snippet.source}} + + {{/let}} + +
+ {{! BEGIN-SNIPPET list.clickable-avatars }} + + Clickable Avatars + {{#each listData as |item|}} + + {{item.name}} +
+

{{item.name}}

+

{{item.email}}

+

Some notes here.

+
+ + {{/each}} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "list.clickable-avatars.hbs") as |snippet|}} + + {{snippet.source}} + + {{/let}} + +
+ {{! BEGIN-SNIPPET list.avatars-secondary-control-icons }} + + Avatar with Secondary Action Icon + {{#each listData as |item|}} + + {{item.name}} +
+

{{item.name}}

+

{{item.email}}

+

Some notes here.

+ + {{paper-icon "phone"}} + - - {{paper-icon "data-usage"}} -

Data Usage

+ {{/each}} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "list.avatars-secondary-control-icons.hbs") as |snippet|}} + + {{snippet.source}} + + {{/let}} + +
+ {{! BEGIN-SNIPPET list.single-actions-radios }} + + Single Action Radios + {{#each toppings as |topping|}} + +

{{topping.name}}

+
+ +
+ {{/each}} + + {{! END-SNIPPET }} +
- + {{#let (get-code-snippet "list.single-actions-radios.hbs") as |snippet|}} + + {{snippet.source}} + + {{/let}} - Checkbox with Secondary Action - {{#each messageData as |item|}} - - -

{{item.message}}

-
- - {{paper-icon "message"}} - -
- - {{/each}} - - - - Avatar with Secondary Action Icon - {{#each listData as |item|}} - - {{item.name}} -

{{item.name}}

-
- - - {{paper-icon "email"}} - - - {{paper-icon "message"}} - -
- - {{/each}} - - - - Clickable Avatars - {{#each listData as |item|}} - - {{item.name}} -
-

{{item.name}}

-

{{item.email}}

-

Some notes here.

-
- - {{/each}} - - - - Avatar with Secondary Action Icon - {{#each listData as |item|}} - - {{item.name}} -
-

{{item.name}}

-

{{item.email}}

-

Some notes here.

-
- - {{paper-icon "phone"}} - - - {{/each}} - - Single Action Radios - {{#each toppings as |topping|}} - -

{{topping.name}}

-
- -
- - {{/each}} - - - {{! END-SNIPPET }} - - - -

Template

- - - + diff --git a/tests/dummy/app/templates/components/loading.hbs b/tests/dummy/app/templates/components/loading.hbs index 88098149d..34ae1dd5b 100644 --- a/tests/dummy/app/templates/components/loading.hbs +++ b/tests/dummy/app/templates/components/loading.hbs @@ -1 +1,142 @@ -// put progress-circular and progress-linear here + +

Circlular

+

Determinate

+

For operations where the percentage of the operation completed can be determined, use a determinate indicator. They give users a quick sense of how long an operation will take.

+
+ {{! BEGIN-SNIPPET progress-circular.determinate }} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "progress-circular.determinate.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Indeterminate

+

For operations where the user is asked to wait a moment while something finishes up, and it’s not necessary to expose what's happening behind the scenes and how long it will take, use an indeterminate indicator.

+
+ {{! BEGIN-SNIPPET progress-circular.indeterminate }} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "progress-circular.indeterminate.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Theming

+
+ {{! BEGIN-SNIPPET progress-circular.theming }} + + + + + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "progress-circular.theming.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Playground

+
+ {{! BEGIN-SNIPPET progress-circular.playground }} + + {{! END-SNIPPET }} + +
+ + Indeterminate + + + Disabled + +
+ Value ({{if sliderValue sliderValue "null"}}) + +
+ +
+ Diameter ({{sliderDiameter}}) + +
+ +
+ Stroke ratio ({{strokeRatio}}) + +
+
+
+ + {{#let (get-code-snippet "progress-circular.playground.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Linear

+ +

Determinate mode

+

For operations where the percentage of the operation completed can be determined, use a determinate indicator. They give users a quick sense of how long an operation will take.

+
+ {{! BEGIN-SNIPPET progress-linear.determinate }} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "progress-linear.determinate.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Indeterminate mode

+

For operations where the user is asked to wait a moment while something finishes up, and it's not necessary to expose what's happening behind the scenes and how long it will take, use an indeterminate indicator:

+
+ {{! BEGIN-SNIPPET progress-linear.indeterminate }} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "progress-linear.indeterminate.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Buffer mode

+

For operations where the user wants to indicate some activity or loading from the server, use the buffer indicator:

+
+ {{! BEGIN-SNIPPET progress-linear.buffer }} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "progress-linear.buffer.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Query mode

+

For situations where the user wants to indicate pre-loading (until the loading can actually be made), use the query indicator:

+
+ {{! BEGIN-SNIPPET progress-linear.query }} + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "progress-linear.query.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + + diff --git a/tests/dummy/app/templates/components/menu.hbs b/tests/dummy/app/templates/components/menu.hbs index 8069106de..ecc9b8676 100644 --- a/tests/dummy/app/templates/components/menu.hbs +++ b/tests/dummy/app/templates/components/menu.hbs @@ -1,281 +1,278 @@ - - - - -

Basic Usage

- - - -

Simple dropdown menu

- -

- Note that applying the class .md-menu-origin - and md-menu-align-targetattributes ensure that the menu elements align. -

- -
- {{! BEGIN-SNIPPET menu.simple-dropdown }} - - + + +

Simple dropdown menu

+

+ Note that applying the class .md-menu-origin + and md-menu-align-targetattributes ensure that the menu elements align. +

+
+ {{! BEGIN-SNIPPET menu.simple-dropdown }} + + + + + {{paper-icon "local_phone"}} + + + + + {{#each items as |item|}} + + {{paper-icon item.icon}} + {{item.title}} + + {{/each}} + + + {{paper-icon "adb"}} + This is disabled. + + + + + {{#each items as |item|}} + + {{paper-icon item.icon}} {{item.title}} + + {{/each}} + + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "menu.simple-dropdown.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + + +

Menu Position Modes

+ +

+ The position attribute can be used to specify the positioning along the + x and y axis. +

+
+ {{! BEGIN-SNIPPET menu.position-modes }} + +
+
+

Target Mode Positioning (default)

+ - - {{paper-icon "local_phone"}} + + {{paper-icon "local_phone" class="md-menu-origin"}} - + {{#each items as |item|}} - {{paper-icon item.icon}} + {{paper-icon item.icon class="md-menu-align-target"}} {{item.title}} {{/each}} + - - {{paper-icon "adb"}} - This is disabled. - + +
- +
+

Target mode with offset

+ + + + {{paper-icon "local_phone" class="md-menu-origin"}} + + + {{#each items as |item|}} - {{paper-icon item.icon}} {{item.title}} + {{paper-icon item.icon class="md-menu-align-target"}} + {{item.title}} {{/each}} - {{! END-SNIPPET }}
-

Template

- - - - - - - -

Menu Position Modes

- -

- The position attribute can be used to specify the positioning along the - x and y axis. -

- -
- {{! BEGIN-SNIPPET menu.position-modes }} - -
-
-

Target Mode Positioning (default)

- - - - {{paper-icon "local_phone" class="md-menu-origin"}} - - - - - {{#each items as |item|}} - - {{paper-icon item.icon class="md-menu-align-target"}} - {{item.title}} - - {{/each}} - - - -
- -
-

Target mode with offset

- - - - {{paper-icon "local_phone" class="md-menu-origin"}} - - - - - {{#each items as |item|}} - - {{paper-icon item.icon class="md-menu-align-target"}} - {{item.title}} - - {{/each}} - - -
- -
-

position="target-right target"

- - - - {{paper-icon "local_phone" class="md-menu-origin"}} - - - - - {{#each items as |item|}} - -

{{item.title}}

- {{paper-icon item.icon class="md-menu-align-target"}} - - {{/each}} - {{#each items as |item|}} - -

{{item.title}}

- {{paper-icon item.icon class="md-menu-align-target"}} - - {{/each}} - {{#each items as |item|}} - -

{{item.title}}

- {{paper-icon item.icon class="md-menu-align-target"}} - - {{/each}} - - -
-
- {{! END-SNIPPET }} -
+
+

position="target-right target"

+ + + + {{paper-icon "local_phone" class="md-menu-origin"}} + + + + {{#each items as |item|}} + +

{{item.title}}

+ {{paper-icon item.icon class="md-menu-align-target"}} + + {{/each}} + {{#each items as |item|}} + +

{{item.title}}

+ {{paper-icon item.icon class="md-menu-align-target"}} + + {{/each}} + {{#each items as |item|}} + +

{{item.title}}

+ {{paper-icon item.icon class="md-menu-align-target"}} + + {{/each}} + + +
+
+ {{! END-SNIPPET }} +
+ +

+ Use the position attribute to set where the menu should appear. The position attribute + should be used together with .md-menu-origin and .md-menu-align-target + classes to specify where it should position itself in respect to origin and align-target. +

+ {{#let (get-code-snippet "menu.position-modes.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + + +

Different Widths

+ +

+ paper-menu-content may specify a width attribute which will follow the + official spec. +

+ +
+ {{! BEGIN-SNIPPET menu.different-widths }} +
+
+

Wide menu (width=6)

+ + + + {{paper-icon "local_phone" class="md-menu-origin"}} + + -

Template

-

- Use the position attribute to set where the menu should appear. The position attribute - should be used together with .md-menu-origin and .md-menu-align-target - classes to specify where it should position itself in respect to origin and align-target. -

- - - - - - - - - - -

Different Widths

- -

- paper-menu-content may specify a width attribute which will follow the - official spec. -

- -
- {{! BEGIN-SNIPPET menu.different-widths }} - -
-
-

Wide menu (width=6)

- - - - {{paper-icon "local_phone" class="md-menu-origin"}} - - - - - {{#each options as |item|}} - - Option {{item}} - - {{/each}} - - -
- -
-

Medium menu (width=4)

- - - - {{paper-icon "local_phone" class="md-menu-origin"}} - - - - - {{#each options as |item|}} - - Option {{item}} - - {{/each}} - - -
- -
-

Small menu (width=2)

- - - - {{paper-icon "local_phone" class="md-menu-origin"}} - - - - - {{#each options as |item|}} - - Option {{item}} - - {{/each}} - - -
-
- {{! END-SNIPPET }} + + {{#each options as |item|}} + + Option {{item}} + + {{/each}} + +
-

Template

- - - - - - - - -

Dense menu

- -

- paper-menu-content may specify a `dense` boolean attribute. -

- -
- {{! BEGIN-SNIPPET menu.dense }} - -
-
-

Dense menu (dense=true)

- - - - {{paper-icon "local_phone" class="md-menu-origin"}} - - - - - {{#each options as |item|}} - - Option {{item}} - - {{/each}} - - -
-
- {{! END-SNIPPET }} +
+

Medium menu (width=4)

+ + + + {{paper-icon "local_phone" class="md-menu-origin"}} + + + + + {{#each options as |item|}} + + Option {{item}} + + {{/each}} + +
-

Template

- +
+

Small menu (width=2)

+ + + + {{paper-icon "local_phone" class="md-menu-origin"}} + + - - + + {{#each options as |item|}} + + Option {{item}} + + {{/each}} + + +
+
+ {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "menu.different-widths.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + + +

Dense menu

+ +

+ paper-menu-content may specify a `dense` boolean attribute. +

+
+ {{! BEGIN-SNIPPET menu.dense }} +
+
+

Dense menu (dense=true)

+ + + + {{paper-icon "local_phone" class="md-menu-origin"}} + + + + + {{#each options as |item|}} + + Option {{item}} + + {{/each}} + + +
+
+

Dense menu (dense=false)

+ + + + {{paper-icon "local_phone" class="md-menu-origin"}} + + - + + {{#each options as |item|}} + + Option {{item}} + + {{/each}} + + +
+
+ {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "menu.dense.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + diff --git a/tests/dummy/app/templates/components/progress-circular.hbs b/tests/dummy/app/templates/components/progress-circular.hbs deleted file mode 100644 index 35c53a7e8..000000000 --- a/tests/dummy/app/templates/components/progress-circular.hbs +++ /dev/null @@ -1,66 +0,0 @@ - -

Basic Usage

-

Determinate

-

For operations where the percentage of the operation completed can be determined, use a determinate indicator. They give users a quick sense of how long an operation will take.

-
- {{! BEGIN-SNIPPET progress-circular.determinate }} - - {{! END-SNIPPET }} -
- -

Indeterminate

-

For operations where the user is asked to wait a moment while something finishes up, and it’s not necessary to expose what's happening behind the scenes and how long it will take, use an indeterminate indicator.

-
- {{! BEGIN-SNIPPET progress-circular.indeterminate }} - - {{! END-SNIPPET }} -
- - -

Theming

- -
- {{! BEGIN-SNIPPET progress-circular.theming }} - - - - - - {{! END-SNIPPET }} -
- - -

Playground

- -
- {{! BEGIN-SNIPPET progress-circular.playground }} -
- -
-
- - Indeterminate - - - Disabled - -
- Value ({{if sliderValue sliderValue "null"}}) - -
- -
- Diameter ({{sliderDiameter}}) - -
- -
- Stroke ratio ({{strokeRatio}}) - -
- -
- {{! END-SNIPPET }} -
- - diff --git a/tests/dummy/app/templates/components/progress-linear.hbs b/tests/dummy/app/templates/components/progress-linear.hbs deleted file mode 100644 index 76c66835f..000000000 --- a/tests/dummy/app/templates/components/progress-linear.hbs +++ /dev/null @@ -1,31 +0,0 @@ - -

Basic Usage

- -

Determinate mode

-

For operations where the percentage of the operation completed can be determined, use a determinate indicator. They give users a quick sense of how long an operation will take.

- {{! BEGIN-SNIPPET progress-linear.determinate }} - - {{! END-SNIPPET }} - - -

Indeterminate mode

-

For operations where the user is asked to wait a moment while something finishes up, and it's not necessary to expose what's happening behind the scenes and how long it will take, use an indeterminate indicator:

- {{! BEGIN-SNIPPET progress-linear.indeterminate }} - - {{! END-SNIPPET }} - - -

Buffer mode

-

For operations where the user wants to indicate some activity or loading from the server, use the buffer indicator:

- {{! BEGIN-SNIPPET progress-linear.buffer }} - - {{! END-SNIPPET }} - - -

Query mode

-

For situations where the user wants to indicate pre-loading (until the loading can actually be made), use the query indicator:

- {{! BEGIN-SNIPPET progress-linear.query }} - - {{! END-SNIPPET }} - - diff --git a/tests/dummy/app/templates/components/radio.hbs b/tests/dummy/app/templates/components/radio.hbs deleted file mode 100644 index 1c50b7866..000000000 --- a/tests/dummy/app/templates/components/radio.hbs +++ /dev/null @@ -1,69 +0,0 @@ - - - -

Basic Usage

-

- Stand alone -

-
- {{! BEGIN-SNIPPET radio.standalone-usage }} - - Toggable - - - - Disabled - - {{! END-SNIPPET }} -
-

Template

- -
- -

- Selected Value: {{selectedFruit}} -

- - {{! BEGIN-SNIPPET radio.basic-group-usage}} - - Apple - Banana - Mango - - {{! END-SNIPPET }} - -

Template

- -
- -

- Graphic radio buttons -

- {{! BEGIN-SNIPPET radio.images }} - - - -

Selected Value: {{selectedGraphic}}

- - - - example1 - - - - example2 - - - - example3 - - - - {{! END-SNIPPET }} - -

Template

- - - - - diff --git a/tests/dummy/app/templates/components/toast.hbs b/tests/dummy/app/templates/components/toast.hbs index 255fa727f..fc296ab9d 100644 --- a/tests/dummy/app/templates/components/toast.hbs +++ b/tests/dummy/app/templates/components/toast.hbs @@ -1,202 +1,185 @@ - - - - -

Component Usage

- - - - - - - -
- + + +

Component Usage

+ +

Playground

+
+ {{! BEGIN-SNIPPET toast.component }} + {{#if showToast}} + + Hello + Undo + + {{/if}} + + {{#if showToastWithout}} + + Hello + + {{/if}} + {{! END-SNIPPET }} + +

Open a toast over the app's content. Press escape, swipe or timeout to close the toast.

+ +
+ + Open toast with accent button + + + + Open toast +
-
-
- -

Open a toast over the app's content. Press escape, swipe or timeout to close the toast.

- -
- - Open toast with accent button - - - - Open toast - -
- -

Options

-
- -
- - Left - Right - -
-
- - Top - Bottom - -
-
- - capsule - -
-
- - swipeToClose - -
-
- -

duration

-
- {{paper-icon "watch later"}} - - -
- - {{paper-api - (p-section - (p-row "parent" "element or selector" "Existing element where the modal and backdrop will be rendered") - (p-row "swipeToClose" "boolean" "Causes swiping to trigger the `onClose` handler. Defaults to `true`.") - (p-row "duration" "number or `false`" "Timeout in milliseconds, set to false to disable timeout. Defaults to `3000`") - (p-row "escapeToClose" "boolean" "Causes pressing escape to close the toast. Defaults to `false`.") - (p-row "position" "string" "Possible values are `bottom left` (default), `bottom right`, `top left` and `top right`") - (p-row "capsule" "boolean" "Controls whether the capsule class is added to the toast.Defaults to `false`") - ) - (p-section - "Actions" - (p-row "onClose" "action" "An action to be executed when the toast is closed, e.g. by pressing escape, swiping or timeout.") - ) - }} - - +

Options

+
+ +
+ + Left + Right + +
+
+ + Top + Bottom + +
+
+ + capsule + +
+
+ + swipeToClose + +
- - - - - -

Paper Toaster Service

- - - - - - - -
- +

duration ({{duration}}ms)

+
+ {{paper-icon "watch later"}} + +
+
+ + {{#let (get-code-snippet "toast.component.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +
+ {{paper-api + (p-section + (p-row "parent" "element or selector" "Existing element where the modal and backdrop will be rendered") + (p-row "swipeToClose" "boolean" "Causes swiping to trigger the `onClose` handler. Defaults to `true`.") + (p-row "duration" "number or `false`" "Timeout in milliseconds, set to false to disable timeout. Defaults to `3000`") + (p-row "escapeToClose" "boolean" "Causes pressing escape to close the toast. Defaults to `false`.") + (p-row "position" "string" "Possible values are `bottom left` (default), `bottom right`, `top left` and `top right`") + (p-row "capsule" "boolean" "Controls whether the capsule class is added to the toast.Defaults to `false`") + ) + (p-section + "Actions" + (p-row "onClose" "action" "An action to be executed when the toast is closed, e.g. by pressing escape, swiping or timeout.") + ) + }} +
+ +

Service Usage

+ +

Playground

+
+ +

Open a toast via paperToaster service and \{{paper-toaster}} component.

+ +

Options

+ +
+ + + Toast class +
+ + [none] + md-accent + md-warn + +
-
- - -

Open a toast via paperToaster service and \{{paper-toaster}} component.

- -

Options

- -
- - - Toast class -
- - [none] - md-accent - md-warn - -
-
- -
- - Open toast - - - Open toast with action - -
-
    - {{#each paperToaster.queue as |toast index|}} -
  • - "{{toast.text}}" - - {{#if (eq index 0)}} - {{#if toast.show}} - showing for {{toast.duration}}ms - {{else}} - (Removing...) - {{/if}} +
    + + Open toast + + + Open toast with action + +
    + + {{#each paperToaster.queue as |toast index|}} + +

    + "{{toast.text}}" - + {{#if (eq index 0)}} + {{#if toast.show}} + showing for {{toast.duration}}ms {{else}} - (Waiting) + (Removing...) {{/if}} - - Cancel - -

    • - {{/each}} -
- - {{paper-api - (p-section - "Methods" - (p-row "show(text[, options])" "Toast" "Display a toast that renders given text.") - (p-row "showComponent(componentName[, options])" "Toast" "Display a toast that renders a component.") - (p-row "cancelToast(toast)" "" "Closes or cancel a given toast.") - ) - (p-section - "Options" - (p-row "duration" "number or `false`" "Timeout in milliseconds. Defaults to `3000`. Use `false` to keep it open until a `cancelToast` is used.") - (p-row "onClose" "function" "You can pass in a function the will be called back after the toast closes.") - (p-row "position" "string" "Possible values are `bottom left` (default), `bottom right`, `top left` and `top right`") - (p-row "toastClass" "string" "CSS class to be applied to the md-toast element") - (p-row "action.label" "string" "The label of the action button.") - (p-row "action.primary" "boolean" "Wether or not you want the action button to be higlighted with the primary color.") - (p-row "action.accent" "boolean" "Wether or not you want the action button to be higlighted with the accent color.") - (p-row "action.warn" "boolean" "Wether or not you want the action button to be higlighted with the warn color.") - (p-row "action.onClick" "function" "This function gets called when the button is pressed.") - ) - }} - -

Application defaults

- -

- You can define a default duration, toastClass - and position for your application by adding in your - config/environment.js file: -

- - - - -
- - + {{else}} + (Waiting) + {{/if}} +

+
+ + Cancel + +
+ + {{/each}} + +
+ + {{#let (get-code-snippet "toast.component.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +
+ {{paper-api + (p-section + "Methods" + (p-row "show(text[, options])" "Toast" "Display a toast that renders given text.") + (p-row "showComponent(componentName[, options])" "Toast" "Display a toast that renders a component.") + (p-row "cancelToast(toast)" "" "Closes or cancel a given toast.") + ) + (p-section + "Options" + (p-row "duration" "number or `false`" "Timeout in milliseconds. Defaults to `3000`. Use `false` to keep it open until a `cancelToast` is used.") + (p-row "onClose" "function" "You can pass in a function the will be called back after the toast closes.") + (p-row "position" "string" "Possible values are `bottom left` (default), `bottom right`, `top left` and `top right`") + (p-row "toastClass" "string" "CSS class to be applied to the md-toast element") + (p-row "action.label" "string" "The label of the action button.") + (p-row "action.primary" "boolean" "Wether or not you want the action button to be higlighted with the primary color.") + (p-row "action.accent" "boolean" "Wether or not you want the action button to be higlighted with the accent color.") + (p-row "action.warn" "boolean" "Wether or not you want the action button to be higlighted with the warn color.") + (p-row "action.onClick" "function" "This function gets called when the button is pressed.") + ) + }} + +

Application defaults

+ +

+ You can define a default duration, toastClass + and position for your application by adding in your + config/environment.js file: +

+
- - -{{! BEGIN-SNIPPET toast }} -{{#if showToast}} - - Hello - Undo - -{{/if}} - -{{#if showToastWithout}} - - Hello - -{{/if}} -{{! END-SNIPPET }} + diff --git a/tests/dummy/app/templates/components/toggles.hbs b/tests/dummy/app/templates/components/toggles.hbs index 72daf1dcb..287ca3388 100644 --- a/tests/dummy/app/templates/components/toggles.hbs +++ b/tests/dummy/app/templates/components/toggles.hbs @@ -1 +1,121 @@ -// put checkbox, radiobox, switch + + + {{! BEGIN-SNIPPET switch }} + + {{booleanProp1}} + + + + {{booleanProp2}} + + + + Disabled switch + + + + Noink switch + + + + {{! END-SNIPPET }} + + {{! BEGIN-SNIPPET checkbox }} +
+ + A checkbox: {{value1}} + + + + A checkbox: {{if value2 "yep" "nope"}} + + + + Checkbox (disabled) + + + + Checkbox (disabled and value) + + + + Checkbox (no ink) + + + + + + Indeterminate checkbox + + + + Indeterminate checkbox (disabled) + +
+ {{! END-SNIPPET }} + + + +

Basic Usage

+

+ Stand alone +

+
+ {{! BEGIN-SNIPPET radio.standalone-usage }} + + Toggable + + + + Disabled + + {{! END-SNIPPET }} +
+

Template

+
+ +

+ Selected Value: {{selectedFruit}} +

+ + {{! BEGIN-SNIPPET radio.basic-group-usage}} + + Apple + Banana + Mango + + {{! END-SNIPPET }} + +

Template

+
+ +

+ Graphic radio buttons +

+ {{! BEGIN-SNIPPET radio.images }} + + + +

Selected Value: {{selectedGraphic}}

+ + + + example1 + + + + example2 + + + + example3 + + + + {{! END-SNIPPET }} + +

Template

+ + + + diff --git a/tests/dummy/app/templates/theme.hbs b/tests/dummy/app/templates/theme.hbs index 6fcdbcf43..9b34dbeaf 100644 --- a/tests/dummy/app/templates/theme.hbs +++ b/tests/dummy/app/templates/theme.hbs @@ -18,7 +18,7 @@ To customize the default theme, you can override the sass variables for each intention:

- +

As you can see, you can just specify a name string for the palette you want, if that palette @@ -81,7 +81,7 @@ Here is the definition of the "teal" palette, applied to the primary intention:

- +
You can find some material palette generators online. Example: http://mcg.mbitson.com/. @@ -109,7 +109,7 @@ Here is an example of using these functions:

- +

Changing themes at runtime

@@ -154,7 +154,7 @@

Here is the code used for these actions:

- +

Browser support

@@ -171,7 +171,7 @@ such fallback values:

- +

Generating palettes based on a color

From b25884928235b0f80f88421d1783f51f71cf89a7 Mon Sep 17 00:00:00 2001 From: Gabriel Csapo Date: Tue, 9 Jun 2020 23:59:45 -0700 Subject: [PATCH 4/9] converts more usages to octane and adds TOC for demo pages --- package.json | 2 +- tests/dummy/app/components/doc.hbs | 8 + tests/dummy/app/components/toc.hbs | 7 + tests/dummy/app/components/toc.js | 43 +++ .../app/controllers/{ => components}/forms.js | 38 ++- .../app/controllers/components/select.js | 49 +-- .../app/controllers/components/sidenav.js | 12 +- .../app/controllers/components/slider.js | 38 +-- .../app/controllers/components/speed-dial.js | 16 +- .../dummy/app/controllers/components/tabs.js | 105 +++--- .../app/controllers/components/tooltip.js | 15 +- tests/dummy/app/routes/application.js | 11 +- tests/dummy/app/routes/components/index.js | 4 +- tests/dummy/app/routes/components/input.js | 22 +- .../{progress-linear.js => loading.js} | 4 +- .../routes/components/progress-circular.js | 14 - tests/dummy/app/styles/app.scss | 35 ++ tests/dummy/app/styles/demo.scss | 7 - .../app/templates/components/autocomplete.hbs | 11 +- .../dummy/app/templates/components/button.hbs | 11 +- tests/dummy/app/templates/components/card.hbs | 19 +- .../dummy/app/templates/components/chips.hbs | 22 +- .../dummy/app/templates/components/dialog.hbs | 8 +- .../app/templates/components/divider.hbs | 7 +- .../dummy/app/templates/components/forms.hbs | 235 +++++++------- .../app/templates/components/grid-list.hbs | 12 +- tests/dummy/app/templates/components/icon.hbs | 13 +- .../dummy/app/templates/components/input.hbs | 13 +- tests/dummy/app/templates/components/list.hbs | 6 +- .../app/templates/components/loading.hbs | 25 +- tests/dummy/app/templates/components/menu.hbs | 5 +- .../dummy/app/templates/components/select.hbs | 129 ++++---- .../app/templates/components/sidenav.hbs | 109 +++---- .../dummy/app/templates/components/slider.hbs | 140 ++++---- .../app/templates/components/speed-dial.hbs | 301 ++++++++---------- .../dummy/app/templates/components/switch.hbs | 25 -- tests/dummy/app/templates/components/tabs.hbs | 244 +++++++------- .../dummy/app/templates/components/toast.hbs | 13 +- .../app/templates/components/toggles.hbs | 203 +++++++----- .../app/templates/components/toolbar.hbs | 171 ++++++---- .../app/templates/components/tooltip.hbs | 159 +++++---- 41 files changed, 1178 insertions(+), 1133 deletions(-) create mode 100644 tests/dummy/app/components/doc.hbs create mode 100644 tests/dummy/app/components/toc.hbs create mode 100644 tests/dummy/app/components/toc.js rename tests/dummy/app/controllers/{ => components}/forms.js (53%) rename tests/dummy/app/routes/components/{progress-linear.js => loading.js} (66%) delete mode 100644 tests/dummy/app/routes/components/progress-circular.js delete mode 100644 tests/dummy/app/templates/components/switch.hbs diff --git a/package.json b/package.json index fa4422e0f..510658fbc 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@glimmer/tracking": "^1.0.0", "babel-eslint": "^8.2.6", "broccoli-asset-rev": "^3.0.0", - "ember-cli": "~3.16.0", + "ember-cli": "~3.17.0", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-deploy": "^1.0.2", "ember-cli-deploy-build": "^1.1.1", diff --git a/tests/dummy/app/components/doc.hbs b/tests/dummy/app/components/doc.hbs new file mode 100644 index 000000000..ce973d629 --- /dev/null +++ b/tests/dummy/app/components/doc.hbs @@ -0,0 +1,8 @@ +
+ + {{yield}} + + + + +
diff --git a/tests/dummy/app/components/toc.hbs b/tests/dummy/app/components/toc.hbs new file mode 100644 index 000000000..824bdef9c --- /dev/null +++ b/tests/dummy/app/components/toc.hbs @@ -0,0 +1,7 @@ + diff --git a/tests/dummy/app/components/toc.js b/tests/dummy/app/components/toc.js new file mode 100644 index 000000000..1423043d9 --- /dev/null +++ b/tests/dummy/app/components/toc.js @@ -0,0 +1,43 @@ +import Component from '@glimmer/component'; +import { dasherize } from '@ember/string'; +import { action } from '@ember/object'; +import { A } from '@ember/array'; +import { tracked } from '@glimmer/tracking'; + +function offset(el) { + var rect = el.getBoundingClientRect(), + scrollLeft = window.pageXOffset || document.documentElement.scrollLeft, + scrollTop = window.pageYOffset || document.documentElement.scrollTop; + return { top: rect.top + scrollTop, left: rect.left + scrollLeft } +} + +export default class extends Component { + @tracked selected; + + headers = A([]); + + @action + onInsert() { + const onPageHeaders = Array.from(document.querySelectorAll(".header")); + + onPageHeaders.forEach((header) => { + const hashValue = dasherize(header.innerHTML.trim()); + header.id = hashValue; + + this.headers.pushObject({ + tagName: header.tagName, + value: header.innerHTML, + hashValue, + top: offset(header).top + }); + }); + + document.addEventListener('scroll', (e) => { + const maybeSelected = this.headers.sort((a, b) => { + return Math.abs(window.scrollY - a.top) - Math.abs(window.scrollY - b.top); + })[0]; + + this.selected = maybeSelected.hashValue; + }) + } +} diff --git a/tests/dummy/app/controllers/forms.js b/tests/dummy/app/controllers/components/forms.js similarity index 53% rename from tests/dummy/app/controllers/forms.js rename to tests/dummy/app/controllers/components/forms.js index 0ed90bd8e..50abfd501 100644 --- a/tests/dummy/app/controllers/forms.js +++ b/tests/dummy/app/controllers/components/forms.js @@ -1,8 +1,9 @@ import Controller from '@ember/controller'; +import { action } from '@ember/object'; import { A } from '@ember/array'; -export default Controller.extend({ - items: A([ +export default class extends Controller { + items = A([ { name: 'Afghanistan', code: 'AF' }, { name: 'Åland Islands', code: 'AX' }, { name: 'Albania', code: 'AL' }, @@ -13,20 +14,23 @@ export default Controller.extend({ { name: 'Anguilla', code: 'AI' }, { name: 'Antarctica', code: 'AQ' }, { name: 'Antigua and Barbuda', code: 'AG' } - ]), + ]); - actions: { - basicSubmitAction() { - this.set('firstName', ''); - this.set('lastName', ''); - this.set('age', ''); - this.set('selectedCountry', null); - }, - disabledSubmitAction() { - this.set('favoriteLetter', ''); - }, - customSubmitAction() { - this.set('favoriteNumber', ''); - } + @action + basicSubmitAction() { + this.set('firstName', ''); + this.set('lastName', ''); + this.set('age', ''); + this.set('selectedCountry', null); } -}); + + @action + disabledSubmitAction() { + this.set('favoriteLetter', ''); + } + + @action + customSubmitAction() { + this.set('favoriteNumber', ''); + } +} diff --git a/tests/dummy/app/controllers/components/select.js b/tests/dummy/app/controllers/components/select.js index f86a0836e..cab24070b 100644 --- a/tests/dummy/app/controllers/components/select.js +++ b/tests/dummy/app/controllers/components/select.js @@ -1,39 +1,46 @@ import Controller from '@ember/controller'; -import { computed } from '@ember/object'; import RSVP from 'rsvp'; import { A } from '@ember/array'; import { run } from '@ember/runloop'; -export default Controller.extend({ - - states: computed(function() { - return A('AL AK AZ AR CA CO CT DE FL GA HI ID IL IN IA KS KY LA ME MD MA MI MN MS MO MT NE NV NH NJ NM NY NC ND OH OK OR PA RI SC SD TN TX UT VT VA WA WV WI WY' - .split(' ').map((state) => ({ abbrev: state }))); - }), - - userState: computed(function() { - return this.get('states').objectAt(4); - }), - - sizes: A([ +export default class extends Controller { + sizes = A([ 'small (12-inch)', 'medium (14-inch)', 'large (16-inch)', 'insane (42-inch)' - ]), + ]); - vegetables: A([ + vegetables = A([ { name: 'Corn', checked: false }, { name: 'Onions', checked: false }, { name: 'Kale', checked: false }, { name: 'Arugula', checked: false }, { name: 'Peas', checked: false }, { name: 'Zucchini', checked: false } - ]), + ]); + + groupedToppings = Object.freeze([ + { groupName: 'Meats', options: ['Pepperoni', 'Sausage', 'Ground Beef', 'Bacon'] }, + { groupName: 'Veg', options: ['Mushrooms', 'Onion', 'Green Pepper', 'Green Olives'] } + ]); + + get states() { + return A( + 'AL AK AZ AR CA CO CT DE FL GA HI ID IL IN IA KS KY LA ME MD MA MI MN MS MO MT NE NV NH NJ NM NY NC ND OH OK OR PA RI SC SD TN TX UT VT VA WA WV WI WY' + .split(' ') + .map((state) => ({ abbrev: state })) + ); + } + + get userState() { + return this.states.objectAt(4); + } + /* * Fake promise to fetch data, here you would use ember-data, jQuery.ajax or whatever you want. */ - users: computed(function() { + get users() { return new RSVP.Promise((resolve) => { // Just wait for 800ms to 2 seconds for a fake progress, so it feels like a query. let waitMS = Math.floor(Math.random() * 2000) + 800; @@ -56,9 +63,5 @@ export default Controller.extend({ }, waitMS); }); - }), - groupedToppings: Object.freeze([ - { groupName: 'Meats', options: ['Pepperoni', 'Sausage', 'Ground Beef', 'Bacon'] }, - { groupName: 'Veg', options: ['Mushrooms', 'Onion', 'Green Pepper', 'Green Olives'] } - ]) -}); + } +} diff --git a/tests/dummy/app/controllers/components/sidenav.js b/tests/dummy/app/controllers/components/sidenav.js index 569cf68fa..0d062cef1 100644 --- a/tests/dummy/app/controllers/components/sidenav.js +++ b/tests/dummy/app/controllers/components/sidenav.js @@ -1,9 +1,9 @@ import Controller from '@ember/controller'; +import { action } from '@ember/object'; -export default Controller.extend({ - actions: { - toggle(propName) { - this.toggleProperty(propName); - } +export default class extends Controller { + @action + toggle(propName) { + this.toggleProperty(propName); } -}); \ No newline at end of file +} diff --git a/tests/dummy/app/controllers/components/slider.js b/tests/dummy/app/controllers/components/slider.js index f59d1d9a7..2de57b806 100644 --- a/tests/dummy/app/controllers/components/slider.js +++ b/tests/dummy/app/controllers/components/slider.js @@ -1,29 +1,25 @@ import Controller from '@ember/controller'; -import { computed } from '@ember/object'; import { htmlSafe } from '@ember/string'; +import { tracked } from '@glimmer/tracking'; -let color = { - red: Math.floor(Math.random() * 255), - green: Math.floor(Math.random() * 255), - blue: Math.floor(Math.random() * 255) -}; +export default class extends Controller { + @tracked red = Math.floor(Math.random() * 255); + @tracked green = Math.floor(Math.random() * 255); + @tracked blue = Math.floor(Math.random() * 255); -export default Controller.extend({ - color, + rating1 = 3; + rating2 = 2; + rating3 = 4; - colorStyle: computed('color.{red,green,blue}', function() { - return htmlSafe(`border: 1px solid #333; background: rgb(${this.get('color.red')}, ${this.get('color.green')}, ${this.get('color.blue')})`); - }), + disabled1 = 22; + disabled2 = 70; - rating1: 3, - rating2: 2, - rating3: 4, + descreteDisabled1 = 2; + discreteDisabled2 = 6; - disabled1: 22, - disabled2: 70, + isSliderDisabled = true; - descreteDisabled1: 2, - discreteDisabled2: 6, - - isSliderDisabled: true -}); + get colorStyle() { + return htmlSafe(`border: 1px solid #333; background: rgb(${this.red}, ${this.green}, ${this.blue})`); + } +} diff --git a/tests/dummy/app/controllers/components/speed-dial.js b/tests/dummy/app/controllers/components/speed-dial.js index 58dd2ef50..acc6f5f3e 100644 --- a/tests/dummy/app/controllers/components/speed-dial.js +++ b/tests/dummy/app/controllers/components/speed-dial.js @@ -1,12 +1,12 @@ import Controller from '@ember/controller'; +import { action } from '@ember/object'; -export default Controller.extend({ - animation: 'fling', - direction: 'down', +export default class extends Controller { + animation = 'fling'; + direction = 'down'; - actions: { - toggle(propName) { - this.toggleProperty(propName); - } + @action + toggle(propName) { + this.toggleProperty(propName); } -}); \ No newline at end of file +} diff --git a/tests/dummy/app/controllers/components/tabs.js b/tests/dummy/app/controllers/components/tabs.js index 079111fd4..ec22fd8b0 100644 --- a/tests/dummy/app/controllers/components/tabs.js +++ b/tests/dummy/app/controllers/components/tabs.js @@ -1,8 +1,8 @@ -import { inject as service } from '@ember/service'; -import { readOnly, reads } from '@ember/object/computed'; import Controller from '@ember/controller'; -import { computed } from '@ember/object'; +import { inject as service } from '@ember/service'; import { A } from '@ember/array'; +import { tracked } from '@glimmer/tracking'; +import { action } from '@ember/object'; const LOREM = ` Lorem ipsum dolor sit amet, consectetur adipiscing elit. @@ -11,60 +11,59 @@ const LOREM = ` Maecenas lectus est, sollicitudin consectetur felis nec, feugiat ultricies mi.\n `; -export default Controller.extend({ - borderBottom: true, - - selectedBasicTab: 0, - - router: service(), - - currentRouteName: readOnly('router.currentRouteName'), - - chapters: computed(function() { - let tabs = A(); - for (let i = 1; i < 5; i++) { - tabs.push({ - index: i, - title: `Chapter ${i}`, - body: LOREM.repeat(i) - }); - } +function getChapters() { + let tabs = A(); - return tabs; - }), + for (let i = 1; i < 5; i++) { + tabs.push({ + index: i, + title: `Chapter ${i}`, + body: LOREM.repeat(i) + }); + } - selectedChapter: reads('chapters.firstObject'), + return tabs; +} - actions: { - toggle(propName) { - this.toggleProperty(propName); - }, +export default class extends Controller { + chapters = getChapters(); + @tracked borderBottom = true; + @tracked selectedChapter = this.chapters.firstObject; + @tracked selectedBasicTab = 0; + @service router; - addChapter() { - let index = Math.max(...this.get('chapters').mapBy('index')) + 1; - let chapter = { - index, - title: this.get('newTitle'), - body: this.get('newContent') - }; - this.get('chapters').pushObject(chapter); - this.set('selectedChapter', chapter); - this.setProperties({ - newTitle: '', - newContent: '' - }); - }, + @action + toggle(propName) { + this.toggleProperty(propName); + } - removeChapter(t) { - if (this.get('selectedChapter') === t) { - let chapters = this.get('chapters'); - let index = chapters.indexOf(t); - let newSelection = chapters.objectAt(index + 1) || chapters.objectAt(index - 1); - this.set('selectedChapter', newSelection); - } - this.get('chapters').removeObject(t); - }, + @action + addChapter() { + let index = Math.max(...this.chapters.mapBy('index')) + 1; + let chapter = { + index, + title: this.newTitle, + body: this.newContent, + }; + this.chapters.pushObject(chapter); + this.selectedChapter = chapter; + this.setProperties({ + newTitle: '', + newContent: '' + }); + } - noop() {} + @action + removeChapter(t) { + if (this.selectedChapter === t) { + let chapters = this.chapters; + let index = chapters.indexOf(t); + let newSelection = chapters.objectAt(index + 1) || chapters.objectAt(index - 1); + this.selectedChapter = newSelection; + } + this.chapters.removeObject(t); } -}); + + @action + noop() {} +} diff --git a/tests/dummy/app/controllers/components/tooltip.js b/tests/dummy/app/controllers/components/tooltip.js index 42969126f..2fa756a97 100644 --- a/tests/dummy/app/controllers/components/tooltip.js +++ b/tests/dummy/app/controllers/components/tooltip.js @@ -1,11 +1,12 @@ import Controller from '@ember/controller'; +import { action } from '@ember/object'; +import { tracked } from '@glimmer/tracking'; -export default Controller.extend({ - position: 'bottom', +export default class extends Controller { + @tracked position = 'bottom'; - actions: { - toggle(propName) { - this.toggleProperty(propName); - } + @action + toggle(propName) { + this.toggleProperty(propName); } -}); \ No newline at end of file +} diff --git a/tests/dummy/app/routes/application.js b/tests/dummy/app/routes/application.js index 8ba24d327..7d62f8945 100644 --- a/tests/dummy/app/routes/application.js +++ b/tests/dummy/app/routes/application.js @@ -1,12 +1,3 @@ import Route from '@ember/routing/route'; -export default Route.extend({ - actions: { - willTransition() { - this.controller.set('drawerOpen', false); - }, - alertValue(value) { - alert(`You clicked Radio button: ${value}`); - } - } -}); +export default class extends Route {} diff --git a/tests/dummy/app/routes/components/index.js b/tests/dummy/app/routes/components/index.js index a49db4500..ac5b24e92 100644 --- a/tests/dummy/app/routes/components/index.js +++ b/tests/dummy/app/routes/components/index.js @@ -1,7 +1,7 @@ import Route from '@ember/routing/route'; -export default Route.extend({ +export default class extends Route { beforeModel() { this.transitionTo('components.autocomplete') } -}); +} diff --git a/tests/dummy/app/routes/components/input.js b/tests/dummy/app/routes/components/input.js index cd1587500..ee852678d 100644 --- a/tests/dummy/app/routes/components/input.js +++ b/tests/dummy/app/routes/components/input.js @@ -1,20 +1,18 @@ import Route from '@ember/routing/route'; +import { action } from '@ember/object'; -export default Route.extend({ +export default class extends Route { model() { // Create a new record for demonstration purposes. Normally, data // would be retrieved from the store via find or findAll. return this.store.createRecord('user', {}); - }, - - actions: { - - willTransition() { - // Clean up the record created for demonstration purposes. - let record = this.modelFor('demo.input'); - record.rollbackAttributes(); - this.store.unloadRecord(record); - } + } + @action + willTransition() { + // Clean up the record created for demonstration purposes. + let record = this.modelFor('components.input'); + record.rollbackAttributes(); + this.store.unloadRecord(record); } -}); +} diff --git a/tests/dummy/app/routes/components/progress-linear.js b/tests/dummy/app/routes/components/loading.js similarity index 66% rename from tests/dummy/app/routes/components/progress-linear.js rename to tests/dummy/app/routes/components/loading.js index 791b2ffea..7afff6e7e 100644 --- a/tests/dummy/app/routes/components/progress-linear.js +++ b/tests/dummy/app/routes/components/loading.js @@ -4,11 +4,11 @@ import { on } from '@ember/object/evented'; export default Route.extend({ onActivate: on('activate', function() { - this.controllerFor('demo.progress-linear').start(); + this.controllerFor('components.loading').start(); }), onDeactivate: on('deactivate', function() { - this.controllerFor('demo.progress-linear').stop(); + this.controllerFor('components.loading').stop(); }) }); diff --git a/tests/dummy/app/routes/components/progress-circular.js b/tests/dummy/app/routes/components/progress-circular.js deleted file mode 100644 index d71d9d026..000000000 --- a/tests/dummy/app/routes/components/progress-circular.js +++ /dev/null @@ -1,14 +0,0 @@ -import Route from '@ember/routing/route'; -import { on } from '@ember/object/evented'; - -export default Route.extend({ - - onActivate: on('activate', function() { - this.controllerFor('demo.progress-circular').start(); - }), - - onDeactivate: on('deactivate', function() { - this.controllerFor('demo.progress-circular').stop(); - }) - -}); diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss index 4a82f290e..d55b8873a 100644 --- a/tests/dummy/app/styles/app.scss +++ b/tests/dummy/app/styles/app.scss @@ -52,3 +52,38 @@ pre.code-block { color: #ffffff; } } + +.toc { + margin: 0; + margin-top: 10px; + margin-left: 10px; + padding: 0; + list-style: none; + position: fixed; + + li { + width: 100%; + height: auto; + min-height: 32px; + border-left: 2px solid rgba(0, 0, 0, 0.12); + + a { + padding: 8px 0 8px 16px; + line-height: 1.5; + font-weight: 400; + text-decoration: none; + color: #616161; + } + } + + .toc--selected { + border-left: 2px solid #212121; + opacity: 1; + font-weight: 700; + letter-spacing: 0; + + a { + color: #212121; + } + } +} diff --git a/tests/dummy/app/styles/demo.scss b/tests/dummy/app/styles/demo.scss index 0afba51cb..0b4039b00 100644 --- a/tests/dummy/app/styles/demo.scss +++ b/tests/dummy/app/styles/demo.scss @@ -60,13 +60,6 @@ td { background: rgb(238,238,238); } -.header { - background-color: #106CC8; - color: white; - text-align: center; - font-weight: bold; -} - .flex-start { align-self: flex-start; } diff --git a/tests/dummy/app/templates/components/autocomplete.hbs b/tests/dummy/app/templates/components/autocomplete.hbs index 08d37c19b..0920226f5 100644 --- a/tests/dummy/app/templates/components/autocomplete.hbs +++ b/tests/dummy/app/templates/components/autocomplete.hbs @@ -1,5 +1,6 @@ - -

Basic Usage

+ +

Autocomplete

+

Basic Usage

Use \{{paper-autocomplete}} to search for matches from local or remote data sources.
@@ -44,7 +45,7 @@ {{/let}} -

Block Custom template

+

Block Custom template

Use \{{paper-autocomplete}} with custom templates to show styled autocomplete results.
@@ -79,7 +80,7 @@ {{/let}} -

Floating Label

+

Floating Label

The following example demonstrates floating labels being used as a normal form element.
@@ -117,4 +118,4 @@ {{snippet.source}} {{/let}} - + diff --git a/tests/dummy/app/templates/components/button.hbs b/tests/dummy/app/templates/components/button.hbs index da1ddeb6e..852de9025 100644 --- a/tests/dummy/app/templates/components/button.hbs +++ b/tests/dummy/app/templates/components/button.hbs @@ -1,4 +1,7 @@ - + +

Button

+ +

Basic Usage

{{! BEGIN-SNIPPET button.basic }} Button with action @@ -16,6 +19,7 @@ {{/let}} +

Raised

{{! BEGIN-SNIPPET button.raised }} Button with action @@ -32,6 +36,7 @@ {{/let}} +

Target

{{! BEGIN-SNIPPET button.target }} Button with target @@ -46,6 +51,7 @@ {{/let}} +

Fab

{{! BEGIN-SNIPPET button.fab }} Fab @@ -88,5 +94,4 @@ "color" }}
- - + diff --git a/tests/dummy/app/templates/components/card.hbs b/tests/dummy/app/templates/components/card.hbs index 57e38d7f6..e85c5d2a8 100644 --- a/tests/dummy/app/templates/components/card.hbs +++ b/tests/dummy/app/templates/components/card.hbs @@ -1,5 +1,6 @@ - -

Basic Usage

+ +

Card

+

Basic Usage

{{! BEGIN-SNIPPET card.basic }} @@ -43,7 +44,7 @@ {{/let}} -

Card Action Buttons

+

Card Action Buttons

{{! BEGIN-SNIPPET card.action-buttons }} @@ -93,7 +94,7 @@ {{/let}} -

In Card Actions

+

In Card Actions

{{! BEGIN-SNIPPET card.in-card-actions }} @@ -126,12 +127,4 @@ {{snippet.source}} {{/let}} - -
- {{paper-api - (p-section - (p-row "tbd" "tbd" "tbd") - ) - }} -
- + diff --git a/tests/dummy/app/templates/components/chips.hbs b/tests/dummy/app/templates/components/chips.hbs index 1c85c883c..755f9cc6b 100644 --- a/tests/dummy/app/templates/components/chips.hbs +++ b/tests/dummy/app/templates/components/chips.hbs @@ -1,5 +1,5 @@ - - + +

Chips

Read Only @@ -17,10 +17,10 @@ {{/let}} -

Custom Template

+

Custom Template

{{! BEGIN-SNIPPET chips.custom }} - + {{item}} (fruit) @@ -33,10 +33,10 @@ {{/let}} -

Chips with Autocomplete

+

Chips with Autocomplete

{{! BEGIN-SNIPPET chips.autocomplete }} - + {{item.name}} {{#if item.family}} {{item.family}} @@ -51,7 +51,7 @@ {{/let}} -

Chips with Autocomplete (requires match)

+

Chips with Autocomplete (requires match)

{{! BEGIN-SNIPPET chips.autocomplete-requires-match }} @@ -65,10 +65,10 @@ {{/let}} -

Contact Chips

+

Contact Chips

{{! BEGIN-SNIPPET chips.contact }} - + {{! END-SNIPPET }}
@@ -87,7 +87,7 @@ {{/let}} -

Contact Alt Chips

+

Contact Alt Chips

{{! BEGIN-SNIPPET chips.contact-alt }} @@ -100,4 +100,4 @@ {{/let}} - + diff --git a/tests/dummy/app/templates/components/dialog.hbs b/tests/dummy/app/templates/components/dialog.hbs index 847567a5b..8c70a8122 100644 --- a/tests/dummy/app/templates/components/dialog.hbs +++ b/tests/dummy/app/templates/components/dialog.hbs @@ -1,5 +1,7 @@ - + +

Dialog

+

Custom

{{#if showDialog}} @@ -45,6 +47,7 @@ {{/let}} +

Prompt

{{#if showPromptDialog}} @@ -83,6 +86,7 @@ {{/let}} +

Animated

{{#if showAnimatedDialog}} @@ -135,4 +139,4 @@ ) }}
- + diff --git a/tests/dummy/app/templates/components/divider.hbs b/tests/dummy/app/templates/components/divider.hbs index 2a7792c6d..41f1e2ee8 100644 --- a/tests/dummy/app/templates/components/divider.hbs +++ b/tests/dummy/app/templates/components/divider.hbs @@ -1,5 +1,7 @@ - + +

Divider

+

Full

{{! BEGIN-SNIPPET divider.full }} @@ -24,6 +26,7 @@ {{/let}} +

Inset

{{! BEGIN-SNIPPET divider.inset }} @@ -48,4 +51,4 @@ {{/let}} - + diff --git a/tests/dummy/app/templates/components/forms.hbs b/tests/dummy/app/templates/components/forms.hbs index 591fed29b..466fa72f8 100644 --- a/tests/dummy/app/templates/components/forms.hbs +++ b/tests/dummy/app/templates/components/forms.hbs @@ -1,130 +1,109 @@ - - - - - - - -

Basic usage

- - - - -

- ember-paper provides a paper-form to help you build forms - and keep track of the form's global validity state. This component uses - the html form tag by default, so expected form behavior will occur. - (For example, pressing the enter key from within one of the form's - inputs will submit the form.) - paper-form yields paper-input, - paper-select - and paper-autocomplete controls. - In the following example you can see how we use the yielded form controls: -

- - {{! BEGIN-SNIPPET form.basic-usage }} - -
-
- - -
-
- - - - -
+ +

Forms

+

Basic usage

+
+

+ ember-paper provides a paper-form to help you build forms + and keep track of the form's global validity state. This component uses + the html form tag by default, so expected form behavior will occur. + (For example, pressing the enter key from within one of the form's + inputs will submit the form.) + paper-form yields paper-input, + paper-select + and paper-autocomplete controls. + In the following example you can see how we use the yielded form controls: +

+ + {{! BEGIN-SNIPPET form.basic-usage }} + +
+
+ +
-
- Submit +
+ + + +
- - {{! END-SNIPPET }} - -

Template

- - - - - - - - -

Using the form validity state

- - - - - -

- A typical use case for the global validity state is to toggle the submit button - between a disabled and enabled state. Here is how you would do that with - paper-form: -

- - {{! BEGIN-SNIPPET form.disabled-submit }} - -
- -
-
- - Submit - -
- - {{! END-SNIPPET }} - -

Template

- - - - - - - - -

Advanced usage

- - - - - -

- If you prefer, you can trigger the submit action without using a submit button. - paper-form also yields an onSubmit action you - can use wherever you like, e.g:
- 

-          <button onclick=\{{action form.onSubmit}}>
-            Submit
-          </button>
-
-

- -

- You can also extend paper-input to make your own custom components - (money inputs, phone inputs, etc.) and the form validation will still - work out of the box! - Just replace paper-input with your component's name. -

- - {{! BEGIN-SNIPPET form.custom-components }} - -
- -
-
- Submit -
- - {{! END-SNIPPET }} - -

Template

- - - - - - - +
+
+ Submit +
+ + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "form.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Using the form validity state

+
+

+ A typical use case for the global validity state is to toggle the submit button + between a disabled and enabled state. Here is how you would do that with + paper-form: +

+ + {{! BEGIN-SNIPPET form.disabled-submit }} + +
+ +
+
+ + Submit + +
+ + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "form.disabled-submit.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Advanced usage

+
+

+ If you prefer, you can trigger the submit action without using a submit button. + paper-form also yields an onSubmit action you + can use wherever you like, e.g:
+ 

+        <button onclick=\{{action form.onSubmit}}>
+          Submit
+        </button>
+
+

+ +

+ You can also extend paper-input to make your own custom components + (money inputs, phone inputs, etc.) and the form validation will still + work out of the box! + Just replace paper-input with your component's name. +

+ + {{! BEGIN-SNIPPET form.custom-components }} + +
+ +
+
+ Submit +
+ + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "form.custom-components.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + diff --git a/tests/dummy/app/templates/components/grid-list.hbs b/tests/dummy/app/templates/components/grid-list.hbs index 607734524..f65ce1f2a 100644 --- a/tests/dummy/app/templates/components/grid-list.hbs +++ b/tests/dummy/app/templates/components/grid-list.hbs @@ -1,6 +1,6 @@ - - -

Basic Usage

+ +

Grid

+

Basic Usage

@@ -54,7 +54,7 @@ {{/let}} -

Dynamic Tiles

+

Dynamic Tiles

{{! BEGIN-SNIPPET grid-list.dynamic-tiles }} @@ -78,7 +78,7 @@ {{/let}} -

Responsive and Animated Usage

+

Responsive and Animated Usage

{{! BEGIN-SNIPPET grid-list.responsive }} @@ -97,4 +97,4 @@ {{/let}} - + diff --git a/tests/dummy/app/templates/components/icon.hbs b/tests/dummy/app/templates/components/icon.hbs index c0aeb83b1..53e0c8ce1 100644 --- a/tests/dummy/app/templates/components/icon.hbs +++ b/tests/dummy/app/templates/components/icon.hbs @@ -1,12 +1,11 @@ - - -

Available Icons

+ +

Icon

See the Material Icons page for an overview of available icons.

-

Basic Icons

+

Basic Icons

{{! BEGIN-SNIPPET icons.basic-usage }} @@ -19,7 +18,7 @@ {{/let}} -

Changing Sizes

+

Changing Sizes

{{! BEGIN-SNIPPET icons.sizes }} @@ -36,7 +35,7 @@ {{/let}} -

Spinners

+

Spinners

{{! BEGIN-SNIPPET icons.spinners }} @@ -49,4 +48,4 @@ {{snippet.source}} {{/let}} - + diff --git a/tests/dummy/app/templates/components/input.hbs b/tests/dummy/app/templates/components/input.hbs index a632f8547..a501c8ce3 100644 --- a/tests/dummy/app/templates/components/input.hbs +++ b/tests/dummy/app/templates/components/input.hbs @@ -1,4 +1,4 @@ - + {{! BEGIN-SNIPPET input.basic-usage}}
@@ -45,7 +45,6 @@ {{! END-SNIPPET }}

Template

-

About Required. @@ -68,7 +67,6 @@ {{! END-SNIPPET }} -

Available Attributes for Text Fields

@@ -128,7 +126,6 @@ {{#if eventName}}
The leaf controller for this route received the sent {{eventName}} action.
{{/if}} -

{{#paper-api @@ -155,7 +152,6 @@ {{/unless}} {{! END-SNIPPET }} -
{{/paper-api}} @@ -181,10 +177,8 @@

Template

-

Define your emailValidation object in your controller. -

You may also define multiple custom constraints by using an array of validation objects. @@ -194,8 +188,6 @@ {{! END-SNIPPET }}

- -

Setting validation messages from external validations

@@ -223,7 +215,6 @@ {{! END-SNIPPET }}

Template

-

The errors argument can either be an array of messages or an array of @@ -232,4 +223,4 @@ The latter format is compatible with errors from ember-data.

- + diff --git a/tests/dummy/app/templates/components/list.hbs b/tests/dummy/app/templates/components/list.hbs index 1659fd1b6..dfc42f11c 100644 --- a/tests/dummy/app/templates/components/list.hbs +++ b/tests/dummy/app/templates/components/list.hbs @@ -1,5 +1,5 @@ - - + +

List

{{! BEGIN-SNIPPET list.3-line }} @@ -298,4 +298,4 @@ {{/let}} - + diff --git a/tests/dummy/app/templates/components/loading.hbs b/tests/dummy/app/templates/components/loading.hbs index 34ae1dd5b..da1afbd8d 100644 --- a/tests/dummy/app/templates/components/loading.hbs +++ b/tests/dummy/app/templates/components/loading.hbs @@ -1,6 +1,7 @@ - -

Circlular

-

Determinate

+ +

Loading

+

Circlular

+

Determinate

For operations where the percentage of the operation completed can be determined, use a determinate indicator. They give users a quick sense of how long an operation will take.

{{! BEGIN-SNIPPET progress-circular.determinate }} @@ -14,7 +15,7 @@ {{/let}} -

Indeterminate

+

Indeterminate

For operations where the user is asked to wait a moment while something finishes up, and it’s not necessary to expose what's happening behind the scenes and how long it will take, use an indeterminate indicator.

{{! BEGIN-SNIPPET progress-circular.indeterminate }} @@ -28,7 +29,7 @@ {{/let}} -

Theming

+

Theming

{{! BEGIN-SNIPPET progress-circular.theming }} @@ -45,7 +46,7 @@ {{/let}} -

Playground

+

Playground

{{! BEGIN-SNIPPET progress-circular.playground }} @@ -81,9 +82,9 @@ {{/let}} -

Linear

+

Linear

-

Determinate mode

+

Determinate mode

For operations where the percentage of the operation completed can be determined, use a determinate indicator. They give users a quick sense of how long an operation will take.

{{! BEGIN-SNIPPET progress-linear.determinate }} @@ -97,7 +98,7 @@ {{/let}} -

Indeterminate mode

+

Indeterminate mode

For operations where the user is asked to wait a moment while something finishes up, and it's not necessary to expose what's happening behind the scenes and how long it will take, use an indeterminate indicator:

{{! BEGIN-SNIPPET progress-linear.indeterminate }} @@ -111,7 +112,7 @@ {{/let}} -

Buffer mode

+

Buffer mode

For operations where the user wants to indicate some activity or loading from the server, use the buffer indicator:

{{! BEGIN-SNIPPET progress-linear.buffer }} @@ -125,7 +126,7 @@ {{/let}} -

Query mode

+

Query mode

For situations where the user wants to indicate pre-loading (until the loading can actually be made), use the query indicator:

{{! BEGIN-SNIPPET progress-linear.query }} @@ -139,4 +140,4 @@ {{/let}} - + diff --git a/tests/dummy/app/templates/components/menu.hbs b/tests/dummy/app/templates/components/menu.hbs index ecc9b8676..61aeda3f1 100644 --- a/tests/dummy/app/templates/components/menu.hbs +++ b/tests/dummy/app/templates/components/menu.hbs @@ -1,4 +1,4 @@ - +

Simple dropdown menu

@@ -48,7 +48,6 @@

Menu Position Modes

-

The position attribute can be used to specify the positioning along the x and y axis. @@ -275,4 +274,4 @@ {{snippet.source}} {{/let}} - + diff --git a/tests/dummy/app/templates/components/select.hbs b/tests/dummy/app/templates/components/select.hbs index c6af3b2f1..1cbdc4322 100644 --- a/tests/dummy/app/templates/components/select.hbs +++ b/tests/dummy/app/templates/components/select.hbs @@ -1,50 +1,63 @@ - -

Basic Usage

+ -

Enter an address

-
- {{! BEGIN-SNIPPET select.basic-usage }} - - - - {{state.abbrev}} - - {{! END-SNIPPET }} +

Basic Usage

+
+

Enter an address

+

+ +

+
+ {{! BEGIN-SNIPPET select.basic-usage }} + + + + {{state.abbrev}} + + {{! END-SNIPPET }} +
-

- -

-

Template

- -

Paper select is based on Ember power select, advanced documentation can be found here.

- {{#paper-api - (p-section - (p-row "disabled" "boolean" "Should the select field be disabled? Default is `false`.") - (p-row "label" "string" "Field label. Same as paper-input.") - (p-row "options" "array" "List of selectable options.") - (p-row "selected" "object" "Value of selected option.") - ) - title="Select Helpers" - }} - {{/paper-api}} + {{#let (get-code-snippet "select.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +
+

Paper select is based on Ember power select, advanced documentation can be found here.

+ {{#paper-api + (p-section + (p-row "disabled" "boolean" "Should the select field be disabled? Default is `false`.") + (p-row "label" "string" "Field label. Same as paper-input.") + (p-row "options" "array" "List of selectable options.") + (p-row "selected" "object" "Value of selected option.") + ) + title="Select Helpers" + }} + {{/paper-api}} +

Option groups

-

Pick your pizza below

-
- {{! BEGIN-SNIPPET select.option-groups }} - - {{size}} - - - {{topping}} - - {{! END-SNIPPET }} +
+

Pick your pizza below

+
+ {{! BEGIN-SNIPPET select.option-groups }} + + {{size}} + + + {{topping}} + + {{! END-SNIPPET }} +
-

Template

- + {{#let (get-code-snippet "select.option-groups.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}}

Options with async search

@@ -64,9 +77,12 @@ {{! END-SNIPPET }}
-

Template

- + {{#let (get-code-snippet "select.async-search.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}}

Select with Search

Paper select can include a paper-input field at the top of the dropdown which acts as a live filter for the paper-select options. For additional documentation on search, please refer to the power-select docs here.

@@ -76,22 +92,25 @@ {{vegetable.name}} - {{! END-SNIPPET }}
-

Template

- - + {{#let (get-code-snippet "select.select-header.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} - {{#paper-api - (p-section - (p-row "searchField" "string" "Field name of provided options which search filter should compare against.") - (p-row "searchPlaceholder" "string" "Placeholder for paper-input which is displayed at top of paper-select dropdown.") - (p-row "searchEnabled" "boolean" "Enable paper-select to be searchable. Default is false.") - ) - title="Select Search Helpers" - }} - {{/paper-api}} - +
+ {{#paper-api + (p-section + (p-row "searchField" "string" "Field name of provided options which search filter should compare against.") + (p-row "searchPlaceholder" "string" "Placeholder for paper-input which is displayed at top of paper-select dropdown.") + (p-row "searchEnabled" "boolean" "Enable paper-select to be searchable. Default is false.") + ) + title="Select Search Helpers" + }} + {{/paper-api}} +
+ diff --git a/tests/dummy/app/templates/components/sidenav.hbs b/tests/dummy/app/templates/components/sidenav.hbs index ffac64bcb..1d7073f3d 100644 --- a/tests/dummy/app/templates/components/sidenav.hbs +++ b/tests/dummy/app/templates/components/sidenav.hbs @@ -1,21 +1,8 @@ - - - - - -

Basic Usage

- - - - - - - -
- -
- -
+ + +

Basic Usage

+
+ {{! BEGIN-SNIPPET sidenav.basic-usage }} @@ -28,8 +15,8 @@ - -
+
+

The left sidenav will "lock open" on a medium (>=960px wide) device. The right sidenav never "locks open" because we set lockedOpen=false. @@ -54,7 +41,7 @@

- +
@@ -64,29 +51,20 @@ Çup? I'm on the right side. - - {{! END-SNIPPET sidenav.basic-usage }} -
- - - - - - -

Persistent Sidenav

- - - {{paper-icon "code"}} - - - - -
- -
- -
+ {{! END-SNIPPET }} + +
+ + {{#let (get-code-snippet "sidenav.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Persistent

+
+ {{! BEGIN-SNIPPET sidenav.persistent }} @@ -100,7 +78,7 @@ -
+

Another way of using the sidenav is to toggle the lockedOpen state. This corresponds to the "persistent sidenav" pattern in the material spec. @@ -118,21 +96,28 @@ {{! END-SNIPPET sidenav.persistent }} -

- - - - {{paper-api - (p-section - (p-row "position" "`'left'` | `'right'`" "Pass in the string `'left'` or `'right'` to place the sidenav accordingly.") - (p-row "lockedOpen" "`matchMedia` expression" "when this expression evauluates to true, the sidenav \"locks open\".") - (p-row "open" "boolean" "Specifies if the sidenav is opened or closed. Defaults to `false`.") - (p-row "closeOnClick" "boolean" "If `true` the sidenav closes when a click event is triggered. Prevent bubbling in click events you don't want this to happen or use `false`. Defaults to `true`.") - ) - (p-section - "Actions" - (p-row "onToggle" "action" "An action to be executed when the sidenav is toggled, e.g. by when `closeOnClick` is `true` and a click happened or by using the `close` method on the service. This action gets a parameter that specifies wether this sidenav is opened or closed.") - ) - }} - - + +
+ + {{#let (get-code-snippet "sidenav.persistent.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +
+ {{paper-api + (p-section + (p-row "position" "`'left'` | `'right'`" "Pass in the string `'left'` or `'right'` to place the sidenav accordingly.") + (p-row "lockedOpen" "`matchMedia` expression" "when this expression evauluates to true, the sidenav \"locks open\".") + (p-row "open" "boolean" "Specifies if the sidenav is opened or closed. Defaults to `false`.") + (p-row "closeOnClick" "boolean" "If `true` the sidenav closes when a click event is triggered. Prevent bubbling in click events you don't want this to happen or use `false`. Defaults to `true`.") + ) + (p-section + "Actions" + (p-row "onToggle" "action" "An action to be executed when the sidenav is toggled, e.g. by when `closeOnClick` is `true` and a click happened or by using the `close` method on the service.
This action gets a parameter that specifies wether this sidenav is opened or closed.") + ) + }} +
+ + diff --git a/tests/dummy/app/templates/components/slider.hbs b/tests/dummy/app/templates/components/slider.hbs index bafcafc08..56d7abf64 100644 --- a/tests/dummy/app/templates/components/slider.hbs +++ b/tests/dummy/app/templates/components/slider.hbs @@ -1,71 +1,91 @@ - - - - -

Basic Usage

- - - - {{! BEGIN-SNIPPET slider }} -

- RGB       -

+ -
- R - - -
+

Basic Usage

+
+ {{! BEGIN-SNIPPET slider.basic-usage }} +

+ RGB       +

-
- G - - -
+
+ R + + ({{this.red}}) +
-
- B - - -
+
+ G + + ({{this.green}}) +
+ +
+ B + + ({{this.blue}}) +
+ {{! END-SNIPPET }} +
-

Rating: {{rating}}/5 - demo of theming classes

-
-
- default -
- + {{#let (get-code-snippet "slider.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Theming

+
+ {{! BEGIN-SNIPPET slider.theming }} +
+
+ default
-
-
- md-warn -
- + +
+
+
+ md-warn
-
-
- md-primary -
- + +
+
+
+ md-primary
+ +
+ {{! END-SNIPPET }} +
-

Disabled

-
- - - -
- - + {{#let (get-code-snippet "slider.theming.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Disabled

+
+ {{! BEGIN-SNIPPET slider.disabled }} + + {{! END-SNIPPET }} +
-

Disabled, Discrete

- - - {{! END-SNIPPET }} + {{#let (get-code-snippet "slider.disabled.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} -

Template

- - - +

Disabled, Discrete

+
+ {{! BEGIN-SNIPPET slider.disabled-discrete }} + + {{! END-SNIPPET }} +
- + {{#let (get-code-snippet "slider.disabled-discrete.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + diff --git a/tests/dummy/app/templates/components/speed-dial.hbs b/tests/dummy/app/templates/components/speed-dial.hbs index 073ff2c27..d411230e2 100644 --- a/tests/dummy/app/templates/components/speed-dial.hbs +++ b/tests/dummy/app/templates/components/speed-dial.hbs @@ -1,176 +1,147 @@ - -
- - - -

Basic Usage

- - - {{paper-icon "code"}} - - - - -
- + + +

Basic Usage

+
+
+
+

Direction

+ + Up + Down + Left + Right +
-
- -
- {{! BEGIN-SNIPPET speed-dial-basic-usage}} - - - - {{paper-icon "menu"}} - - - - - - - {{paper-icon "people"}} - - - - - - {{paper-icon "accessibility"}} - - - - - - {{paper-icon "check-circle"}} - - - - - {{! END-SNIPPET }} -
- - - -
- -
-

Direction

- - Up - Down - Left - Right - -
- -
-

Open/Closed

- - open - -
- -
-

Animation

- - Fling - Scale - -
- -
- - +
+

Open/Closed

+ + open +
- - -

- You may supply a direction of left, up, down, or - right through the direction attribute. Default value is down. -

-

- There are also two available animations. Specify fling or scale strings - through the animation attribute. Default value is fling. -

-

- The component can also take a open attribute and an onToggle pair, much like - paper-sidenav. Use the pair to control the open status of the speed dial. -

- - -
-
- - - -

Advanced Usage

- - - {{paper-icon "code"}} - - - - -
- +
+

Animation

+ + Fling + Scale +
-
- -
- {{! BEGIN-SNIPPET speed-dial-advanced-usage}} - - - - {{paper-icon "menu"}} - - - - - - - {{paper-icon "people"}} - - - - - - {{paper-icon "accessibility"}} - - - - - - {{paper-icon "check-circle"}} - - - - - {{! END-SNIPPET }} -
- +
+ + +
+ {{! BEGIN-SNIPPET speed-dial.basic-usage}} + + + + {{paper-icon "menu"}} + + + + + + + {{paper-icon "people"}} + + + + + + {{paper-icon "accessibility"}} + + + + + + {{paper-icon "check-circle"}} + + + + + {{! END-SNIPPET }}
- - -

- You can use the onMouseEnter and onMouseLeave actions to control - the open attribute. This results in a speed dial that opens when you hover it. -

-

- By default, it only works when you hover the speed dial's trigger. However, if you want to - open it by hovering the whole speed dial space including its actions, you can pass in - hoverFull=true. Try it with the following checkbox: -

-

- - hoverFull - -

- - +
- + +
+

+ You may supply a direction of left, up, down, or + right through the direction attribute. Default value is down. +

+

+ There are also two available animations. Specify fling or scale strings + through the animation attribute. Default value is fling. +

+

+ The component can also take a open attribute and an onToggle pair, much like + paper-sidenav. Use the pair to control the open status of the speed dial. +

+
+ + {{#let (get-code-snippet "speed-dial.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Advanced Usage

+
+
+

+ By default, it only works when you hover the speed dial's trigger. However, if you want to + open it by hovering the whole speed dial space including its actions, you can pass in + hoverFull=true. Try it with the following checkbox: +

+ + hoverFull + +
+
+ {{! BEGIN-SNIPPET speed-dial.advanced-usage}} + + + + {{paper-icon "menu"}} + + + + + + + {{paper-icon "people"}} + + + + + + {{paper-icon "accessibility"}} + + + + + + {{paper-icon "check-circle"}} + + + + + {{! END-SNIPPET }} +
+ +
+ You can use the onMouseEnter and onMouseLeave actions to control + the open attribute. This results in a speed dial that opens when you hover it. +
+
+ + {{#let (get-code-snippet "speed-dial.advanced-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + {{#if showDialog}} diff --git a/tests/dummy/app/templates/components/switch.hbs b/tests/dummy/app/templates/components/switch.hbs deleted file mode 100644 index c25f8745c..000000000 --- a/tests/dummy/app/templates/components/switch.hbs +++ /dev/null @@ -1,25 +0,0 @@ - -

- {{! BEGIN-SNIPPET switch }} - - {{booleanProp1}} - - - - {{booleanProp2}} - - - - Disabled switch - - - - Noink switch - - - - {{! END-SNIPPET }} -

-

Template

- - diff --git a/tests/dummy/app/templates/components/tabs.hbs b/tests/dummy/app/templates/components/tabs.hbs index 634e5720c..5157d50cf 100644 --- a/tests/dummy/app/templates/components/tabs.hbs +++ b/tests/dummy/app/templates/components/tabs.hbs @@ -1,68 +1,54 @@ - -
+ +

Tabs

+

Basic Usage

+
- - -

Basic Usage

- - - - - - - -
- -
- -
- - {{! BEGIN-SNIPPET basic-usage}} - - - Page One - - - Page Two (disabled) - - - Page Three - - - Page Four - - - Page Five - - - - {{#liquid-bind (hash tab=selectedBasicTab) class="md-padding" as |current|}} -

Tab {{current.tab}}

-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. - Nulla venenatis ante augue. Phasellus volutpat neque ac dui mattis - vulputate. Etiam consequat aliquam cursus. In sodales pretium ultrices. - Maecenas lectus est, sollicitudin consectetur felis nec, feugiat ultricies mi. -

- {{/liquid-bind}} - {{! END-SNIPPET }} - - - - - Center tabs - - - - Stretch tabs - - - - Border bottom - - - -
+ + {{! BEGIN-SNIPPET tabs.basic-usage}} + + + Page One + + + Page Two (disabled) + + + Page Three + + + Page Four + + + Page Five + + + + {{#liquid-bind (hash tab=selectedBasicTab) class="md-padding" as |current|}} +

Tab {{current.tab}}

+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Nulla venenatis ante augue. Phasellus volutpat neque ac dui mattis + vulputate. Etiam consequat aliquam cursus. In sodales pretium ultrices. + Maecenas lectus est, sollicitudin consectetur felis nec, feugiat ultricies mi. +

+ {{/liquid-bind}} + {{! END-SNIPPET }} + + + + + Center tabs + + + + Stretch tabs + + + + Border bottom + + +

@@ -95,44 +81,35 @@

-
+ {{#let (get-code-snippet "tabs.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Dynamic Usage

+
- - -

Dynamic Usage

- - - {{paper-icon "code"}} + + {{! BEGIN-SNIPPET tabs.dynamic-usage}} + + {{#each chapters as |chapter|}} + + {{chapter.title}} + + {{/each}} + + + {{#liquid-bind (hash tab=selectedChapter.index m=selectedChapter) class="md-padding dynamic-animation" as |current|}} +

{{current.m.title}}

+

{{current.m.body}}

+ + Remove chapter - - - -
- -
- -
- - {{! BEGIN-SNIPPET dynamic-usage}} - - {{#each chapters as |chapter|}} - - {{chapter.title}} - - {{/each}} - - - {{#liquid-bind (hash tab=selectedChapter.index m=selectedChapter) class="md-padding dynamic-animation" as |current|}} -

{{current.m.title}}

-

{{current.m.body}}

- - Remove chapter - - {{/liquid-bind}} + {{/liquid-bind}} - {{! END-SNIPPET }} - -
+ {{! END-SNIPPET }} + @@ -163,38 +140,29 @@
-
- - - -

Routable Usage

- - - - - - - -
- -
- -
- - {{! BEGIN-SNIPPET routable-usage}} - - - Index - - - Nested Route - - + {{#let (get-code-snippet "tabs.dynamic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} - {{liquid-outlet class="md-padding"}} - {{! END-SNIPPET }} - -
+

Routable Usage

+
+ + + {{! BEGIN-SNIPPET tabs.routable-usage}} + + + Index + + + Nested Route + + + + {{liquid-outlet class="md-padding"}} + {{! END-SNIPPET }} + @@ -220,19 +188,25 @@
-
+ {{#let (get-code-snippet "tabs.routable-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +
{{paper-api (p-section - (p-row "selected" "string or number" "Value of the active tab. Each tab automatically gets an index as its value. Default is `0` (the first tab active).") + (p-row "selected" "string or number" "Value of the active tab. Each tab automatically gets an index as its value.
Default is `0` (the first tab active).") (p-row "onChange" "action" "An action triggered when the active tab changes.") (p-row "accent" "boolean" "Pass `true` to enable accent color scheme.") (p-row "primary" "boolean" "Pass `true` to enable primary color scheme.") - (p-row "stretch" "boolean or matchMedia query" "Use true/false to permanently enable/disable tab stretching. You can also use a matchMedia query to enable tab stretching only at certain viewport sizes. Default value is `sm` (`(min-width: 600px) and (max-width: 959px)`).") + (p-row "stretch" "boolean or matchMedia query" "Use true/false to permanently enable/disable tab stretching.
You can also use a matchMedia query to enable tab stretching only at certain viewport sizes.
Default value is `sm` (`(min-width: 600px) and (max-width: 959px)`).") (p-row "borderBottom" "boolean" "Use true to enable border beneath tabs. Default is false.") ) (p-section "`tabs.tab` API" - (p-row "value" "string" "Value associated with the tab. To activate the tab, `selected` needs to have this value. Each tab gets a value automatically set to its index, so you don't need to use this property unless you need specific values for some special case.") + (p-row "value" "string" "Value associated with the tab. To activate the tab, `selected` needs to have this value.
Each tab gets a value automatically set to its index, so you don't need to use this property unless you need specific values for some special case.") (p-row "isSelected" "boolean" "Optionally you can set a specific tab as selected directly without relying on the global tabs value.") (p-row "disabled" "boolean" "Pass `true` to disable the tab button.") (p-row "href" "string" "You can pass an href to the tab button to render a link. Hint: use `ember-href-to` to generate route urls.") @@ -241,4 +215,4 @@ }}
- + diff --git a/tests/dummy/app/templates/components/toast.hbs b/tests/dummy/app/templates/components/toast.hbs index fc296ab9d..90da7584e 100644 --- a/tests/dummy/app/templates/components/toast.hbs +++ b/tests/dummy/app/templates/components/toast.hbs @@ -1,8 +1,7 @@ - + +

Toast

-

Component Usage

- -

Playground

+

Component

{{! BEGIN-SNIPPET toast.component }} {{#if showToast}} @@ -88,9 +87,7 @@ }}
-

Service Usage

- -

Playground

+

Service

Open a toast via paperToaster service and \{{paper-toaster}} component.

@@ -182,4 +179,4 @@ - + diff --git a/tests/dummy/app/templates/components/toggles.hbs b/tests/dummy/app/templates/components/toggles.hbs index 287ca3388..66b5cfb30 100644 --- a/tests/dummy/app/templates/components/toggles.hbs +++ b/tests/dummy/app/templates/components/toggles.hbs @@ -1,27 +1,40 @@ - - - {{! BEGIN-SNIPPET switch }} - - {{booleanProp1}} - - - - {{booleanProp2}} - - - - Disabled switch - + +

Switch

+ +

Basic Usage

+
+ {{! BEGIN-SNIPPET switch.basic-usage }} + + {{booleanProp1}} + + + + {{booleanProp2}} + + + + Disabled switch + + + + Noink switch + + + + {{! END-SNIPPET }} +
- - Noink switch - + {{#let (get-code-snippet "switch.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} - - {{! END-SNIPPET }} +

Checkbox

- {{! BEGIN-SNIPPET checkbox }} -
+

Basic Usage

+
+ {{! BEGIN-SNIPPET checkbox.basic-usage }} A checkbox: {{value1}} @@ -51,71 +64,85 @@ Indeterminate checkbox (disabled) + {{! END-SNIPPET }}
- {{! END-SNIPPET }} - - - -

Basic Usage

-

- Stand alone -

-
- {{! BEGIN-SNIPPET radio.standalone-usage }} - - Toggable - - - - Disabled - - {{! END-SNIPPET }} -
-

Template

-
- -

- Selected Value: {{selectedFruit}} -

- - {{! BEGIN-SNIPPET radio.basic-group-usage}} - - Apple - Banana - Mango - - {{! END-SNIPPET }} - -

Template

-
- -

- Graphic radio buttons -

- {{! BEGIN-SNIPPET radio.images }} - - - -

Selected Value: {{selectedGraphic}}

- - - - example1 - - - - example2 - - - - example3 - - - - {{! END-SNIPPET }} - -

Template

- - - - + + {{#let (get-code-snippet "checkbox.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Radio

+ +

Basic Usage

+
+ {{! BEGIN-SNIPPET radio.basic-usage }} + + Toggable + + + + Disabled + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "radio.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Group Usage

+
+

+ Selected Value: {{selectedFruit}} +

+ + {{! BEGIN-SNIPPET radio.group-usage}} + + Apple + Banana + Mango + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "radio.group-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Template

+
+ {{! BEGIN-SNIPPET radio.template}} + + + +

Selected Component: {{selectedComponent}}

+ + + + {{paper-icon "view_carousel"}} + + + + {{paper-icon "label" }} + + + + {{paper-icon "call"}} + + + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "radio.template.hbs") as |snippet|}} + + {{snippet.source}} + + {{/let}} + diff --git a/tests/dummy/app/templates/components/toolbar.hbs b/tests/dummy/app/templates/components/toolbar.hbs index 75fbcf114..5f06d4322 100644 --- a/tests/dummy/app/templates/components/toolbar.hbs +++ b/tests/dummy/app/templates/components/toolbar.hbs @@ -1,61 +1,112 @@ - - {{! BEGIN-SNIPPET toolbar }} - {{! without contextual components }} - - - - {{paper-icon "menu"}} - -

- Toolbar with Icon Buttons -

- - - {{paper-icon "favorite"}} - - - {{paper-icon "more_vert"}} - - - - -
- {{! with contextual components }} - - - - Go Back - -

Toolbar with Standard Buttons

+ +

Toolbar

+

Basic Usage

+
+ {{! BEGIN-SNIPPET toolbar.basic-usage }} + + + + {{paper-icon "menu"}} + +

+ Ember Paper +

+ + + {{paper-icon "favorite"}} + + + {{paper-icon "more_vert"}} + + + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "toolbar.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

With Tools

+
+ {{! BEGIN-SNIPPET toolbar.with-tools }} + + + + Go Back + +

Ember Paper

+ + + Learn More + + + {{paper-icon "favorite"}} + + + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "toolbar.with-tools.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + + +

Tall

+
+ {{! BEGIN-SNIPPET toolbar.tall }} + + +

Ember Paper

+ + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "toolbar.tall.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Accent

+
+ {{! BEGIN-SNIPPET toolbar.accent }} + + +

Ember Paper

+ + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "toolbar.with-tools.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + +

Warn

+
+ {{! BEGIN-SNIPPET toolbar.warn }} + - - Learn More - - - {{paper-icon "favorite"}} - - - - -
- - - -

Toolbar: tall=true, accent=true

- - - -
- - - - -

Toolbar: tall with actions pin to the bottom (tall=true warn=true)

- - - {{! END-SNIPPET }} - -

Template

- - - + +

Ember Paper

+ + + {{! END-SNIPPET }} +
+ + {{#let (get-code-snippet "toolbar.warn.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} + + diff --git a/tests/dummy/app/templates/components/tooltip.hbs b/tests/dummy/app/templates/components/tooltip.hbs index 7f1f32019..941b9972c 100644 --- a/tests/dummy/app/templates/components/tooltip.hbs +++ b/tests/dummy/app/templates/components/tooltip.hbs @@ -1,94 +1,81 @@ - - - - -

Basic Usage

- - - - - {{if showSourceCode "Hide" "Show"}} code - - - - - -
- -
- -
+ +

Tooltip

+

Basic Usage

+
+

+ You can render tooltips using the paper-tooltip component. This component + will attach to the immediate parent element and use it for positioning. +

- -

- You can render tooltips using the paper-tooltip component. This component - will attach to the immediate parent element and use it for positioning. -

+

+ You can control the position of you tooltip using the + position property which can be one of bottom (default), + top, left or right. Try it: +

-

- You can control the position of you tooltip using the - position property which can be one of bottom (default), - top, left or right. Try it: -

+
+ {{! BEGIN-SNIPPET tooltip.basic-usage }} + + A button + + Hey! I'm a tooltip. Çup? + + -
- {{! BEGIN-SNIPPET tooltip }} - - A button - - Hey! I'm a tooltip. Çup? - - + + {{paper-icon "create"}} + + Create + + - - {{paper-icon "create"}} - - Create - - + + {{paper-icon "delete"}} + + Delete + + - - {{paper-icon "delete"}} - - Delete - - - -
- {{#paper-icon "info"}} - - Icon tooltip - - {{/paper-icon}} -
- {{! END-SNIPPET tooltip }} -
+
+ {{#paper-icon "info"}} + + Icon tooltip + + {{/paper-icon}} +
+ {{! END-SNIPPET }} +
- - - Bottom - - - Top - - - Left - - - Right - - + + + Bottom + + + Top + + + Left + + + Right + + +
- {{paper-api - (p-section - (p-row "zIndex" "number" "Controls the z-index of the tooltip. By default it is 100.") - (p-row "position" "string" "Controls the position of the tooltip. Use one of `bottom` (default), `top`, `left` or `right`") - (p-row "parent" "element or selector" "Existing element where the tooltip will be rendered. Defaults to the global paper-wormhole.") - (p-row "attachTo" "element or selector" "Existing element that the tooltip will use to position itself. Defaults to the immediate parent element of the tooltip.") - ) - }} + {{#let (get-code-snippet "tooltip.basic-usage.hbs") as |snippet|}} + +{{snippet.source}} + + {{/let}} - -
- - +
+ {{paper-api + (p-section + (p-row "zIndex" "number" "Controls the z-index of the tooltip. By default it is 100.") + (p-row "position" "string" "Controls the position of the tooltip. Use one of `bottom` (default), `top`, `left` or `right`") + (p-row "parent" "element or selector" "Existing element where the tooltip will be rendered. Defaults to the global paper-wormhole.") + (p-row "attachTo" "element or selector" "Existing element that the tooltip will use to position itself. Defaults to the immediate parent element of the tooltip.") + ) + }} +
+ From 4f22832213ac140981629285614c175932065df8 Mon Sep 17 00:00:00 2001 From: Gabriel Csapo Date: Wed, 10 Jun 2020 20:29:25 -0700 Subject: [PATCH 5/9] cleans up toc, updates layout section --- tests/dummy/app/components/doc.hbs | 8 +- tests/dummy/app/components/toc.hbs | 17 +- tests/dummy/app/components/toc.js | 2 +- .../app/controllers/layout/child-alignment.js | 26 +-- .../app/controllers/layout/introduction.js | 8 + tests/dummy/app/router.js | 7 +- tests/dummy/app/routes/layout.js | 7 + tests/dummy/app/styles/app.scss | 58 +++++- tests/dummy/app/styles/demo.scss | 2 +- tests/dummy/app/templates/application.hbs | 8 +- .../dummy/app/templates/components/chips.hbs | 8 +- tests/dummy/app/templates/components/list.hbs | 12 ++ tests/dummy/app/templates/components/menu.hbs | 9 +- .../dummy/app/templates/components/select.hbs | 9 +- .../app/templates/components/sidenav.hbs | 6 +- .../dummy/app/templates/components/slider.hbs | 10 +- .../app/templates/components/speed-dial.hbs | 6 +- .../dummy/app/templates/components/toast.hbs | 6 +- .../app/templates/components/toggles.hbs | 16 +- .../app/templates/components/tooltip.hbs | 4 +- tests/dummy/app/templates/layout.hbs | 167 +++++------------- .../app/templates/layout/child-alignment.hbs | 9 +- .../app/templates/layout/introduction.hbs | 135 ++++++++++++++ .../app/templates/layout/layout-children.hbs | 11 +- .../templates/layout/layout-containers.hbs | 8 +- .../public/assets/ember-logo-original.png | Bin 5023 -> 0 bytes .../dummy/public/assets/ember-logo-white.png | Bin 3422 -> 0 bytes tests/dummy/public/assets/ember-logo.png | Bin 3418 -> 0 bytes .../public/assets/ember-paper-logo-white.png | Bin 0 -> 9623 bytes tests/dummy/public/assets/tomster.png | Bin 39455 -> 0 bytes 30 files changed, 337 insertions(+), 222 deletions(-) create mode 100644 tests/dummy/app/controllers/layout/introduction.js create mode 100644 tests/dummy/app/routes/layout.js create mode 100644 tests/dummy/app/templates/layout/introduction.hbs delete mode 100644 tests/dummy/public/assets/ember-logo-original.png delete mode 100644 tests/dummy/public/assets/ember-logo-white.png delete mode 100644 tests/dummy/public/assets/ember-logo.png create mode 100644 tests/dummy/public/assets/ember-paper-logo-white.png delete mode 100644 tests/dummy/public/assets/tomster.png diff --git a/tests/dummy/app/components/doc.hbs b/tests/dummy/app/components/doc.hbs index ce973d629..ac255b352 100644 --- a/tests/dummy/app/components/doc.hbs +++ b/tests/dummy/app/components/doc.hbs @@ -1,8 +1,8 @@ -
- + + {{yield}} - + -
+ diff --git a/tests/dummy/app/components/toc.hbs b/tests/dummy/app/components/toc.hbs index 824bdef9c..627328467 100644 --- a/tests/dummy/app/components/toc.hbs +++ b/tests/dummy/app/components/toc.hbs @@ -1,7 +1,10 @@ - +
+
Contents
+ +
diff --git a/tests/dummy/app/components/toc.js b/tests/dummy/app/components/toc.js index 1423043d9..5bcc39e17 100644 --- a/tests/dummy/app/components/toc.js +++ b/tests/dummy/app/components/toc.js @@ -32,7 +32,7 @@ export default class extends Component { }); }); - document.addEventListener('scroll', (e) => { + document.addEventListener('scroll', () => { const maybeSelected = this.headers.sort((a, b) => { return Math.abs(window.scrollY - a.top) - Math.abs(window.scrollY - b.top); })[0]; diff --git a/tests/dummy/app/controllers/layout/child-alignment.js b/tests/dummy/app/controllers/layout/child-alignment.js index 8e155b662..eaa708855 100644 --- a/tests/dummy/app/controllers/layout/child-alignment.js +++ b/tests/dummy/app/controllers/layout/child-alignment.js @@ -1,13 +1,17 @@ import Controller from '@ember/controller'; -import { computed } from '@ember/object'; +import { tracked } from '@glimmer/tracking'; -export default Controller.extend({ - layoutClass: computed('layoutDirection', function() { - return `layout-${this.get('layoutDirection')}`; - }), +export default class extends Controller { + @tracked layoutDirection = 'row'; + @tracked mainDirection = 'center'; + @tracked perpDirection = 'center'; - layoutAlignClass: computed('mainDirection', 'perpDirection', function() { - let { mainDirection, perpDirection } = this.getProperties('mainDirection', 'perpDirection'); + get layoutClass() { + return `layout-${this.layoutDirection}`; + } + + get layoutAlignClass() { + const { mainDirection, perpDirection } = this; if (!mainDirection && !perpDirection) { return 'layout-align'; @@ -20,9 +24,5 @@ export default Controller.extend({ } return ''; - }), - - layoutDirection: 'row', - mainDirection: 'center', - perpDirection: 'center' -}); + } +} diff --git a/tests/dummy/app/controllers/layout/introduction.js b/tests/dummy/app/controllers/layout/introduction.js new file mode 100644 index 000000000..a5ad822e1 --- /dev/null +++ b/tests/dummy/app/controllers/layout/introduction.js @@ -0,0 +1,8 @@ +import Controller from '@ember/controller'; +import { tracked } from '@glimmer/tracking'; + +export default class extends Controller { + @tracked box1Height = 20; + @tracked direction = 'row'; + @tracked hideBox = true; +} diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index 27de4df2d..63e28b20d 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/app/router.js @@ -34,7 +34,12 @@ Router.map(function() { this.route('toolbar'); this.route('tooltip'); }); - this.route('layout'); + this.route('layout', function() { + this.route('introduction'); + this.route('child-alignment'); + this.route('layout-children'); + this.route('layout-containers'); + }); this.route('theme'); this.route('addons'); }); diff --git a/tests/dummy/app/routes/layout.js b/tests/dummy/app/routes/layout.js new file mode 100644 index 000000000..95f38599c --- /dev/null +++ b/tests/dummy/app/routes/layout.js @@ -0,0 +1,7 @@ +import Route from '@ember/routing/route'; + +export default class extends Route { + beforeModel() { + this.transitionTo('layout.introduction') + } +} diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss index d55b8873a..92de709e7 100644 --- a/tests/dummy/app/styles/app.scss +++ b/tests/dummy/app/styles/app.scss @@ -1,6 +1,12 @@ @import 'ember-paper'; @import 'demo'; +$flexbox-color1: paper-color('deep-purple', '200'); +$flexbox-color2: paper-color('orange', '400'); +$flexbox-color3: paper-color('blue', '300'); +$flexbox-color4: paper-color('teal', '200'); +$flexbox-color5: paper-color('pink', '300'); + .application-navbar a { border: none; line-height: 64px; @@ -54,14 +60,21 @@ pre.code-block { } .toc { - margin: 0; - margin-top: 10px; - margin-left: 10px; - padding: 0; - list-style: none; position: fixed; - li { + .toc-title { + margin-left: 8px; + } + + .toc-list { + margin: 0; + margin-top: 10px; + margin-left: 10px; + padding: 0; + list-style: none; + } + + .toc-list-item { width: 100%; height: auto; min-height: 32px; @@ -76,7 +89,7 @@ pre.code-block { } } - .toc--selected { + .toc-list-item--selected { border-left: 2px solid #212121; opacity: 1; font-weight: 700; @@ -87,3 +100,34 @@ pre.code-block { } } } + +.introduction-example { + height: 350px; + + .box-one { + background-color: $flexbox-color1; + } + + .box-two-one { + background-color: $flexbox-color2; + } + .box-two-two { + background-color: $flexbox-color3; + } + .box-two-three { + background-color: $flexbox-color4; + } + .box-three { + background-color: $flexbox-color5; + } +} + +.one { + background-color: $flexbox-color1; +} +.two { + background-color: $flexbox-color2; +} +.three { + background-color: $flexbox-color3; +} diff --git a/tests/dummy/app/styles/demo.scss b/tests/dummy/app/styles/demo.scss index 0b4039b00..fe17c90d6 100644 --- a/tests/dummy/app/styles/demo.scss +++ b/tests/dummy/app/styles/demo.scss @@ -14,7 +14,6 @@ table { position: relative; border: 1px solid rgba(0,0,0,.12); border-collapse: collapse; - white-space: nowrap; font-size: 13px; background-color: #fff; box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12) @@ -54,6 +53,7 @@ td { #main { position: relative; + height: 100vh; } md-select-menu md-content md-option:not([disabled]):focus, md-select-menu.md-default-theme md-content md-option:not([disabled]):hover, md-select-menu md-content md-option:not([disabled]):hover { diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs index a2a0611d3..555539ed2 100644 --- a/tests/dummy/app/templates/application.hbs +++ b/tests/dummy/app/templates/application.hbs @@ -1,6 +1,6 @@
- +
Introduction @@ -23,9 +23,7 @@
-
-
- {{outlet}} -
+
+ {{outlet}}
diff --git a/tests/dummy/app/templates/components/chips.hbs b/tests/dummy/app/templates/components/chips.hbs index 755f9cc6b..ef8b255eb 100644 --- a/tests/dummy/app/templates/components/chips.hbs +++ b/tests/dummy/app/templates/components/chips.hbs @@ -33,7 +33,7 @@ {{/let}} -

Chips with Autocomplete

+

Autocomplete

{{! BEGIN-SNIPPET chips.autocomplete }} @@ -51,7 +51,7 @@ {{/let}} -

Chips with Autocomplete (requires match)

+

Autocomplete (requires match)

{{! BEGIN-SNIPPET chips.autocomplete-requires-match }} @@ -65,7 +65,7 @@ {{/let}} -

Contact Chips

+

Contact

{{! BEGIN-SNIPPET chips.contact }} @@ -87,7 +87,7 @@ {{/let}} -

Contact Alt Chips

+

Contact Alt

{{! BEGIN-SNIPPET chips.contact-alt }} diff --git a/tests/dummy/app/templates/components/list.hbs b/tests/dummy/app/templates/components/list.hbs index dfc42f11c..29990dfbb 100644 --- a/tests/dummy/app/templates/components/list.hbs +++ b/tests/dummy/app/templates/components/list.hbs @@ -1,5 +1,7 @@

List

+ +

3 Line Item

{{! BEGIN-SNIPPET list.3-line }} @@ -41,6 +43,7 @@ {{/let}} +

2 Line Item

{{! BEGIN-SNIPPET list.2-line }} @@ -64,6 +67,7 @@ {{/let}} +

Icons

{{! BEGIN-SNIPPET list.icons }} @@ -87,6 +91,7 @@ {{/let}} +

Single Actions

{{! BEGIN-SNIPPET list.singe-actions }} @@ -109,6 +114,7 @@ {{/let}} +

Secondary Buttons

{{! BEGIN-SNIPPET list.secondary-buttons }} @@ -139,6 +145,7 @@ {{/let}} +

Clickable Secondary Controls

{{! BEGIN-SNIPPET list.clickable-secondary-controls }} @@ -171,6 +178,7 @@ {{/let}} +

Checkbox Secondary Controls

{{! BEGIN-SNIPPET list.checkbox-secondary-controls }} @@ -196,6 +204,7 @@ {{/let}} +

Avatar with Secondary Controls

{{! BEGIN-SNIPPET list.avatar-secondary-controls }} @@ -225,6 +234,7 @@ {{/let}} +

Clickable Avatars

{{! BEGIN-SNIPPET list.clickable-avatars }} @@ -249,6 +259,7 @@ {{/let}} +

Avatars Secondary Control Icons

{{! BEGIN-SNIPPET list.avatars-secondary-control-icons }} @@ -276,6 +287,7 @@ {{/let}} +

Radio Actions

{{! BEGIN-SNIPPET list.single-actions-radios }} diff --git a/tests/dummy/app/templates/components/menu.hbs b/tests/dummy/app/templates/components/menu.hbs index 61aeda3f1..496857662 100644 --- a/tests/dummy/app/templates/components/menu.hbs +++ b/tests/dummy/app/templates/components/menu.hbs @@ -1,6 +1,7 @@ -

Simple dropdown menu

+

Menu

+

Simple dropdown menu

Note that applying the class .md-menu-origin and md-menu-align-targetattributes ensure that the menu elements align. @@ -47,7 +48,7 @@ {{/let}} -

Menu Position Modes

+

Menu Position Modes

The position attribute can be used to specify the positioning along the x and y axis. @@ -144,7 +145,7 @@ {{/let}} -

Different Widths

+

Different Widths

paper-menu-content may specify a width attribute which will follow the @@ -221,7 +222,7 @@ {{/let}} -

Dense menu

+

Dense menu

paper-menu-content may specify a `dense` boolean attribute. diff --git a/tests/dummy/app/templates/components/select.hbs b/tests/dummy/app/templates/components/select.hbs index 1cbdc4322..169e5b85a 100644 --- a/tests/dummy/app/templates/components/select.hbs +++ b/tests/dummy/app/templates/components/select.hbs @@ -1,6 +1,7 @@ -

Basic Usage

+

Select

+

Basic Usage

Enter an address

@@ -37,7 +38,7 @@ {{/paper-api}}

-

Option groups

+

Option groups

Pick your pizza below

@@ -59,7 +60,7 @@ {{/let}} -

Options with async search

+

Options with async search

@@ -84,7 +85,7 @@ {{/let}} -

Select with Search

+

Select with Search

Paper select can include a paper-input field at the top of the dropdown which acts as a live filter for the paper-select options. For additional documentation on search, please refer to the power-select docs here.

diff --git a/tests/dummy/app/templates/components/sidenav.hbs b/tests/dummy/app/templates/components/sidenav.hbs index 1d7073f3d..5aa10e6d6 100644 --- a/tests/dummy/app/templates/components/sidenav.hbs +++ b/tests/dummy/app/templates/components/sidenav.hbs @@ -1,6 +1,6 @@ - -

Basic Usage

+

Sidenav

+

Basic Usage

{{! BEGIN-SNIPPET sidenav.basic-usage }} @@ -62,7 +62,7 @@ {{/let}} -

Persistent

+

Persistent

{{! BEGIN-SNIPPET sidenav.persistent }} diff --git a/tests/dummy/app/templates/components/slider.hbs b/tests/dummy/app/templates/components/slider.hbs index 56d7abf64..dcb612e7e 100644 --- a/tests/dummy/app/templates/components/slider.hbs +++ b/tests/dummy/app/templates/components/slider.hbs @@ -1,6 +1,6 @@ - -

Basic Usage

+

Slider

+

Basic Usage

{{! BEGIN-SNIPPET slider.basic-usage }}

@@ -33,7 +33,7 @@ {{/let}} -

Theming

+

Theming

{{! BEGIN-SNIPPET slider.theming }}
@@ -63,7 +63,7 @@ {{/let}} -

Disabled

+

Disabled

{{! BEGIN-SNIPPET slider.disabled }} @@ -76,7 +76,7 @@ {{/let}} -

Disabled, Discrete

+

Disabled, Discrete

{{! BEGIN-SNIPPET slider.disabled-discrete }} diff --git a/tests/dummy/app/templates/components/speed-dial.hbs b/tests/dummy/app/templates/components/speed-dial.hbs index d411230e2..d38f5e983 100644 --- a/tests/dummy/app/templates/components/speed-dial.hbs +++ b/tests/dummy/app/templates/components/speed-dial.hbs @@ -1,6 +1,6 @@ - -

Basic Usage

+

Sidenav

+

Basic Usage

@@ -86,7 +86,7 @@ {{/let}} -

Advanced Usage

+

Advanced Usage

diff --git a/tests/dummy/app/templates/components/toast.hbs b/tests/dummy/app/templates/components/toast.hbs index 90da7584e..c1728cf9b 100644 --- a/tests/dummy/app/templates/components/toast.hbs +++ b/tests/dummy/app/templates/components/toast.hbs @@ -1,7 +1,7 @@ -

Toast

+

Toast

-

Component

+

Component

{{! BEGIN-SNIPPET toast.component }} {{#if showToast}} @@ -87,7 +87,7 @@ }}
-

Service

+

Service

Open a toast via paperToaster service and \{{paper-toaster}} component.

diff --git a/tests/dummy/app/templates/components/toggles.hbs b/tests/dummy/app/templates/components/toggles.hbs index 66b5cfb30..2c28e51c5 100644 --- a/tests/dummy/app/templates/components/toggles.hbs +++ b/tests/dummy/app/templates/components/toggles.hbs @@ -1,7 +1,7 @@ -

Switch

+

Switch

-

Basic Usage

+

Basic Usage

{{! BEGIN-SNIPPET switch.basic-usage }} @@ -30,9 +30,9 @@ {{/let}} -

Checkbox

+

Checkbox

-

Basic Usage

+

Basic Usage

{{! BEGIN-SNIPPET checkbox.basic-usage }} @@ -73,9 +73,9 @@ {{/let}} -

Radio

+

Radio

-

Basic Usage

+

Basic Usage

{{! BEGIN-SNIPPET radio.basic-usage }} @@ -94,7 +94,7 @@ {{/let}} -

Group Usage

+

Group Usage

Selected Value: {{selectedFruit}} @@ -115,7 +115,7 @@ {{/let}} -

Template

+

Template

{{! BEGIN-SNIPPET radio.template}} diff --git a/tests/dummy/app/templates/components/tooltip.hbs b/tests/dummy/app/templates/components/tooltip.hbs index 941b9972c..6d1bb77ab 100644 --- a/tests/dummy/app/templates/components/tooltip.hbs +++ b/tests/dummy/app/templates/components/tooltip.hbs @@ -1,6 +1,6 @@ -

Tooltip

-

Basic Usage

+

Tooltip

+

Basic Usage

You can render tooltips using the paper-tooltip component. This component diff --git a/tests/dummy/app/templates/layout.hbs b/tests/dummy/app/templates/layout.hbs index 5979d2d56..347405287 100644 --- a/tests/dummy/app/templates/layout.hbs +++ b/tests/dummy/app/templates/layout.hbs @@ -1,125 +1,42 @@ - -

Overview

- -

- Ember Paper's layout features provide sugar to enable developers to more easily create modern, - responsive layouts on top of CSS3 flexbox. The layout API consists of a set of classes - that can be applied to any of your application's HTML content. -

- -

- Ember Paper's layout system is based on - Angular Material's. - Most of the class names can be derived from the attributes described in their documentation. Ember Paper - uses classes rather than attributes for performance reasons. Under the hood, Angular does the same. -

- -

- The classes consist of an attribute and optional parameters, separated by - dashes. See the table below for an overview of the most important classes. -

- - {{paper-api - (p-section - (p-row "layout" "`row | column`" "`layout-row`, `layout-column`") - (p-row "flex" "integer (increments of 5 for 0%->100%, 100%/3, 200%/3)" "`layout`, `flex-50`") - (p-row "flex-order" "integer values from -20 to 20" "`flex-order-15`, `flex-order--5`") - (p-row "flex-offset" "integer (increments of 5 for 0%->100%, 100%/3, 200%/3)" "`flex-offset-15`, `flex-offset-66`") - (p-row "layout-align" "`start | center | end | space-around | space-between`, `start | center | end | stretch`" "`layout-align-space-around-center`, `layout-align-start`") - (p-row "layout-fill" "**none**" "") - (p-row "layout-wrap" "**none**" "") - (p-row "layout-nowrap" "**none**" "") - (p-row "layout-margin" "**none**" "") - (p-row "layout-padding" "**none**" "") - (p-row "show" "**none**" "") - (p-row "hide" "**none**" "") - ) - header=(p-row "Base attribute" "Parameter values" "Examples") - sort=false - }} - -

- We can associate breakpoints with mediaQuery definitions using breakpoint alias(es), - based on the breakpoints specified in the Material Design spec: -

- - {{paper-api - (p-section - (p-row "xs" "'(max-width: *599*px)'") - (p-row "gt-xs" "'(min-width: *600*px)'") - (p-row "sm" "'(min-width: *600*px) and (max-width: *959*px)'") - (p-row "gt-sm" "'(min-width: *960*px)'") - (p-row "md" "'(min-width: *960*px) and (max-width: *1279*px)'") - (p-row "gt-md" "'(min-width: *1280*px)'") - (p-row "lg" "'(min-width: *1280*px) and (max-width: *1919*px)'") - (p-row "gt-lg" "'(min-width: *1920*px)'") - (p-row "xl" "'(min-width: *1920*px)'") - ) - header=(p-row "Breakpoint" "Media query (pixel range)") - sort=false - }} - -

API with Responsive Breakpoints

-

- Now we can combine the breakpoint alias with the layout classes to easily support responsive breakpoints - with our simple layout class convention. The alias is simply used as suffix extensions to the base attribute class. -

-

- This notation results in, for example, the following table for the layout and flex classes: -

- - {{paper-api - (p-section - (p-row "layout" "`flex`" "Sets the default layout direction & flex unless overriden by another breakpoint.") - (p-row "layout-xs" "`flex-xs`" "width < *600*px") - (p-row "layout-gt-xs" "`flex-gt-xs`" "width >= *600*px") - (p-row "layout-sm" "`flex-sm`" "width *600*px <= width < *960*px") - (p-row "layout-gt-sm" "`flex-gt-sm`" "width >= *960*px") - (p-row "layout-md" "`flex-md`" "*960*px <= width < *1280*px") - (p-row "layout-gt-md" "`flex-gt-md`" "width >= *1280*px") - (p-row "layout-lg" "`flex-lg`" "*1280*px <= width < *1920*px") - (p-row "layout-gt-lg" "`flex-gt-lg`" "width >= *1920*px") - (p-row "layout-xl" "`flex-xl`" "width >= *1920*px") - ) - header=(p-row "layout class" "flex class" "Description") - sort=false - }} - -

Below is an example of the usage of the responsive layout classes:

- - - {{! BEGIN-SNIPPET layout-introduction }} -
-
-
-
-
-
-
-
-
- {{! END-SNIPPET }} - - -
- - -
-

direction

- - - row - - - column - - -
- - hideBox -
- - - - - + + + + + + {{paper-icon "view_compact"}} +
+ Introduction +
+ + + + + {{paper-icon "view_day"}} +
+ Child Alignments +
+ + + + + {{paper-icon "view_comfy"}} +
+ Layout Children +
+ + + + + {{paper-icon "view_quilt"}} +
+ Layout Containers +
+ + + + + +
+ {{outlet}} +
+ diff --git a/tests/dummy/app/templates/layout/child-alignment.hbs b/tests/dummy/app/templates/layout/child-alignment.hbs index f1f7fae2c..0a47fe936 100644 --- a/tests/dummy/app/templates/layout/child-alignment.hbs +++ b/tests/dummy/app/templates/layout/child-alignment.hbs @@ -1,6 +1,4 @@ - - - +

The layout-align class takes two words. The first word says how the children @@ -101,9 +99,6 @@

- - - - + diff --git a/tests/dummy/app/templates/layout/introduction.hbs b/tests/dummy/app/templates/layout/introduction.hbs new file mode 100644 index 000000000..17c0a712d --- /dev/null +++ b/tests/dummy/app/templates/layout/introduction.hbs @@ -0,0 +1,135 @@ + +

Introduction

+

+ Ember Paper's layout features provide sugar to enable developers to more easily create modern, + responsive layouts on top of CSS3 flexbox. The layout API consists of a set of classes + that can be applied to any of your application's HTML content. +

+ +

+ Ember Paper's layout system is based on + Angular Material's. + Most of the class names can be derived from the attributes described in their documentation. Ember Paper + uses classes rather than attributes for performance reasons. Under the hood, Angular does the same. +

+ +

+ The classes consist of an attribute and optional parameters, separated by + dashes. See the table below for an overview of the most important classes. +

+ +
+ {{paper-api + (p-section + (p-row "layout" "`row | column`" "`layout-row`, `layout-column`") + (p-row "flex" "integer (increments of 5 for 0%->100%, 100%/3, 200%/3)" "`layout`, `flex-50`") + (p-row "flex-order" "integer values from -20 to 20" "`flex-order-15`, `flex-order--5`") + (p-row "flex-offset" "integer (increments of 5 for 0%->100%, 100%/3, 200%/3)" "`flex-offset-15`, `flex-offset-66`") + (p-row "layout-align" "`start | center | end | space-around | space-between`, `start | center | end | stretch`" "`layout-align-space-around-center`, `layout-align-start`") + (p-row "layout-fill" "**none**" "") + (p-row "layout-wrap" "**none**" "") + (p-row "layout-nowrap" "**none**" "") + (p-row "layout-margin" "**none**" "") + (p-row "layout-padding" "**none**" "") + (p-row "show" "**none**" "") + (p-row "hide" "**none**" "") + ) + header=(p-row "Base attribute" "Parameter values" "Examples") + sort=false + }} +
+ +

+ We can associate breakpoints with mediaQuery definitions using breakpoint alias(es), + based on the breakpoints specified in the Material Design spec: +

+ +
+ {{paper-api + (p-section + (p-row "xs" "'(max-width: *599*px)'") + (p-row "gt-xs" "'(min-width: *600*px)'") + (p-row "sm" "'(min-width: *600*px) and (max-width: *959*px)'") + (p-row "gt-sm" "'(min-width: *960*px)'") + (p-row "md" "'(min-width: *960*px) and (max-width: *1279*px)'") + (p-row "gt-md" "'(min-width: *1280*px)'") + (p-row "lg" "'(min-width: *1280*px) and (max-width: *1919*px)'") + (p-row "gt-lg" "'(min-width: *1920*px)'") + (p-row "xl" "'(min-width: *1920*px)'") + ) + header=(p-row "Breakpoint" "Media query (pixel range)") + sort=false + }} +
+ +

API with Responsive Breakpoints

+

+ Now we can combine the breakpoint alias with the layout classes to easily support responsive breakpoints + with our simple layout class convention. The alias is simply used as suffix extensions to the base attribute class. +

+

+ This notation results in, for example, the following table for the layout and flex classes: +

+ +
+ {{paper-api + (p-section + (p-row "layout" "`flex`" "Sets the default layout direction & flex unless overriden by another breakpoint.") + (p-row "layout-xs" "`flex-xs`" "width < *600*px") + (p-row "layout-gt-xs" "`flex-gt-xs`" "width >= *600*px") + (p-row "layout-sm" "`flex-sm`" "width *600*px <= width < *960*px") + (p-row "layout-gt-sm" "`flex-gt-sm`" "width >= *960*px") + (p-row "layout-md" "`flex-md`" "*960*px <= width < *1280*px") + (p-row "layout-gt-md" "`flex-gt-md`" "width >= *1280*px") + (p-row "layout-lg" "`flex-lg`" "*1280*px <= width < *1920*px") + (p-row "layout-gt-lg" "`flex-gt-lg`" "width >= *1920*px") + (p-row "layout-xl" "`flex-xl`" "width >= *1920*px") + ) + header=(p-row "layout class" "flex class" "Description") + sort=false + }} +
+ +

Below is an example of the usage of the responsive layout classes:

+ + + {{! BEGIN-SNIPPET layout.introduction }} +
+
+
+
+
+
+
+
+
+ {{! END-SNIPPET }} + + +
+ + +
+

direction

+ + + row + + + column + + +
+ + hideBox +
+ + + + + +{{#let (get-code-snippet "layout.introduction.hbs") as |snippet|}} + +{{snippet.source}} + +{{/let}} diff --git a/tests/dummy/app/templates/layout/layout-children.hbs b/tests/dummy/app/templates/layout/layout-children.hbs index cad90ee19..1d34cb819 100644 --- a/tests/dummy/app/templates/layout/layout-children.hbs +++ b/tests/dummy/app/templates/layout/layout-children.hbs @@ -1,6 +1,4 @@ - - - +

Children within a Layout Container

@@ -21,7 +19,6 @@ {{! END-SNIPPET }}
- @@ -46,7 +43,6 @@ {{! END-SNIPPET }}
- @@ -74,7 +70,6 @@ {{! END-SNIPPET }}
- @@ -100,7 +95,6 @@ {{! END-SNIPPET }}
- {{paper-api (p-section @@ -136,8 +130,7 @@ {{! END-SNIPPET }}
- - + diff --git a/tests/dummy/app/templates/layout/layout-containers.hbs b/tests/dummy/app/templates/layout/layout-containers.hbs index 3ddd6d4f4..84bf93b65 100644 --- a/tests/dummy/app/templates/layout/layout-containers.hbs +++ b/tests/dummy/app/templates/layout/layout-containers.hbs @@ -1,6 +1,4 @@ - - - +

Layout and Containers

Use the layout class on a container element to specify the layout direction for its @@ -31,7 +29,6 @@ {{! END-SNIPPET }}

- @@ -83,8 +80,7 @@ {{! END-SNIPPET }}
- - + diff --git a/tests/dummy/public/assets/ember-logo-original.png b/tests/dummy/public/assets/ember-logo-original.png deleted file mode 100644 index 70ca1e830f2a2018a454b8e700612b4627a66d94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5023 zcmb7|_dgVl1IEv}Gmeamvq=#bWv|3h+2go7+3qTo6$x?1xlqWg%jS@CP9dSJj3_&M ze(aHT_D+2J7rw98^Ln1=m*=PVZ%;JBO#cEz00IC2E*Kizu>=5ssDFK)iTLqHFUUEft@MP&FCIYR_ssW*c8A@^z($Wn35>c z6rlTyF((YZhs|)Hi@CPv0LJY4bb~NPVQv&)@*z<}3q|)PfH>wMdWPh0dotX|uI*>d zC|6%3ZFidK2RNp|9Cwj#vVi2nP1U+nR0R?qn&U-I%7S4ozPmYpxl|jkS2;eJ2aGdf zVr3w}#Edg!gAm{da?7I54VYLp3qNWw7V@YcM+>r`D?TV$hCz7{@AaGwWnp4&aYjx^ zK>3lG6HhFJX-Yop)XZ=&+|+*MwVMSU+8y<-B@dVvn{VmknFDFN{}D72$`m0vRrl$+ zz8tf`z`ekvrcj_`{R}eeckEvPNdBl|tTJ3=v_-SYe>*CaM4=VBIZ@~&D=l3DiVEp6 zf>s8vPnm~eAGjb4JMF>@(9Yt`0&-<3N-cZ-*Ha4SpMT& zt-pBF&bF)fazY!8aqpdv*BMbO#nw%Kc#-(GZtogKtS%tf{7lcw7QFD~VwvXTK-nu` zHfagU^(XZJ%Re>_Y(;n*fp5iHWcp%-;2Rq|K_ZE7msj`<2EuPk5tr#7Yak*kQyyF~ z2Sg;nYSOO){t|2k^>|F_*}`UL^}uXliz|BIcSQ$H$Nb?z*GiWC3>e4T#xe`9S%hygJL7>HA&dvz~uX)RY;*xqy~f|$~+fq(WX$h$1doAIgk zp#2l)mBv2pks&)94Ma_!YYo(bZgN?%0w;I_et0%|x{cet|9YkKqU#@14jlc!x`Xnl z6Ysk{>RET^H_#sm4xI1F_NSNAbx`fTorm}2T4n#bXVLPjdNRKSFE6OlhH4$(Tu6Ix zaxqLt{)a?CaPSz?cK+e~eXp~R*Cn|MW2J?=>z5X-4#v7<1`{$*=VnuE70}jB)4$gC zPg1JC;tZR#=5h{tp0)dNM>o49wV2hP516%Nt@!+uooLs;kE~yKVx!=#R-G&~omTxj zHYx6!Vv$V%F*JwNM_lRKnQvcoR?DqD)S-q(Co|sD+SBo`JQQ|JA;oZYJ$T$i@aMD7 zP3?_Ryi!G~cMv%foKRgj&BI?U+aa^|7c+4p_8QqxQpfTTcP_`k# zqOOgLN__B@xBOl0z}wfb_+MAk3pZsrYira-AHuCbjaT-34m+<1po5lAk5j-m4$SMu z2E^^Nnn9PfK0OdAHoWQH60f2#8j4|e+~D`TMoCa4zI&AZvSQ2;g&Uvtv1>e#%+Q$) z{gJEg?Ki(Tw^XDs12->g*c@wWUEN^La$(qk9!7$=oa2}7uR<^W%t#HwR!x!5@6;EM z9A*vS^mo4EPW1cG`ulA>SoFc*)dHVv&@<-{N-& zJQ>P{t9VbAv_?F=Kx#b*QPs%+zMSad*1d& zaiwJq8Uu-WA@UEGbpt;#`03i#EmS-|Rj+rTQ4rjG8Fsq+-{IEWuFtg1S)EtQ&ZVbJ z$<1>j!ZLWHot-1@k!2kq@qCPqn;f}7DUa8oX)IXp#IvT%VMD5N5 z1N9`TNEvVigyO{{CWBMBiU|8LD$FFeT6n=d76y}f)x<_mTQwhu;)f(J-WC9E??;xi ziwSLio{mclIzujMR|h8IN1PxB){$4TmqmfEH?0dMMoKF}pp*q?T0@VD2!FQ+PnR7D z%KG_Cb5t`Ym+CH~@Z=hJ=vV-?;tr*lF$o-u~yD!oOA@8_( z9avw`A7ogDwlf`lcLoWk`+~=7TdaqTkwt`!A0H-qlGCugQ9s`>(%0Z|JDm(es@&OkT$l#WZ|c(=l&=_FI5P#zD>CJUr=-mB8ac*Tk6LpMhBAc zaoPq0GgF`~ovnKIt?XQ0+tPD2*G{sO@#sm@*f@vTve#R03%#lDq+;yY=Q8mYyH40& z*PGN$DNyxa9!iG_;;x3BCo5{?m3RXm7s&Zt0LSIy6VcU4PQfFwdthwl2&A}R`@tQw z*5*mpyawno+S)B0tDekQJ+irDm%yI#mPd|v)s!9XR}Vx_0bqfN*iiC&H!sgnYE3p<^zZ}zcfciNL?w*`@SU{Zt)Zd)fp>s=+b4y zl*2|A#ZSPPyFtsZn^rSbgvqO3YVlkMU`TG5%V8V)3Mau;N;hoUzb4mWK@dtSv}$?{B{8q$3;YnR>R8h$IPe4cOIXJ z6RT63+vPLCC*VuTvZSY6$lwdKd?d=8InBW9?lfKRV~{0!*4iUkGVx>814YVLSAwN5 zG#Tn32$J-Gzm2}hdu1o zGsiO=5;{IA__OpYy{^7V6S4%zG_H@QJyG$9w87wWlW%M}5@ZOK16l$^BD4 z3hPK{O5N)`cWA1{=RyB1xbGX^AB+iKRMzcXNooq|EevOj9CF4|jKgEOrU`DX*EXnF ze5siU%S&`gtEeUuNN~pif;3$FzH(v6Hm55>iQ;qnYZ!V$+OS(=Cp9tr*lbDoR0_Bdr*_Sx~S}=faft@Hm?sIpI9a#iXKQl z49(*?y}kOxe7&@D{#iLx?vhcizfffp&<(|B?Ox>`v^)z9J5VEN|5|EWDC}aV?d|cg z%*x*>`FYa8lFoF=!9nt&73t{V<&G}V17O`^CxL2lw+OD^Yjj&E(yQ{~Ej3?yUvBRetuG}uy_y)bRfT>7i_%__qK~ED#^ae1%wJb73Ri*4 z`{G#p$Fpw*SYBCbY>uF5r6+Pwln(Nag5}8HbL$sUdfI!_l)mtEcJ!W(^taP=SM> zYsV7HN1JDPhSE8tzq@Gn)?Zc&e-wPCn+6wEA|q9O+S-dJnD?ChgO2o=HSxnffi{A7 zi1n+*MK$_t^C+oJ8O4A{qeZ;4as1g|@BJvyI+lG9;p*qH?5i)&s?CthP_m(_RTsnf zH!Aa_mhHnuioJ*LVfj&!-B--Kh{?@x9o>p z@U6vIDO6keUHGlKZ0_TTRU!N|&h@hBvxaLelaH)@ahA406S*Ox7U<3kwx8N66j&XV zmKG{3U@X8LH-xhOrRxc1rRNYS(92|2_MuLGmRC*if#;5b1sX{Q1D-45&@@(pZ;{c# z%%dzq%6{D@e?5Bk@{!CVbk0(hZjdNbo1kf(VW%SVm6z`}E}cvQS7_WZSL6rZsAOk1 zjZj*t@gd`pdp6y;^r%DkeQ;*>M_s6#W!a`=!YkLFx+rqFg?--jzA`j+RhHD@KV^Io z&T%PAA41Km7?|JE5#k~aN6LKr-jg%D)}sPovkD_Jju6YbO{qAz6hnlEla-yB6x_qu3&J!0(qR{y_&uf#{w|% zB1Emp&iRuK^1q~}T|qd}k&DQ@8>LsD0O{p6>+?qWVYg|-t9p|qoR--+!)*CmlTvVr z!~z0EDRK4jDE*G#YHgI^1ATsf}Ow~=6 zv20$U3C06!wH1an2TWZKz6~K7TxvyYfrx@YB3Bn9E3B8qZDb3Q_8SRV6K;%aM!B9}?+#ER!uZ-f;eJ=#UGgfUx`E96#obvi>C?)|L0#^!yq zMFut{VP{6-7oE_etEsj(Xvc@_lPL+NB%^_phMM=4iZ$UpZ9LEP0QRdqD$Rm#_Vw3| zDyCGTp<^xhiiDUfmiQV_J4yBSfdNUg($Utt;pfHu8*yJ8#0mL7r{Bik(y^8Tb?LH}DjYoYXa??DbKA0+sNgsh6#g*q#fK7) zuHUbl8MTjdH=MNK$S^E4>eN^andYJ zN0ZTD{4wheeXbC?j?#*k{c2o7bm*gEM6h`4a7=(p08XQ^%3(yXhENmhkj(3UHuxz#1s7PD(nBt)HWQPnduP}DhzB{*AsQ72v;GXS&<0{_DUyBw(Y{vvo zPJMWJnESW070Kp^UHNT6edvn-u301Y!K=kVv`SHd{Qi;S!{r}-Hd$q>>3s#MIq>-}>m$W$2O~e_1!!7%ieyOe!71dwYaL(t}7HI8TMiczx+lIrM(Kjj0Tq zj80tY!y+%e-=L@AbHyLMEElj^6q>T|Qw&0Vp4^ovi+5MNce|RP$VN5^IK8!FoxA;% zI5&`fno!h;8kJcJR-RCHh9K@5=sb7-)6W;YAHXz+49C6t-p+>m=Xvzr lXXgs?AY1{E;A(Wt4mFyGf$98D{#|AO!@Fj8N^~)V{{c+uc!mG~ diff --git a/tests/dummy/public/assets/ember-logo-white.png b/tests/dummy/public/assets/ember-logo-white.png deleted file mode 100644 index a35c65db10ed5806d3a27514290174ce03e3a87e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3422 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 diff --git a/tests/dummy/public/assets/ember-logo.png b/tests/dummy/public/assets/ember-logo.png deleted file mode 100644 index 0ee86b49c90f86c76a7bd0d14316149fe25a2a0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3418 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 diff --git a/tests/dummy/public/assets/ember-paper-logo-white.png b/tests/dummy/public/assets/ember-paper-logo-white.png new file mode 100644 index 0000000000000000000000000000000000000000..74aefd105b8aed232f3abe5c2c35395f29c765d1 GIT binary patch literal 9623 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 A$N&HU From 0a1f0c986c411b4c2c41d02901a2c5938fcac1e8 Mon Sep 17 00:00:00 2001 From: Gabriel Csapo Date: Sun, 14 Jun 2020 20:11:07 -0700 Subject: [PATCH 6/9] cleans up layout pages --- tests/dummy/app/controllers/theme.js | 4 +- tests/dummy/app/routes/layout.js | 6 +- tests/dummy/app/styles/app.scss | 6 +- tests/dummy/app/styles/demo.scss | 64 +++++++++++ .../app/templates/layout/layout-children.hbs | 108 ++++++++++-------- .../templates/layout/layout-containers.hbs | 82 +++++++------ 6 files changed, 186 insertions(+), 84 deletions(-) diff --git a/tests/dummy/app/controllers/theme.js b/tests/dummy/app/controllers/theme.js index d161f3bc8..7d5dc44df 100644 --- a/tests/dummy/app/controllers/theme.js +++ b/tests/dummy/app/controllers/theme.js @@ -1,12 +1,12 @@ import Controller from '@ember/controller'; -import { inject } from '@ember/service'; +import { inject as service } from '@ember/service'; import { and, not } from '@ember/object/computed'; import PALETTES from 'ember-paper/utils/palettes'; import { computed } from '@ember/object'; export default Controller.extend({ - paperTheme: inject(), + paperTheme: service('paper-theme'), palettes: computed(function() { return Object.keys(PALETTES).map((key) => { diff --git a/tests/dummy/app/routes/layout.js b/tests/dummy/app/routes/layout.js index 95f38599c..728c67f88 100644 --- a/tests/dummy/app/routes/layout.js +++ b/tests/dummy/app/routes/layout.js @@ -1,7 +1,9 @@ import Route from '@ember/routing/route'; export default class extends Route { - beforeModel() { - this.transitionTo('layout.introduction') + beforeModel(transition) { + if(transition.to.name === 'layout.index') { + this.transitionTo('layout.introduction'); + } } } diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss index 92de709e7..f561e1deb 100644 --- a/tests/dummy/app/styles/app.scss +++ b/tests/dummy/app/styles/app.scss @@ -1,11 +1,15 @@ @import 'ember-paper'; -@import 'demo'; +$flexbox-shadow: inset 0px 0px 5px 0 rgba(0,0,0,0.16); $flexbox-color1: paper-color('deep-purple', '200'); $flexbox-color2: paper-color('orange', '400'); $flexbox-color3: paper-color('blue', '300'); $flexbox-color4: paper-color('teal', '200'); $flexbox-color5: paper-color('pink', '300'); +$flexbox-color6: paper-color('lime', '300'); +$flexbox-color7: paper-color('amber', '300'); + +@import 'demo'; .application-navbar a { border: none; diff --git a/tests/dummy/app/styles/demo.scss b/tests/dummy/app/styles/demo.scss index fe17c90d6..05d85c33d 100644 --- a/tests/dummy/app/styles/demo.scss +++ b/tests/dummy/app/styles/demo.scss @@ -1307,3 +1307,67 @@ md-toast { background: paper-color($warn, '400'); } } + + +.example div div { + box-shadow: $flexbox-shadow; + text-align: center; + color: $dark-contrast-color; +} + +.introduction-example { + height: 350px; + + .box-one { + background-color: $flexbox-color1; + } + + .box-two-one { + background-color: $flexbox-color2; + } + .box-two-two { + background-color: $flexbox-color3; + } + .box-two-three { + background-color: $flexbox-color4; + } + .box-three { + background-color: $flexbox-color5; + } +} + +.example { + > div { + height: 100%; + } + + div > div { + padding: 12px; + + &:nth-child(1) { + background-color: $flexbox-color1; + } + &:nth-child(2) { + background-color: $flexbox-color2; + } + &:nth-child(3) { + background-color: $flexbox-color3; + } + &:nth-child(4) { + background-color: $flexbox-color4; + } + &:nth-child(5) { + background-color: $flexbox-color5; + } + &:nth-child(6) { + background-color: $flexbox-color6; + } + &:nth-child(7) { + background-color: $flexbox-color7; + } + } +} + +.example-2 > div { + height: 100%; +} diff --git a/tests/dummy/app/templates/layout/layout-children.hbs b/tests/dummy/app/templates/layout/layout-children.hbs index 1d34cb819..ad871ea07 100644 --- a/tests/dummy/app/templates/layout/layout-children.hbs +++ b/tests/dummy/app/templates/layout/layout-children.hbs @@ -8,7 +8,7 @@ on the container's child elements:

- +
{{! BEGIN-SNIPPET layout-children.example1 }}
@@ -18,9 +18,12 @@
{{! END-SNIPPET }}
- - - +
+{{#let (get-code-snippet "layout-children.example1.hbs") as |snippet|}} + +{{snippet.source}} + +{{/let}}

Add the flex class to a layout's child element and the element will flex (grow or shrink) @@ -28,7 +31,7 @@ with respect to its parent container and the other elements within the container.

- +
{{! BEGIN-SNIPPET layout-children.example2 }}
@@ -42,9 +45,12 @@
{{! END-SNIPPET }}
- - - +
+{{#let (get-code-snippet "layout-children.example2.hbs") as |snippet|}} + +{{snippet.source}} + +{{/let}}

A layout child's flex class can be given an integer parameter from 0-100. @@ -56,7 +62,7 @@ flex-50, flex-66, flex-75, ... flex-100.

- +
{{! BEGIN-SNIPPET layout-children.example3 }}
@@ -69,9 +75,12 @@
{{! END-SNIPPET }}
- - - +
+{{#let (get-code-snippet "layout-children.example3.hbs") as |snippet|}} + +{{snippet.source}} + +{{/let}}

Additional Flex Parameters

@@ -80,36 +89,41 @@ API easier to understand.

- -
- {{! BEGIN-SNIPPET layout-children.example4 }} -
-
flex-none
-
flex
-
flex-nogrow
-
flex-grow
-
flex-initial
-
flex-auto
-
flex-noshrink
-
- {{! END-SNIPPET }} +
+
+ {{! BEGIN-SNIPPET layout-children.example4 }} +
+
flex-none
+
flex
+
flex-nogrow
+
flex-grow
+
flex-initial
+
flex-auto
+
flex-noshrink
- - - {{paper-api - (p-section - (p-row "flex" "Will grow and shrink as needed. Starts with a size of 0%. Same as `flex-0`.") - (p-row "flex-none" "Will not grow or shrink. Sized based on its `width` and `height` values.") - (p-row "flex-initial" "Will shrink as needed. Starts with a size based on its `width` and `height` values.") - (p-row "flex-auto" "Will shrink as needed. Starts with a size based on its `width` and `height` values.") - (p-row "flex-grow" "Will grow and shrink as needed. Starts with a size of 100%. Same as `flex-100`.") - (p-row "flex-nogrow" "Will shrink as needed, but won't grow. Starts with a size based on its `width` and `height` values.") - (p-row "flex-noshrink" "Will grow as needed, but won't shrink. Starts with a size based on its `width` and `height` values.") - ) - header=(p-row "Class" "Effect") - }} - - + {{! END-SNIPPET }} +
+
+{{#let (get-code-snippet "layout-children.example4.hbs") as |snippet|}} + +{{snippet.source}} + +{{/let}} + +
+ {{paper-api + (p-section + (p-row "flex" "Will grow and shrink as needed. Starts with a size of 0%. Same as `flex-0`.") + (p-row "flex-none" "Will not grow or shrink. Sized based on its `width` and `height` values.") + (p-row "flex-initial" "Will shrink as needed. Starts with a size based on its `width` and `height` values.") + (p-row "flex-auto" "Will shrink as needed. Starts with a size based on its `width` and `height` values.") + (p-row "flex-grow" "Will grow and shrink as needed. Starts with a size of 100%. Same as `flex-100`.") + (p-row "flex-nogrow" "Will shrink as needed, but won't grow. Starts with a size based on its `width` and `height` values.") + (p-row "flex-noshrink" "Will grow as needed, but won't shrink. Starts with a size based on its `width` and `height` values.") + ) + header=(p-row "Class" "Effect") + }} +

Ordering HTML Elements

@@ -118,7 +132,7 @@ Any integer parameter value from -20 to 20 is accepted.

- +
{{! BEGIN-SNIPPET layout-children.example5 }}
@@ -129,8 +143,12 @@
{{! END-SNIPPET }}
- - - +
+ +{{#let (get-code-snippet "layout-children.example5.hbs") as |snippet|}} + +{{snippet.source}} + +{{/let}} diff --git a/tests/dummy/app/templates/layout/layout-containers.hbs b/tests/dummy/app/templates/layout/layout-containers.hbs index 84bf93b65..7639e1281 100644 --- a/tests/dummy/app/templates/layout/layout-containers.hbs +++ b/tests/dummy/app/templates/layout/layout-containers.hbs @@ -1,5 +1,7 @@ -

Layout and Containers

+ +

Layout and Containers

+

Use the layout class on a container element to specify the layout direction for its children: horizontally in a row (layout-row) or vertically in a column (layout-column). @@ -7,15 +9,7 @@ without a parameter.

- {{paper-api - (p-section - (p-row "layout-row" "Items arranged horizontally. `max-height = 100%` and `max-width` is the width of the items in the container.") - (p-row "layout-column" "Items arranged vertically. `max-width = 100%` and `max-height` is the height of the items in the container.") - ) - header=(p-row "Class" "Effect") - }} - - +
{{! BEGIN-SNIPPET layout-containers.example1 }}
@@ -28,9 +22,23 @@
{{! END-SNIPPET }}
- - - +
+ +{{#let (get-code-snippet "layout-containers.example1.hbs") as |snippet|}} + + {{snippet.source}} + +{{/let}} + +
+ {{paper-api + (p-section + (p-row "layout-row" "Items arranged horizontally. `max-height = 100%` and `max-width` is the width of the items in the container.") + (p-row "layout-column" "Items arranged vertically. `max-width = 100%` and `max-height` is the height of the items in the container.") + ) + header=(p-row "Class" "Effect") + }} +

Note that layout only affects the flow direction for that container's immediate children. @@ -47,30 +55,13 @@ layout classes to set the layout direction for devices with view widths:

- {{paper-api - (p-section - (p-row "layout" "Sets the default layout direction unless overriden by another breakpoint.") - (p-row "layout-xs" "width < *600*px") - (p-row "layout-gt-xs" "width >= *600*px") - (p-row "layout-sm" "width *600*px <= width < *960*px") - (p-row "layout-gt-sm" "width >= *960*px") - (p-row "layout-md" "*960*px <= width < *1280*px") - (p-row "layout-gt-md" "width >= *1280*px") - (p-row "layout-lg" "*1280*px <= width < *1920*px") - (p-row "layout-gt-lg" "width >= *1920*px") - (p-row "layout-xl" "width >= *1920*px") - ) - header=(p-row "Class" "Device width when breakpoint overrides default") - sort=false - }} -

For the demo below, as you shrink your browser window width notice the flow direction changes to column for mobile devices (xs). And as you expand it will reset to row for gt-sm view sizes.

- +
{{! BEGIN-SNIPPET layout-containers.example2 }}
@@ -79,8 +70,31 @@
{{! END-SNIPPET }}
- - - +
+ +{{#let (get-code-snippet "layout-containers.example2.hbs") as |snippet|}} + + {{snippet.source}} + +{{/let}} + +
+ {{paper-api + (p-section + (p-row "layout" "Sets the default layout direction unless overriden by another breakpoint.") + (p-row "layout-xs" "width < *600*px") + (p-row "layout-gt-xs" "width >= *600*px") + (p-row "layout-sm" "width *600*px <= width < *960*px") + (p-row "layout-gt-sm" "width >= *960*px") + (p-row "layout-md" "*960*px <= width < *1280*px") + (p-row "layout-gt-md" "width >= *1280*px") + (p-row "layout-lg" "*1280*px <= width < *1920*px") + (p-row "layout-gt-lg" "width >= *1920*px") + (p-row "layout-xl" "width >= *1920*px") + ) + header=(p-row "Class" "Device width when breakpoint overrides default") + sort=false + }} +
From 14bf5f94fba4a62d5565f5fa479265f15a1a5973 Mon Sep 17 00:00:00 2001 From: Miguel Andrade Date: Wed, 15 Jul 2020 03:51:39 +0100 Subject: [PATCH 7/9] use paper tabs for main nav --- app/styles/ember-paper.scss | 2 +- app/styles/overrides/paper-tabs.scss | 7 + package-lock.json | 2760 ++++++++++++++++++--- package.json | 1 + tests/dummy/app/styles/app.scss | 24 - tests/dummy/app/templates/application.hbs | 60 +- tests/dummy/config/optional-features.json | 1 + 7 files changed, 2406 insertions(+), 449 deletions(-) create mode 100644 app/styles/overrides/paper-tabs.scss diff --git a/app/styles/ember-paper.scss b/app/styles/ember-paper.scss index f5b831cd0..96b06494c 100644 --- a/app/styles/ember-paper.scss +++ b/app/styles/ember-paper.scss @@ -68,4 +68,4 @@ // some overrides that are needed for ember-paper (avoid if possible) @import './overrides/paper-autocomplete'; - +@import './overrides/paper-tabs'; diff --git a/app/styles/overrides/paper-tabs.scss b/app/styles/overrides/paper-tabs.scss new file mode 100644 index 000000000..5b2002684 --- /dev/null +++ b/app/styles/overrides/paper-tabs.scss @@ -0,0 +1,7 @@ +md-tabs.md-primary > md-tabs-wrapper > md-tabs-canvas > md-pagination-wrapper > a.md-tab:not([disabled]).md-active { + color: paper-var(--primary-contrast); +} + +md-tabs.md-primary > md-tabs-wrapper > md-tabs-canvas > md-pagination-wrapper > a.md-tab:not([disabled]) { + color: paper-var(--primary-100); +} diff --git a/package-lock.json b/package-lock.json index 1bfe0ebf9..f72028736 100644 --- a/package-lock.json +++ b/package-lock.json @@ -340,6 +340,12 @@ "@babel/types": "^7.7.4" } }, + "@babel/helper-validator-identifier": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", + "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "dev": true + }, "@babel/helper-wrap-function": { "version": "7.7.4", "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz", @@ -590,6 +596,24 @@ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.7.4" } }, + "@babel/plugin-proposal-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz", + "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + } + } + }, "@babel/plugin-proposal-object-rest-spread": { "version": "7.7.7", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.7.tgz", @@ -618,6 +642,194 @@ "@babel/plugin-syntax-optional-chaining": "^7.7.4" } }, + "@babel/plugin-proposal-private-methods": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz", + "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==", + "dev": true, + "requires": { + "@babel/helper-create-class-features-plugin": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "dev": true, + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "@babel/generator": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.5.tgz", + "integrity": "sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig==", + "dev": true, + "requires": { + "@babel/types": "^7.10.5", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/helper-create-class-features-plugin": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz", + "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==", + "dev": true, + "requires": { + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-member-expression-to-functions": "^7.10.5", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-replace-supers": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.10.4" + } + }, + "@babel/helper-function-name": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", + "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", + "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz", + "integrity": "sha512-HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA==", + "dev": true, + "requires": { + "@babel/types": "^7.10.5" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz", + "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + }, + "@babel/helper-replace-supers": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz", + "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==", + "dev": true, + "requires": { + "@babel/helper-member-expression-to-functions": "^7.10.4", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz", + "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/highlight": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz", + "integrity": "sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==", + "dev": true + }, + "@babel/template": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", + "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/traverse": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz", + "integrity": "sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.10.5", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.10.4", + "@babel/parser": "^7.10.5", + "@babel/types": "^7.10.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", + "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "lodash": { + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, "@babel/plugin-proposal-unicode-property-regex": { "version": "7.7.7", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.7.tgz", @@ -635,6 +847,23 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-syntax-class-properties": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz", + "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + } + } + }, "@babel/plugin-syntax-decorators": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz", @@ -675,6 +904,23 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + } + } + }, "@babel/plugin-syntax-object-rest-spread": { "version": "7.7.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz", @@ -1047,6 +1293,23 @@ "@babel/plugin-syntax-typescript": "^7.7.4" } }, + "@babel/plugin-transform-unicode-escapes": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz", + "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + } + } + }, "@babel/plugin-transform-unicode-regex": { "version": "7.7.4", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz", @@ -1123,6 +1386,19 @@ "semver": "^5.5.0" } }, + "@babel/preset-modules": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz", + "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", + "@babel/plugin-transform-dotall-regex": "^7.4.4", + "@babel/types": "^7.4.4", + "esutils": "^2.0.2" + } + }, "@babel/runtime": { "version": "7.8.4", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", @@ -1193,9 +1469,9 @@ }, "dependencies": { "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true } } @@ -2075,17 +2351,51 @@ "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==", "dev": true }, + "@types/body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==", + "dev": true, + "requires": { + "@types/connect": "*", + "@types/node": "*" + } + }, "@types/broccoli-plugin": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@types/broccoli-plugin/-/broccoli-plugin-1.3.0.tgz", "integrity": "sha512-SLk4/hFc2kGvgwNFrpn2O1juxFOllcHAywvlo7VwxfExLzoz1GGJ0oIZCwj5fwSpvHw4AWpZjJ1fUvb62PDayQ==" }, + "@types/chai": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.11.tgz", + "integrity": "sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==", + "dev": true + }, + "@types/chai-as-promised": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.3.tgz", + "integrity": "sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==", + "dev": true, + "requires": { + "@types/chai": "*" + } + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", "dev": true }, + "@types/connect": { + "version": "3.4.33", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz", + "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/estree": { "version": "0.0.41", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.41.tgz", @@ -2096,6 +2406,29 @@ "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==" }, + "@types/express": { + "version": "4.17.7", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.7.tgz", + "integrity": "sha512-dCOT5lcmV/uC2J9k0rPafATeeyz+99xTt54ReX11/LObZgfzJqZNcW27zGhYyX+9iSEGXGt5qLPwRSvBZcLvtQ==", + "dev": true, + "requires": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "*", + "@types/qs": "*", + "@types/serve-static": "*" + } + }, + "@types/express-serve-static-core": { + "version": "4.17.8", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.8.tgz", + "integrity": "sha512-1SJZ+R3Q/7mLkOD9ewCBDYD2k0WyZQtWYqF/2VvoNN2/uhI49J9CDN4OAm+wGMA0DbArA4ef27xl4+JwMtGggw==", + "dev": true, + "requires": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*" + } + }, "@types/fs-extra": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.1.0.tgz", @@ -2114,6 +2447,12 @@ "@types/node": "*" } }, + "@types/mime": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.2.tgz", + "integrity": "sha512-4kPlzbljFcsttWEq6aBW0OZe6BDajAmyvr2xknBG92tejQnvdGtT9+kXSZ580DqpxY9qG2xeQVF9Dq0ymUTo5Q==", + "dev": true + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -2124,6 +2463,18 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.2.tgz", "integrity": "sha512-B8emQA1qeKerqd1dmIsQYnXi+mmAzTB7flExjmy5X1aVAKFNNNDubkavwR13kR6JnpeLp3aLoJhwn9trWPAyFQ==" }, + "@types/qs": { + "version": "6.9.3", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.3.tgz", + "integrity": "sha512-7s9EQWupR1fTc2pSMtXRQ9w9gLOcrJn+h7HOXw4evxyvVqMi4f+q7d2tnFe3ng3SNHjtK+0EzGMGFUQX4/AQRA==", + "dev": true + }, + "@types/range-parser": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", + "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==", + "dev": true + }, "@types/rimraf": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.3.tgz", @@ -2133,6 +2484,16 @@ "@types/node": "*" } }, + "@types/serve-static": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.4.tgz", + "integrity": "sha512-jTDt0o/YbpNwZbQmE/+2e+lfjJEJJR0I3OFaKQKPWkASkCoW3i6fsUnqudSMcNAfbtmADGu8f4MV4q+GqULmug==", + "dev": true, + "requires": { + "@types/express-serve-static-core": "*", + "@types/mime": "*" + } + }, "@types/symlink-or-copy": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz", @@ -3945,16 +4306,25 @@ } }, "bower-config": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/bower-config/-/bower-config-1.4.1.tgz", - "integrity": "sha1-hf2d82fCuNu9DKpMXyutQM2Ewsw=", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/bower-config/-/bower-config-1.4.3.tgz", + "integrity": "sha512-MVyyUk3d1S7d2cl6YISViwJBc2VXCkxF5AUFykvN0PQj5FsUiMNSgAYTso18oRFfyZ6XEtjrgg9MAaufHbOwNw==", "dev": true, "requires": { "graceful-fs": "^4.1.3", + "minimist": "^0.2.1", "mout": "^1.0.0", - "optimist": "^0.6.1", "osenv": "^0.1.3", - "untildify": "^2.1.0" + "untildify": "^2.1.0", + "wordwrap": "^0.0.3" + }, + "dependencies": { + "minimist": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.1.tgz", + "integrity": "sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==", + "dev": true + } } }, "bower-endpoint-parser": { @@ -4000,79 +4370,182 @@ } }, "broccoli": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/broccoli/-/broccoli-3.2.0.tgz", - "integrity": "sha512-n58yqAbV2Zbg+HXmBGBOUoDOgbCM0hMJtqvnPDF89Jwk3ZBVhD5/UKW0diY6l3DbB5+j92NCDQVd9HqO+WYFYA==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/broccoli/-/broccoli-3.4.2.tgz", + "integrity": "sha512-OZ0QEyL2i08xJWwhg9Fe0x5IScjBur986QRWrj5mAyHRZqF1nShEz01BPFoLt6L2tqJT0gyZsf8nfUvm8CcJgA==", "dev": true, "requires": { + "@types/chai": "^4.2.9", + "@types/chai-as-promised": "^7.1.2", + "@types/express": "^4.17.2", "ansi-html": "^0.0.7", "broccoli-node-info": "^2.1.0", "broccoli-slow-trees": "^3.0.1", - "broccoli-source": "^1.1.0", - "commander": "^2.15.1", + "broccoli-source": "^3.0.0", + "commander": "^4.1.1", "connect": "^3.6.6", "console-ui": "^3.0.4", "esm": "^3.2.4", - "findup-sync": "^2.0.0", - "handlebars": "^4.0.11", + "findup-sync": "^4.0.0", + "handlebars": "^4.7.3", "heimdalljs": "^0.2.6", "heimdalljs-logger": "^0.1.9", "https": "^1.0.0", - "mime-types": "^2.1.19", - "promise.prototype.finally": "^3.1.0", + "mime-types": "^2.1.26", "resolve-path": "^1.4.0", - "rimraf": "^2.6.2", + "rimraf": "^3.0.2", "sane": "^4.0.0", - "tmp": "0.0.33", - "tree-sync": "^1.2.2", + "tmp": "^0.0.33", + "tree-sync": "^2.0.0", "underscore.string": "^3.2.2", - "watch-detector": "^0.1.0" + "watch-detector": "^1.0.0" }, "dependencies": { - "rsvp": { - "version": "4.8.5", - "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", - "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==", + "broccoli-source": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/broccoli-source/-/broccoli-source-3.0.0.tgz", + "integrity": "sha512-G4Zc8HngZIdASyQOiz/9H/0Gjc2F02EFwhWF4wiueaI+/FBrM9Ixj6Prno/1aiLIYcN0JvRC3oytN9uOVonTww==", + "dev": true, + "requires": { + "broccoli-node-api": "^1.6.0" + } + }, + "commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", "dev": true }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "os-tmpdir": "~1.0.2" + "ms": "^2.1.1" } }, - "watch-detector": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/watch-detector/-/watch-detector-0.1.0.tgz", - "integrity": "sha512-vfzMMfpjQc88xjETwl2HuE6PjEuxCBeyC4bQmqrHrofdfYWi/4mEJklYbNgSzpqM9PxubsiPIrE5SZ1FDyiQ2w==", + "fs-tree-diff": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz", + "integrity": "sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A==", "dev": true, "requires": { - "heimdalljs-logger": "^0.1.9", - "quick-temp": "^0.1.8", - "rsvp": "^4.7.0", - "semver": "^5.4.1", - "silent-error": "^1.1.0" + "@types/symlink-or-copy": "^1.2.0", + "heimdalljs-logger": "^0.1.7", + "object-assign": "^4.1.0", + "path-posix": "^1.0.0", + "symlink-or-copy": "^1.1.8" } - } - } - }, - "broccoli-amd-funnel": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/broccoli-amd-funnel/-/broccoli-amd-funnel-2.0.1.tgz", - "integrity": "sha512-VRE+0PYAN4jQfkIq3GKRj4U/4UV9rVpLan5ll6fVYV4ziVg4OEfR5GUnILEg++QtR4xSaugRxCPU5XJLDy3bNQ==", - "dev": true, - "requires": { - "broccoli-plugin": "^1.3.0", - "symlink-or-copy": "^1.2.0" - } - }, - "broccoli-asset-rev": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/broccoli-asset-rev/-/broccoli-asset-rev-3.0.0.tgz", - "integrity": "sha512-gAHQZnwvtl74tGevUqGuWoyOdJUdMMv0TjGSMzbdyGImr9fZcnM6xmggDA8bUawrMto9NFi00ZtNUgA4dQiUBw==", + }, + "handlebars": { + "version": "4.7.6", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz", + "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==", + "dev": true, + "requires": { + "minimist": "^1.2.5", + "neo-async": "^2.6.0", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4", + "wordwrap": "^1.0.0" + } + }, + "mime-db": { + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", + "dev": true + }, + "mime-types": { + "version": "2.1.27", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", + "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", + "dev": true, + "requires": { + "mime-db": "1.44.0" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "requires": { + "os-tmpdir": "~1.0.2" + } + }, + "tree-sync": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tree-sync/-/tree-sync-2.1.0.tgz", + "integrity": "sha512-OLWW+Nd99NOM53aZ8ilT/YpEiOo6mXD3F4/wLbARqybSZ3Jb8IxHK5UGVbZaae0wtXAyQshVV+SeqVBik+Fbmw==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "fs-tree-diff": "^2.0.1", + "mkdirp": "^0.5.5", + "quick-temp": "^0.1.5", + "walk-sync": "^0.3.3" + } + }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + } + } + }, + "broccoli-amd-funnel": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/broccoli-amd-funnel/-/broccoli-amd-funnel-2.0.1.tgz", + "integrity": "sha512-VRE+0PYAN4jQfkIq3GKRj4U/4UV9rVpLan5ll6fVYV4ziVg4OEfR5GUnILEg++QtR4xSaugRxCPU5XJLDy3bNQ==", + "dev": true, + "requires": { + "broccoli-plugin": "^1.3.0", + "symlink-or-copy": "^1.2.0" + } + }, + "broccoli-asset-rev": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/broccoli-asset-rev/-/broccoli-asset-rev-3.0.0.tgz", + "integrity": "sha512-gAHQZnwvtl74tGevUqGuWoyOdJUdMMv0TjGSMzbdyGImr9fZcnM6xmggDA8bUawrMto9NFi00ZtNUgA4dQiUBw==", "dev": true, "requires": { "broccoli-asset-rewrite": "^2.0.0", @@ -4578,45 +5051,6 @@ } } }, - "broccoli-module-normalizer": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/broccoli-module-normalizer/-/broccoli-module-normalizer-1.3.0.tgz", - "integrity": "sha512-0idZCOtdVG6xXoQ36Psc1ApMCr3lW5DB+WEAOEwHcUoESIBHzwcRPQTxheGIjZ5o0hxpsRYAUH5x0ErtNezbrQ==", - "dev": true, - "requires": { - "broccoli-plugin": "^1.3.0", - "merge-trees": "^1.0.1", - "rimraf": "^2.6.2", - "symlink-or-copy": "^1.1.8" - }, - "dependencies": { - "merge-trees": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-trees/-/merge-trees-1.0.1.tgz", - "integrity": "sha1-zL5nRWl4f53vF/1G5lJfVwC70j4=", - "dev": true, - "requires": { - "can-symlink": "^1.0.0", - "fs-tree-diff": "^0.5.4", - "heimdalljs": "^0.2.1", - "heimdalljs-logger": "^0.1.7", - "rimraf": "^2.4.3", - "symlink-or-copy": "^1.0.0" - } - } - } - }, - "broccoli-module-unification-reexporter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/broccoli-module-unification-reexporter/-/broccoli-module-unification-reexporter-1.0.0.tgz", - "integrity": "sha512-HTi9ua520M20aBZomaiBopsSt3yjL7J/paR3XPjieygK7+ShATBiZdn0B+ZPiniBi4I8JuMn1q0fNFUevtP//A==", - "dev": true, - "requires": { - "broccoli-plugin": "^1.3.0", - "mkdirp": "^0.5.1", - "walk-sync": "^0.3.2" - } - }, "broccoli-node-api": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/broccoli-node-api/-/broccoli-node-api-1.7.0.tgz", @@ -4772,9 +5206,9 @@ } }, "broccoli-slow-trees": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/broccoli-slow-trees/-/broccoli-slow-trees-3.0.1.tgz", - "integrity": "sha1-m/Kp4vjrPtOj8qvd6YjaQ3zNybQ=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/broccoli-slow-trees/-/broccoli-slow-trees-3.1.0.tgz", + "integrity": "sha512-FRI7mRTk2wjIDrdNJd6znS7Kmmne4VkAkl8Ix1R/VoePFMD0g0tEl671xswzFqaRjpT9Qu+CC4hdXDLDJBuzMw==", "dev": true, "requires": { "heimdalljs": "^0.2.1" @@ -5515,9 +5949,9 @@ } }, "cli-spinners": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz", - "integrity": "sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz", + "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==", "dev": true }, "cli-table": { @@ -5696,9 +6130,9 @@ }, "dependencies": { "mime-db": { - "version": "1.43.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", - "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==", + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", "dev": true } } @@ -5778,9 +6212,9 @@ }, "dependencies": { "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { "semver": "^6.0.0" @@ -5930,9 +6364,9 @@ } }, "safe-buffer": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", - "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true }, "string-width": { @@ -5983,11 +6417,12 @@ } }, "through2": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", - "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", + "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", "dev": true, "requires": { + "inherits": "^2.0.4", "readable-stream": "2 || 3" } } @@ -6921,20 +7356,20 @@ } }, "ember-cli": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/ember-cli/-/ember-cli-3.16.0.tgz", - "integrity": "sha512-he5uLPapZT3kZpItseUlAoe05qurFx46e3AcS1jLqzsZW0a5tQosX3yhsEAWQaNZaJr1izMpmdPx4kF5/UN6pw==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/ember-cli/-/ember-cli-3.17.0.tgz", + "integrity": "sha512-0GVer7AyV/g8hclbD64FmsNkULQ0N1pEQytB+utuJl8c6NFU4EUMJL7NyM/NRd7rzupMMR1jwzhxYTCY50ZRcg==", "dev": true, "requires": { - "@babel/core": "^7.7.7", + "@babel/core": "^7.8.4", "@babel/plugin-transform-modules-amd": "^7.7.5", "amd-name-resolver": "^1.3.1", "babel-plugin-module-resolver": "^4.0.0", "bower-config": "^1.4.1", "bower-endpoint-parser": "0.2.2", - "broccoli": "^3.2.0", + "broccoli": "^3.3.3", "broccoli-amd-funnel": "^2.0.1", - "broccoli-babel-transpiler": "^7.3.0", + "broccoli-babel-transpiler": "^7.4.0", "broccoli-builder": "^0.18.14", "broccoli-concat": "^3.7.4", "broccoli-config-loader": "^1.0.1", @@ -6944,8 +7379,6 @@ "broccoli-funnel-reducer": "^1.0.0", "broccoli-merge-trees": "^3.0.2", "broccoli-middleware": "^2.1.1", - "broccoli-module-normalizer": "^1.3.0", - "broccoli-module-unification-reexporter": "^1.0.0", "broccoli-slow-trees": "^3.0.1", "broccoli-source": "^3.0.0", "broccoli-stew": "^3.0.0", @@ -6955,7 +7388,7 @@ "ci-info": "^2.0.0", "clean-base-url": "^1.0.0", "compression": "^1.7.4", - "configstore": "^5.0.0", + "configstore": "^5.0.1", "console-ui": "^3.1.1", "core-object": "^3.1.5", "dag-map": "^2.0.2", @@ -6990,25 +7423,24 @@ "json-stable-stringify": "^1.0.1", "leek": "0.0.24", "lodash.template": "^4.5.0", - "markdown-it": "^9.1.0", - "markdown-it-terminal": "0.1.0", + "markdown-it": "^10.0.0", + "markdown-it-terminal": "0.1.1", "minimatch": "^3.0.4", "morgan": "^1.9.1", "nopt": "^3.0.6", - "npm-package-arg": "^6.1.1", + "npm-package-arg": "^8.0.0", "p-defer": "^3.0.0", "portfinder": "^1.0.25", "promise-map-series": "^0.3.0", - "promise.prototype.finally": "^3.1.2", + "promise.hash.helper": "^1.0.2", "quick-temp": "^0.1.8", - "resolve": "^1.12.0", + "resolve": "^1.15.1", "resolve-package-path": "^2.0.0", - "rsvp": "^4.8.5", "sane": "^4.1.0", "semver": "^6.3.0", "silent-error": "^1.1.1", "sort-package-json": "^1.39.1", - "symlink-or-copy": "^1.2.0", + "symlink-or-copy": "^1.3.1", "temp": "0.9.1", "testem": "^3.0.1", "tiny-lr": "^1.1.1", @@ -7019,6 +7451,231 @@ "yam": "^1.0.0" }, "dependencies": { + "@babel/code-frame": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "dev": true, + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "@babel/core": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.5.tgz", + "integrity": "sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.10.5", + "@babel/helper-module-transforms": "^7.10.5", + "@babel/helpers": "^7.10.4", + "@babel/parser": "^7.10.5", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.10.5", + "@babel/types": "^7.10.5", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.19", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "@babel/generator": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.5.tgz", + "integrity": "sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig==", + "dev": true, + "requires": { + "@babel/types": "^7.10.5", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", + "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", + "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz", + "integrity": "sha512-HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA==", + "dev": true, + "requires": { + "@babel/types": "^7.10.5" + } + }, + "@babel/helper-module-imports": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz", + "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-module-transforms": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz", + "integrity": "sha512-4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-replace-supers": "^7.10.4", + "@babel/helper-simple-access": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.5", + "lodash": "^4.17.19" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz", + "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-replace-supers": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz", + "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==", + "dev": true, + "requires": { + "@babel/helper-member-expression-to-functions": "^7.10.4", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-simple-access": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz", + "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==", + "dev": true, + "requires": { + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz", + "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helpers": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz", + "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==", + "dev": true, + "requires": { + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/highlight": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + } + } + }, + "@babel/parser": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz", + "integrity": "sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==", + "dev": true + }, + "@babel/template": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", + "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/traverse": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz", + "integrity": "sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.10.5", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.10.4", + "@babel/parser": "^7.10.5", + "@babel/types": "^7.10.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", + "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, "babel-plugin-module-resolver": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.0.0.tgz", @@ -7237,6 +7894,15 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, "locate-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", @@ -7247,6 +7913,27 @@ "path-exists": "^3.0.0" } }, + "lodash": { + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "dev": true + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -7254,9 +7941,9 @@ "dev": true }, "p-limit": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", - "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -7309,6 +7996,15 @@ "integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==", "dev": true }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + }, "resolve-package-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-2.0.0.tgz", @@ -7332,45 +8028,18 @@ "dev": true }, "tree-sync": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/tree-sync/-/tree-sync-2.0.0.tgz", - "integrity": "sha512-AzeJnbmJjGVfWMTJ0T152fv8NDTbQc9ERY4nEs7Lmxd94Xah2bUS56+CcoTh6FB8qn2KjBMjC0mLNc731aVBqw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tree-sync/-/tree-sync-2.1.0.tgz", + "integrity": "sha512-OLWW+Nd99NOM53aZ8ilT/YpEiOo6mXD3F4/wLbARqybSZ3Jb8IxHK5UGVbZaae0wtXAyQshVV+SeqVBik+Fbmw==", "dev": true, "requires": { - "debug": "^2.2.0", - "fs-tree-diff": "^0.5.6", - "mkdirp": "^0.5.1", + "debug": "^4.1.1", + "fs-tree-diff": "^2.0.1", + "mkdirp": "^0.5.5", "quick-temp": "^0.1.5", "walk-sync": "^0.3.3" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "fs-tree-diff": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz", - "integrity": "sha512-872G8ax0kHh01m9n/2KDzgYwouKza0Ad9iFltBpNykvROvf2AGtoOzPJgGx125aolGPER3JuC7uZFrQ7bG1AZw==", - "dev": true, - "requires": { - "heimdalljs-logger": "^0.1.7", - "object-assign": "^4.1.0", - "path-posix": "^1.0.0", - "symlink-or-copy": "^1.1.8" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, "walk-sync": { "version": "0.3.4", "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.4.tgz", @@ -7390,14 +8059,15 @@ "dev": true }, "walk-sync": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-2.0.2.tgz", - "integrity": "sha512-dCZkrxfHjPn7tIvdYrX3uMD/R0beVrHpA8lROQ5wWrl8psJgR6xwCkwqTFes0dNujbS2o/ITpvSYgIFsLsf13A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-2.2.0.tgz", + "integrity": "sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==", "dev": true, "requires": { "@types/minimatch": "^3.0.3", "ensure-posix-path": "^1.1.0", - "matcher-collection": "^2.0.0" + "matcher-collection": "^2.0.0", + "minimatch": "^3.0.4" }, "dependencies": { "matcher-collection": { @@ -8938,6 +9608,11 @@ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.582.tgz", "integrity": "sha512-0nCJ7cSqnkMC+kUuPs0YgklFHraWGl/xHqtZWWtOeVtyi+YqkoAOMGuZQad43DscXCQI/yizcTa3u6B5r+BLww==" }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + }, "node-releases": { "version": "1.1.64", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.64.tgz", @@ -11290,49 +11965,1314 @@ } } }, - "ember-cli-babel": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz", - "integrity": "sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==", + "ember-cli-babel": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz", + "integrity": "sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==", + "dev": true, + "requires": { + "amd-name-resolver": "1.2.0", + "babel-plugin-debug-macros": "^0.2.0-beta.6", + "babel-plugin-ember-modules-api-polyfill": "^2.6.0", + "babel-plugin-transform-es2015-modules-amd": "^6.24.0", + "babel-polyfill": "^6.26.0", + "babel-preset-env": "^1.7.0", + "broccoli-babel-transpiler": "^6.5.0", + "broccoli-debug": "^0.6.4", + "broccoli-funnel": "^2.0.0", + "broccoli-source": "^1.1.0", + "clone": "^2.0.0", + "ember-cli-version-checker": "^2.1.2", + "semver": "^5.5.0" + } + }, + "ember-cli-version-checker": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz", + "integrity": "sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==", + "dev": true, + "requires": { + "resolve": "^1.3.3", + "semver": "^5.3.0" + } + }, + "merge-trees": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-trees/-/merge-trees-1.0.1.tgz", + "integrity": "sha1-zL5nRWl4f53vF/1G5lJfVwC70j4=", + "dev": true, + "requires": { + "can-symlink": "^1.0.0", + "fs-tree-diff": "^0.5.4", + "heimdalljs": "^0.2.1", + "heimdalljs-logger": "^0.1.7", + "rimraf": "^2.4.3", + "symlink-or-copy": "^1.0.0" + } + }, + "rsvp": { + "version": "4.8.5", + "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", + "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==", + "dev": true + }, + "workerpool": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-2.3.3.tgz", + "integrity": "sha512-L1ovlYHp6UObYqElXXpbd214GgbEKDED0d3sj7pRdFXjNkb2+un/AUcCkceHizO0IVI6SOGGncrcjozruCkRgA==", + "dev": true, + "requires": { + "object-assign": "4.1.1" + } + } + } + }, + "ember-resolver": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/ember-resolver/-/ember-resolver-7.0.0.tgz", + "integrity": "sha512-tqyWk9E1P5LL42x7AnVoE25a/YWe0WcwAr8LXasm5V7Az3vFR/zbFtwN0oI3tpoSP/nCoGWDct6dRYlXrQjqBQ==", + "dev": true, + "requires": { + "babel-plugin-debug-macros": "^0.3.3", + "broccoli-funnel": "^2.0.2", + "broccoli-merge-trees": "^3.0.0", + "ember-cli-babel": "^7.13.2", + "ember-cli-version-checker": "^3.1.3", + "resolve": "^1.14.0" + } + }, + "ember-rfc176-data": { + "version": "0.3.12", + "resolved": "https://registry.npmjs.org/ember-rfc176-data/-/ember-rfc176-data-0.3.12.tgz", + "integrity": "sha512-g9HeZj/gU5bfIIrGXkP7MhS2b3Vu5DfNUrYr14hy99TgIvtZETO+96QF4WOEUXGjIJdfTRjerVnQlqngPQSv1g==" + }, + "ember-router-generator": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ember-router-generator/-/ember-router-generator-2.0.0.tgz", + "integrity": "sha512-89oVHVJwmLDvGvAUWgS87KpBoRhy3aZ6U0Ql6HOmU4TrPkyaa8pM0W81wj9cIwjYprcQtN9EwzZMHnq46+oUyw==", + "dev": true, + "requires": { + "@babel/parser": "^7.4.5", + "@babel/traverse": "^7.4.5", + "recast": "^0.18.1" + } + }, + "ember-router-helpers": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/ember-router-helpers/-/ember-router-helpers-0.4.0.tgz", + "integrity": "sha512-DiPyncEAACKV/XcmYqUwh0iHBPvGW75Fw1uerDudblofXTtAH/+QzeE/0wK2G6MUBWKyn0HyIuLXE3pJm0zKFg==", + "dev": true, + "requires": { + "ember-cli-babel": "^7.20.0" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "dev": true, + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "@babel/compat-data": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.5.tgz", + "integrity": "sha512-mPVoWNzIpYJHbWje0if7Ck36bpbtTvIxOi9+6WSK9wjGEXearAqlwBoTQvVjsAY2VIwgcs8V940geY3okzRCEw==", + "dev": true, + "requires": { + "browserslist": "^4.12.0", + "invariant": "^2.2.4", + "semver": "^5.5.0" + } + }, + "@babel/core": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.5.tgz", + "integrity": "sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.10.5", + "@babel/helper-module-transforms": "^7.10.5", + "@babel/helpers": "^7.10.4", + "@babel/parser": "^7.10.5", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.10.5", + "@babel/types": "^7.10.5", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.19", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + } + }, + "@babel/generator": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.5.tgz", + "integrity": "sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig==", + "dev": true, + "requires": { + "@babel/types": "^7.10.5", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/helper-annotate-as-pure": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz", + "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-builder-binary-assignment-operator-visitor": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz", + "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==", + "dev": true, + "requires": { + "@babel/helper-explode-assignable-expression": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-compilation-targets": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz", + "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.10.4", + "browserslist": "^4.12.0", + "invariant": "^2.2.4", + "levenary": "^1.1.1", + "semver": "^5.5.0" + } + }, + "@babel/helper-create-class-features-plugin": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz", + "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==", + "dev": true, + "requires": { + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-member-expression-to-functions": "^7.10.5", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-replace-supers": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.10.4" + } + }, + "@babel/helper-create-regexp-features-plugin": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz", + "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-regex": "^7.10.4", + "regexpu-core": "^4.7.0" + } + }, + "@babel/helper-define-map": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz", + "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==", + "dev": true, + "requires": { + "@babel/helper-function-name": "^7.10.4", + "@babel/types": "^7.10.5", + "lodash": "^4.17.19" + } + }, + "@babel/helper-explode-assignable-expression": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz", + "integrity": "sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==", + "dev": true, + "requires": { + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-function-name": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", + "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", + "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-hoist-variables": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz", + "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz", + "integrity": "sha512-HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA==", + "dev": true, + "requires": { + "@babel/types": "^7.10.5" + } + }, + "@babel/helper-module-imports": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz", + "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-module-transforms": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz", + "integrity": "sha512-4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-replace-supers": "^7.10.4", + "@babel/helper-simple-access": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.5", + "lodash": "^4.17.19" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz", + "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "dev": true + }, + "@babel/helper-regex": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz", + "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==", + "dev": true, + "requires": { + "lodash": "^4.17.19" + } + }, + "@babel/helper-remap-async-to-generator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz", + "integrity": "sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-wrap-function": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-replace-supers": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz", + "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==", + "dev": true, + "requires": { + "@babel/helper-member-expression-to-functions": "^7.10.4", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-simple-access": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz", + "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==", + "dev": true, + "requires": { + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz", + "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-wrap-function": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz", + "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==", + "dev": true, + "requires": { + "@babel/helper-function-name": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helpers": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz", + "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==", + "dev": true, + "requires": { + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/highlight": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz", + "integrity": "sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==", + "dev": true + }, + "@babel/plugin-proposal-async-generator-functions": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz", + "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-remap-async-to-generator": "^7.10.4", + "@babel/plugin-syntax-async-generators": "^7.8.0" + } + }, + "@babel/plugin-proposal-class-properties": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz", + "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==", + "dev": true, + "requires": { + "@babel/helper-create-class-features-plugin": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-proposal-decorators": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.5.tgz", + "integrity": "sha512-Sc5TAQSZuLzgY0664mMDn24Vw2P8g/VhyLyGPaWiHahhgLqeZvcGeyBZOrJW0oSKIK2mvQ22a1ENXBIQLhrEiQ==", + "dev": true, + "requires": { + "@babel/helper-create-class-features-plugin": "^7.10.5", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-decorators": "^7.10.4" + } + }, + "@babel/plugin-proposal-dynamic-import": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz", + "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-dynamic-import": "^7.8.0" + } + }, + "@babel/plugin-proposal-json-strings": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz", + "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-json-strings": "^7.8.0" + } + }, + "@babel/plugin-proposal-nullish-coalescing-operator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz", + "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0" + } + }, + "@babel/plugin-proposal-object-rest-spread": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz", + "integrity": "sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-transform-parameters": "^7.10.4" + } + }, + "@babel/plugin-proposal-optional-catch-binding": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz", + "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" + } + }, + "@babel/plugin-proposal-optional-chaining": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz", + "integrity": "sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-optional-chaining": "^7.8.0" + } + }, + "@babel/plugin-proposal-unicode-property-regex": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz", + "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==", + "dev": true, + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-decorators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz", + "integrity": "sha512-2NaoC6fAk2VMdhY1eerkfHV+lVYC1u8b+jmRJISqANCJlTxYy19HGdIkkQtix2UtkcPuPu+IlDgrVseZnU03bw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-dynamic-import": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", + "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-top-level-await": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz", + "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-typescript": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz", + "integrity": "sha512-oSAEz1YkBCAKr5Yiq8/BNtvSAPwkp/IyUnwZogd8p+F0RuYQQrLeRUzIQhueQTTBy/F+a40uS7OFKxnkRvmvFQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-arrow-functions": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz", + "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-async-to-generator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz", + "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-remap-async-to-generator": "^7.10.4" + } + }, + "@babel/plugin-transform-block-scoped-functions": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz", + "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-block-scoping": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.5.tgz", + "integrity": "sha512-6Ycw3hjpQti0qssQcA6AMSFDHeNJ++R6dIMnpRqUjFeBBTmTDPa8zgF90OVfTvAo11mXZTlVUViY1g8ffrURLg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-classes": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz", + "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-define-map": "^7.10.4", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-replace-supers": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.10.4", + "globals": "^11.1.0" + } + }, + "@babel/plugin-transform-computed-properties": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz", + "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-destructuring": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz", + "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-dotall-regex": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz", + "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==", + "dev": true, + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-duplicate-keys": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz", + "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-exponentiation-operator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz", + "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==", + "dev": true, + "requires": { + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-for-of": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz", + "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-function-name": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz", + "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==", + "dev": true, + "requires": { + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-literals": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz", + "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-member-expression-literals": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz", + "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-modules-amd": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz", + "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==", + "dev": true, + "requires": { + "@babel/helper-module-transforms": "^7.10.5", + "@babel/helper-plugin-utils": "^7.10.4", + "babel-plugin-dynamic-import-node": "^2.3.3" + } + }, + "@babel/plugin-transform-modules-commonjs": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz", + "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==", + "dev": true, + "requires": { + "@babel/helper-module-transforms": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-simple-access": "^7.10.4", + "babel-plugin-dynamic-import-node": "^2.3.3" + } + }, + "@babel/plugin-transform-modules-systemjs": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz", + "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==", + "dev": true, + "requires": { + "@babel/helper-hoist-variables": "^7.10.4", + "@babel/helper-module-transforms": "^7.10.5", + "@babel/helper-plugin-utils": "^7.10.4", + "babel-plugin-dynamic-import-node": "^2.3.3" + } + }, + "@babel/plugin-transform-modules-umd": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz", + "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==", + "dev": true, + "requires": { + "@babel/helper-module-transforms": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz", + "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==", + "dev": true, + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.10.4" + } + }, + "@babel/plugin-transform-new-target": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz", + "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-object-super": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz", + "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-replace-supers": "^7.10.4" + } + }, + "@babel/plugin-transform-parameters": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz", + "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-property-literals": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz", + "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-regenerator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz", + "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==", + "dev": true, + "requires": { + "regenerator-transform": "^0.14.2" + } + }, + "@babel/plugin-transform-reserved-words": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz", + "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-runtime": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.5.tgz", + "integrity": "sha512-tV4V/FjElJ9lQtyjr5xD2IFFbgY46r7EeVu5a8CpEKT5laheHKSlFeHjpkPppW3PqzGLAuv5k2qZX5LgVZIX5w==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "resolve": "^1.8.1", + "semver": "^5.5.1" + } + }, + "@babel/plugin-transform-shorthand-properties": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz", + "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-spread": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz", + "integrity": "sha512-1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-sticky-regex": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz", + "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-regex": "^7.10.4" + } + }, + "@babel/plugin-transform-template-literals": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz", + "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-typeof-symbol": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz", + "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-transform-typescript": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.5.tgz", + "integrity": "sha512-YCyYsFrrRMZ3qR7wRwtSSJovPG5vGyG4ZdcSAivGwTfoasMp3VOB/AKhohu3dFtmB4cCDcsndCSxGtrdliCsZQ==", + "dev": true, + "requires": { + "@babel/helper-create-class-features-plugin": "^7.10.5", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-typescript": "^7.10.4" + } + }, + "@babel/plugin-transform-unicode-regex": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz", + "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==", + "dev": true, + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/polyfill": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.10.4.tgz", + "integrity": "sha512-8BYcnVqQ5kMD2HXoHInBH7H1b/uP3KdnwCYXOqFnXqguOyuu443WXusbIUbWEfY3Z0Txk0M1uG/8YuAMhNl6zg==", + "dev": true, + "requires": { + "core-js": "^2.6.5", + "regenerator-runtime": "^0.13.4" + } + }, + "@babel/preset-env": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.4.tgz", + "integrity": "sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.10.4", + "@babel/helper-compilation-targets": "^7.10.4", + "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-proposal-async-generator-functions": "^7.10.4", + "@babel/plugin-proposal-class-properties": "^7.10.4", + "@babel/plugin-proposal-dynamic-import": "^7.10.4", + "@babel/plugin-proposal-json-strings": "^7.10.4", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4", + "@babel/plugin-proposal-numeric-separator": "^7.10.4", + "@babel/plugin-proposal-object-rest-spread": "^7.10.4", + "@babel/plugin-proposal-optional-catch-binding": "^7.10.4", + "@babel/plugin-proposal-optional-chaining": "^7.10.4", + "@babel/plugin-proposal-private-methods": "^7.10.4", + "@babel/plugin-proposal-unicode-property-regex": "^7.10.4", + "@babel/plugin-syntax-async-generators": "^7.8.0", + "@babel/plugin-syntax-class-properties": "^7.10.4", + "@babel/plugin-syntax-dynamic-import": "^7.8.0", + "@babel/plugin-syntax-json-strings": "^7.8.0", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", + "@babel/plugin-syntax-optional-chaining": "^7.8.0", + "@babel/plugin-syntax-top-level-await": "^7.10.4", + "@babel/plugin-transform-arrow-functions": "^7.10.4", + "@babel/plugin-transform-async-to-generator": "^7.10.4", + "@babel/plugin-transform-block-scoped-functions": "^7.10.4", + "@babel/plugin-transform-block-scoping": "^7.10.4", + "@babel/plugin-transform-classes": "^7.10.4", + "@babel/plugin-transform-computed-properties": "^7.10.4", + "@babel/plugin-transform-destructuring": "^7.10.4", + "@babel/plugin-transform-dotall-regex": "^7.10.4", + "@babel/plugin-transform-duplicate-keys": "^7.10.4", + "@babel/plugin-transform-exponentiation-operator": "^7.10.4", + "@babel/plugin-transform-for-of": "^7.10.4", + "@babel/plugin-transform-function-name": "^7.10.4", + "@babel/plugin-transform-literals": "^7.10.4", + "@babel/plugin-transform-member-expression-literals": "^7.10.4", + "@babel/plugin-transform-modules-amd": "^7.10.4", + "@babel/plugin-transform-modules-commonjs": "^7.10.4", + "@babel/plugin-transform-modules-systemjs": "^7.10.4", + "@babel/plugin-transform-modules-umd": "^7.10.4", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4", + "@babel/plugin-transform-new-target": "^7.10.4", + "@babel/plugin-transform-object-super": "^7.10.4", + "@babel/plugin-transform-parameters": "^7.10.4", + "@babel/plugin-transform-property-literals": "^7.10.4", + "@babel/plugin-transform-regenerator": "^7.10.4", + "@babel/plugin-transform-reserved-words": "^7.10.4", + "@babel/plugin-transform-shorthand-properties": "^7.10.4", + "@babel/plugin-transform-spread": "^7.10.4", + "@babel/plugin-transform-sticky-regex": "^7.10.4", + "@babel/plugin-transform-template-literals": "^7.10.4", + "@babel/plugin-transform-typeof-symbol": "^7.10.4", + "@babel/plugin-transform-unicode-escapes": "^7.10.4", + "@babel/plugin-transform-unicode-regex": "^7.10.4", + "@babel/preset-modules": "^0.1.3", + "@babel/types": "^7.10.4", + "browserslist": "^4.12.0", + "core-js-compat": "^3.6.2", + "invariant": "^2.2.2", + "levenary": "^1.1.1", + "semver": "^5.5.0" + } + }, + "@babel/runtime": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.5.tgz", + "integrity": "sha512-otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg==", + "dev": true, + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "@babel/template": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", + "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/traverse": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz", + "integrity": "sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.10.5", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.10.4", + "@babel/parser": "^7.10.5", + "@babel/types": "^7.10.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", + "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "babel-plugin-dynamic-import-node": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", + "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", + "dev": true, + "requires": { + "object.assign": "^4.1.0" + } + }, + "babel-plugin-ember-modules-api-polyfill": { + "version": "2.13.4", + "resolved": "https://registry.npmjs.org/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.13.4.tgz", + "integrity": "sha512-uxQPkEQAzCYdwhZk16O9m1R4xtCRNy4oEUTBrccOPfzlIahRZJic/JeP/ZEL0BC6Mfq6r55eOg6gMF/zdFoCvA==", + "dev": true, + "requires": { + "ember-rfc176-data": "^0.3.13" + } + }, + "broccoli-babel-transpiler": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.6.0.tgz", + "integrity": "sha512-VjqIl4qe3zEkGjsPA2jgw/jakjfLjw2IpQ62d4f1kArZyMW/cQ6o54VD0Cd6cai4J08nb4WPLu4cr4Z62vr5uw==", + "dev": true, + "requires": { + "@babel/core": "^7.10.2", + "@babel/polyfill": "^7.10.1", + "broccoli-funnel": "^2.0.2", + "broccoli-merge-trees": "^3.0.2", + "broccoli-persistent-filter": "^2.2.1", + "clone": "^2.1.2", + "hash-for-dep": "^1.4.7", + "heimdalljs": "^0.2.1", + "heimdalljs-logger": "^0.1.9", + "json-stable-stringify": "^1.0.1", + "rsvp": "^4.8.4", + "workerpool": "^3.1.1" + } + }, + "browserslist": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz", + "integrity": "sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001093", + "electron-to-chromium": "^1.3.488", + "escalade": "^3.0.1", + "node-releases": "^1.1.58" + } + }, + "caniuse-lite": { + "version": "1.0.30001099", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001099.tgz", + "integrity": "sha512-sdS9A+sQTk7wKoeuZBN/YMAHVztUfVnjDi4/UV3sDE8xoh7YR12hKW+pIdB3oqKGwr9XaFL2ovfzt9w8eUI5CA==", + "dev": true + }, + "core-js-compat": { + "version": "3.6.5", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz", + "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==", + "dev": true, + "requires": { + "browserslist": "^4.8.5", + "semver": "7.0.0" + }, + "dependencies": { + "semver": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", + "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", + "dev": true + } + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "electron-to-chromium": { + "version": "1.3.497", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.497.tgz", + "integrity": "sha512-sPdW5bUDZwiFtoonuZCUwRGzsZmKzcLM0bMVhp6SMCfUG+B3faENLx3cE+o+K0Jl+MPuNA9s9cScyFjOlixZpQ==", + "dev": true + }, + "ember-cli-babel": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-7.21.0.tgz", + "integrity": "sha512-jHVi9melAibo0DrAG3GAxid+29xEyjBoU53652B4qcu3Xp58feZGTH/JGXovH7TjvbeNn65zgNyoV3bk1onULw==", + "dev": true, + "requires": { + "@babel/core": "^7.10.2", + "@babel/helper-compilation-targets": "^7.10.2", + "@babel/plugin-proposal-class-properties": "^7.10.1", + "@babel/plugin-proposal-decorators": "^7.10.1", + "@babel/plugin-transform-modules-amd": "^7.10.1", + "@babel/plugin-transform-runtime": "^7.10.1", + "@babel/plugin-transform-typescript": "^7.10.1", + "@babel/polyfill": "^7.10.1", + "@babel/preset-env": "^7.10.2", + "@babel/runtime": "^7.10.2", + "amd-name-resolver": "^1.2.1", + "babel-plugin-debug-macros": "^0.3.3", + "babel-plugin-ember-data-packages-polyfill": "^0.1.2", + "babel-plugin-ember-modules-api-polyfill": "^2.13.4", + "babel-plugin-module-resolver": "^3.1.1", + "broccoli-babel-transpiler": "^7.5.0", + "broccoli-debug": "^0.6.4", + "broccoli-funnel": "^2.0.1", + "broccoli-source": "^1.1.0", + "clone": "^2.1.2", + "ember-cli-babel-plugin-helpers": "^1.1.0", + "ember-cli-version-checker": "^4.1.0", + "ensure-posix-path": "^1.0.2", + "fixturify-project": "^1.10.0", + "rimraf": "^3.0.1", + "semver": "^5.5.0" + } + }, + "ember-cli-version-checker": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-4.1.1.tgz", + "integrity": "sha512-bzEWsTMXUGEJfxcAGWPe6kI7oHEGD3jaxUWDYPTqzqGhNkgPwXTBgoWs9zG1RaSMaOPFnloWuxRcoHi4TrYS3Q==", + "dev": true, + "requires": { + "resolve-package-path": "^2.0.0", + "semver": "^6.3.0", + "silent-error": "^1.1.1" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "ember-rfc176-data": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/ember-rfc176-data/-/ember-rfc176-data-0.3.13.tgz", + "integrity": "sha512-m9JbwQlT6PjY7x/T8HslnXP7Sz9bx/pz3FrNfNi2NesJnbNISly0Lix6NV1fhfo46572cpq4jrM+/6yYlMefTQ==", + "dev": true + }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "lodash": { + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "dev": true + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node-releases": { + "version": "1.1.59", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.59.tgz", + "integrity": "sha512-H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw==", + "dev": true + }, + "regenerate-unicode-properties": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", + "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", + "dev": true, + "requires": { + "regenerate": "^1.4.0" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==", + "dev": true + }, + "regenerator-transform": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz", + "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", + "dev": true, + "requires": { + "@babel/runtime": "^7.8.4" + } + }, + "regexpu-core": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", + "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", + "dev": true, + "requires": { + "regenerate": "^1.4.0", + "regenerate-unicode-properties": "^8.2.0", + "regjsgen": "^0.5.1", + "regjsparser": "^0.6.4", + "unicode-match-property-ecmascript": "^1.0.4", + "unicode-match-property-value-ecmascript": "^1.2.0" + } + }, + "regjsparser": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", + "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", "dev": true, "requires": { - "amd-name-resolver": "1.2.0", - "babel-plugin-debug-macros": "^0.2.0-beta.6", - "babel-plugin-ember-modules-api-polyfill": "^2.6.0", - "babel-plugin-transform-es2015-modules-amd": "^6.24.0", - "babel-polyfill": "^6.26.0", - "babel-preset-env": "^1.7.0", - "broccoli-babel-transpiler": "^6.5.0", - "broccoli-debug": "^0.6.4", - "broccoli-funnel": "^2.0.0", - "broccoli-source": "^1.1.0", - "clone": "^2.0.0", - "ember-cli-version-checker": "^2.1.2", - "semver": "^5.5.0" + "jsesc": "~0.5.0" + }, + "dependencies": { + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", + "dev": true + } } }, - "ember-cli-version-checker": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz", - "integrity": "sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==", + "resolve-package-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-2.0.0.tgz", + "integrity": "sha512-/CLuzodHO2wyyHTzls5Qr+EFeG6RcW4u6//gjYvUfcfyuplIX1SSccU+A5A9A78Gmezkl3NBkFAMxLbzTY9TJA==", "dev": true, "requires": { - "resolve": "^1.3.3", - "semver": "^5.3.0" + "path-root": "^0.1.1", + "resolve": "^1.13.1" } }, - "merge-trees": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-trees/-/merge-trees-1.0.1.tgz", - "integrity": "sha1-zL5nRWl4f53vF/1G5lJfVwC70j4=", + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, "requires": { - "can-symlink": "^1.0.0", - "fs-tree-diff": "^0.5.4", - "heimdalljs": "^0.2.1", - "heimdalljs-logger": "^0.1.7", - "rimraf": "^2.4.3", - "symlink-or-copy": "^1.0.0" + "glob": "^7.1.3" } }, "rsvp": { @@ -11341,47 +13281,14 @@ "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==", "dev": true }, - "workerpool": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-2.3.3.tgz", - "integrity": "sha512-L1ovlYHp6UObYqElXXpbd214GgbEKDED0d3sj7pRdFXjNkb2+un/AUcCkceHizO0IVI6SOGGncrcjozruCkRgA==", - "dev": true, - "requires": { - "object-assign": "4.1.1" - } + "unicode-match-property-value-ecmascript": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", + "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==", + "dev": true } } }, - "ember-resolver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/ember-resolver/-/ember-resolver-7.0.0.tgz", - "integrity": "sha512-tqyWk9E1P5LL42x7AnVoE25a/YWe0WcwAr8LXasm5V7Az3vFR/zbFtwN0oI3tpoSP/nCoGWDct6dRYlXrQjqBQ==", - "dev": true, - "requires": { - "babel-plugin-debug-macros": "^0.3.3", - "broccoli-funnel": "^2.0.2", - "broccoli-merge-trees": "^3.0.0", - "ember-cli-babel": "^7.13.2", - "ember-cli-version-checker": "^3.1.3", - "resolve": "^1.14.0" - } - }, - "ember-rfc176-data": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/ember-rfc176-data/-/ember-rfc176-data-0.3.12.tgz", - "integrity": "sha512-g9HeZj/gU5bfIIrGXkP7MhS2b3Vu5DfNUrYr14hy99TgIvtZETO+96QF4WOEUXGjIJdfTRjerVnQlqngPQSv1g==" - }, - "ember-router-generator": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ember-router-generator/-/ember-router-generator-2.0.0.tgz", - "integrity": "sha512-89oVHVJwmLDvGvAUWgS87KpBoRhy3aZ6U0Ql6HOmU4TrPkyaa8pM0W81wj9cIwjYprcQtN9EwzZMHnq46+oUyw==", - "dev": true, - "requires": { - "@babel/parser": "^7.4.5", - "@babel/traverse": "^7.4.5", - "recast": "^0.18.1" - } - }, "ember-source": { "version": "3.16.2", "resolved": "https://registry.npmjs.org/ember-source/-/ember-source-3.16.2.tgz", @@ -11957,9 +13864,9 @@ } }, "engine.io": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.4.0.tgz", - "integrity": "sha512-XCyYVWzcHnK5cMz7G4VTu2W7zJS7SM1QkcelghyIk/FmobWBtXE7fwhBusEKvCSqc3bMh8fNFMlUkCKTFRxH2w==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.4.2.tgz", + "integrity": "sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==", "dev": true, "requires": { "accepts": "~1.3.4", @@ -11992,20 +13899,20 @@ "dev": true }, "ws": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz", - "integrity": "sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", + "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", "dev": true } } }, "engine.io-client": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz", - "integrity": "sha512-a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.3.tgz", + "integrity": "sha512-0NGY+9hioejTEJCaSJZfWZLk4FPI9dN+1H1C4+wj2iuFba47UgZbJzfWs4aNFajnX/qAaYKbe2lLTfEEWzCmcw==", "dev": true, "requires": { - "component-emitter": "1.2.1", + "component-emitter": "~1.3.0", "component-inherit": "0.0.3", "debug": "~4.1.0", "engine.io-parser": "~2.2.0", @@ -12018,12 +13925,6 @@ "yeast": "0.1.2" }, "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -12137,9 +14038,10 @@ "integrity": "sha1-+Q02KfqnwmFmrk33fIm6zeuNyn8=" }, "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz", + "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==", + "dev": true }, "escape-html": { "version": "1.0.3", @@ -12525,9 +14427,9 @@ "dev": true }, "eventemitter3": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", - "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz", + "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==", "dev": true }, "events": { @@ -12797,16 +14699,17 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" }, "fast-glob": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.1.tgz", - "integrity": "sha512-nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", + "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.0", "merge2": "^1.3.0", - "micromatch": "^4.0.2" + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" }, "dependencies": { "braces": { @@ -12828,9 +14731,9 @@ } }, "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "dev": true, "requires": { "is-glob": "^4.0.1" @@ -12926,12 +14829,12 @@ } }, "fastq": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz", - "integrity": "sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz", + "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", "dev": true, "requires": { - "reusify": "^1.0.0" + "reusify": "^1.0.4" } }, "faye-websocket": { @@ -13086,24 +14989,58 @@ } }, "findup-sync": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", - "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz", + "integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==", "dev": true, "requires": { "detect-file": "^1.0.0", - "is-glob": "^3.1.0", - "micromatch": "^3.0.4", + "is-glob": "^4.0.0", + "micromatch": "^4.0.2", "resolve-dir": "^1.0.1" }, "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { - "is-extglob": "^2.1.0" + "fill-range": "^7.0.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" } } } @@ -13248,30 +15185,10 @@ } }, "follow-redirects": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.10.0.tgz", - "integrity": "sha512-4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ==", - "dev": true, - "requires": { - "debug": "^3.0.0" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz", + "integrity": "sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg==", + "dev": true }, "for-in": { "version": "1.0.2", @@ -14055,9 +15972,9 @@ } }, "git-hooks-list": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/git-hooks-list/-/git-hooks-list-1.0.2.tgz", - "integrity": "sha512-C3c/FG6Pgh053+yK/CnNNYJo5mgCa3OeI+cPxPIl0tyMLm1mGfiV0NX0LrhnjVoX7dfkR78WyW2kvFVHvAlneg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/git-hooks-list/-/git-hooks-list-1.0.3.tgz", + "integrity": "sha512-Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ==", "dev": true }, "git-packed-ref-parse": { @@ -14209,9 +16126,9 @@ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, "globby": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz", - "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.0.tgz", + "integrity": "sha512-3LifW9M4joGZasyYPz2A1U74zbC/45fvpXUvO/9KbSa+VV0aGZarWkfdgKyR9sExNP0t0x0ss/UMJpNpcaTspw==", "dev": true, "requires": { "@types/glob": "^7.1.1", @@ -14534,10 +16451,30 @@ } }, "hosted-git-info": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", - "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==", - "dev": true + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz", + "integrity": "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } + } }, "html-encoding-sniffer": { "version": "1.0.2", @@ -14574,15 +16511,15 @@ } }, "http-parser-js": { - "version": "0.4.10", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz", - "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz", + "integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==", "dev": true }, "http-proxy": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz", - "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "requires": { "eventemitter3": "^4.0.0", @@ -14731,9 +16668,9 @@ } }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, "supports-color": { @@ -14801,9 +16738,9 @@ } }, "ipaddr.js": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", - "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", "dev": true }, "is-accessor-descriptor": { @@ -15741,28 +17678,36 @@ } }, "markdown-it": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-9.1.0.tgz", - "integrity": "sha512-xHKG4C8iPriyfu/jc2hsCC045fKrMQ0VexX2F1FGYiRxDxqMB2aAhF8WauJ3fltn2kb90moGBkiiEdooGIg55w==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz", + "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==", "dev": true, "requires": { "argparse": "^1.0.7", - "entities": "~1.1.1", + "entities": "~2.0.0", "linkify-it": "^2.0.0", "mdurl": "^1.0.1", "uc.micro": "^1.0.5" + }, + "dependencies": { + "entities": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz", + "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==", + "dev": true + } } }, "markdown-it-terminal": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/markdown-it-terminal/-/markdown-it-terminal-0.1.0.tgz", - "integrity": "sha1-VFq9jdAcPWI1O/zqcdtYC1HSK9k=", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/markdown-it-terminal/-/markdown-it-terminal-0.1.1.tgz", + "integrity": "sha512-8v4pHGEh7eiw+UbD28PRyrpu+WrnRR/HefC6NRs+Ttbk1ZQoOY6ViMrkZcdO9Y+PoBsfxNsmiJZtG9BRHEGZ2A==", "dev": true, "requires": { "ansi-styles": "^3.0.0", "cardinal": "^1.0.0", "cli-table": "^0.3.1", - "lodash.merge": "^4.6.0", + "lodash.merge": "^4.6.2", "markdown-it": "^8.3.1" }, "dependencies": { @@ -16059,16 +18004,24 @@ "integrity": "sha1-bQUVYRyKjITkhKogABKbmOmB/ws=" }, "morgan": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz", - "integrity": "sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", + "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", "dev": true, "requires": { - "basic-auth": "~2.0.0", + "basic-auth": "~2.0.1", "debug": "2.6.9", - "depd": "~1.1.2", + "depd": "~2.0.0", "on-finished": "~2.3.0", - "on-headers": "~1.0.1" + "on-headers": "~1.0.2" + }, + "dependencies": { + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "dev": true + } } }, "mout": { @@ -16322,15 +18275,22 @@ "dev": true }, "npm-package-arg": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz", - "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz", + "integrity": "sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==", "dev": true, "requires": { - "hosted-git-info": "^2.7.1", - "osenv": "^0.1.5", - "semver": "^5.6.0", + "hosted-git-info": "^3.0.2", + "semver": "^7.0.0", "validate-npm-package-name": "^3.0.0" + }, + "dependencies": { + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + } } }, "npm-run-path": { @@ -16904,9 +18864,9 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "picomatch": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz", - "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", "dev": true }, "pify": { @@ -16996,9 +18956,9 @@ "integrity": "sha1-wT2RWBZ/aMoBl0iwv4MbDcXXmRA=" }, "portfinder": { - "version": "1.0.25", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz", - "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==", + "version": "1.0.26", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz", + "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==", "dev": true, "requires": { "async": "^2.6.2", @@ -17040,9 +19000,9 @@ "dev": true }, "printf": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/printf/-/printf-0.5.2.tgz", - "integrity": "sha512-Hn0UuWqTRd94HiCJoiCNGZTnSyXJdIF3t4/4I293hezIzyH4pQ3ai4TlH/SmRCiMvR5aNMxSYWshjQWWW6J8MQ==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/printf/-/printf-0.5.3.tgz", + "integrity": "sha512-t3lYN6vPU5PZXDiEZZqoyXvN8wCsBfi8gPoxTKo2e5hhV673t/KUh+mfO8P8lCOCDC/BWcOGIxKyebxc5FuqLA==", "dev": true }, "prismjs": { @@ -17097,16 +19057,11 @@ "rsvp": "^3.0.14" } }, - "promise.prototype.finally": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz", - "integrity": "sha512-A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.0", - "function-bind": "^1.1.1" - } + "promise.hash.helper": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/promise.hash.helper/-/promise.hash.helper-1.0.7.tgz", + "integrity": "sha512-0qhWYyCV9TYDMSooYw1fShIb7R6hsWYja7JLqbeb1MvHqDTvP/uy/R1RsyVqDi6GCiHOI4G5p2Hpr3IA+/l/+Q==", + "dev": true }, "propagating-hammerjs": { "version": "1.4.7", @@ -17117,13 +19072,13 @@ } }, "proxy-addr": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", - "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", + "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", "dev": true, "requires": { "forwarded": "~0.1.2", - "ipaddr.js": "1.9.0" + "ipaddr.js": "1.9.1" } }, "prr": { @@ -17996,9 +19951,9 @@ }, "dependencies": { "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true } } @@ -18441,9 +20396,9 @@ } }, "socket.io-parser": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.0.tgz", - "integrity": "sha512-/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz", + "integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==", "dev": true, "requires": { "component-emitter": "1.2.1", @@ -18496,15 +20451,16 @@ "dev": true }, "sort-package-json": { - "version": "1.39.1", - "resolved": "https://registry.npmjs.org/sort-package-json/-/sort-package-json-1.39.1.tgz", - "integrity": "sha512-ibynHvDF6jfSpA7tok+larZUPQ4YLm4YO6nP9Iov1NuGsMyvkYm3hmKAA6LdXxwOXzqBqJjedk0rMZ2Sbyra4Q==", + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/sort-package-json/-/sort-package-json-1.44.0.tgz", + "integrity": "sha512-u9GUZvpavUCXV5SbEqXu9FRbsJrYU6WM10r3zA0gymGPufK5X82MblCLh9GW9l46pXKEZvK+FA3eVTqC4oMp4A==", "dev": true, "requires": { "detect-indent": "^6.0.0", "detect-newline": "3.1.0", - "git-hooks-list": "1.0.2", - "globby": "10.0.1", + "git-hooks-list": "1.0.3", + "globby": "10.0.0", + "is-plain-obj": "2.1.0", "sort-object-keys": "^1.1.3" }, "dependencies": { @@ -18513,6 +20469,12 @@ "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz", "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==", "dev": true + }, + "is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true } } }, @@ -19098,9 +21060,9 @@ } }, "testem": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/testem/-/testem-3.0.2.tgz", - "integrity": "sha512-mUcPL7MZtmg3UUkOe6sIFXoY1ysv06qxQ7VEKnAHIAiKbf21DOdAJzVqR9YsOZcvennP9gKAUbL/607z9RQt/g==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/testem/-/testem-3.2.0.tgz", + "integrity": "sha512-FkFzNRCIzCxjbNSTxIQSC2tWn1Q2MTR/GTxusSw6uZA4byEQ7wc86TKutNnoCyZ5XIaD9wo4q+dmlK0GUEqFVA==", "dev": true, "requires": { "backbone": "^1.1.2", @@ -19472,9 +21434,9 @@ } }, "underscore": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz", - "integrity": "sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==", + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz", + "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==", "dev": true }, "underscore.string": { @@ -19919,20 +21881,20 @@ } }, "websocket-driver": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz", - "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==", + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", "dev": true, "requires": { - "http-parser-js": ">=0.4.0 <0.4.11", + "http-parser-js": ">=0.5.1", "safe-buffer": ">=5.1.0", "websocket-extensions": ">=0.1.1" } }, "websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, "whatwg-encoding": { @@ -20059,9 +22021,9 @@ } }, "write-file-atomic": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.1.tgz", - "integrity": "sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", "dev": true, "requires": { "imurmurhash": "^0.1.4", diff --git a/package.json b/package.json index 510658fbc..2ccaa5d89 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "ember-prism": "^0.6.1", "ember-qunit": "^4.6.0", "ember-resolver": "^7.0.0", + "ember-router-helpers": "^0.4.0", "ember-source": "~3.16.0", "ember-source-channel-url": "^2.0.1", "ember-try": "^1.4.0", diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss index f561e1deb..d120d5fec 100644 --- a/tests/dummy/app/styles/app.scss +++ b/tests/dummy/app/styles/app.scss @@ -11,30 +11,6 @@ $flexbox-color7: paper-color('amber', '300'); @import 'demo'; -.application-navbar a { - border: none; - line-height: 64px; - font-size: 18px; - padding: 0 16px; - - &.active::after { - bottom: 1px; - content: " "; - display: block; - position: relative; - border-bottom: 3px solid paper-color('cyan', '200'); - } -} - -@media (max-width: 959px) and (min-width: 0) { - .application-navbar a { - line-height: 50px; - - &.active::after { - bottom: -1px; - } - } -} pre.code-block { background-color: rgba(0,0,0,.06) !important; diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs index 555539ed2..60ccb0d9a 100644 --- a/tests/dummy/app/templates/application.hbs +++ b/tests/dummy/app/templates/application.hbs @@ -1,29 +1,39 @@ -
-
- - -
- Introduction - Components - Layout - Theme - Addons +
+ + + Ember Paper + -
+
+ + + Introduction + + + Components + + + Layout + + + Theme + + + Addons + + -
- - - GitHub - - - -
-
- - -
-
+ + + GitHub + + + +
+ + + + {{outlet}} -
+
diff --git a/tests/dummy/config/optional-features.json b/tests/dummy/config/optional-features.json index 21f1dc719..19805d621 100644 --- a/tests/dummy/config/optional-features.json +++ b/tests/dummy/config/optional-features.json @@ -1,3 +1,4 @@ { + "application-template-wrapper": false, "jquery-integration": true } From 883f4bda3e5747e74a2d8c25d276fed508eef701 Mon Sep 17 00:00:00 2001 From: Gabriel Csapo Date: Fri, 6 Nov 2020 20:44:01 -0800 Subject: [PATCH 8/9] fixes toast not showing up as property wasn't tracked --- tests/dummy/app/controllers/components/toast.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/dummy/app/controllers/components/toast.js b/tests/dummy/app/controllers/components/toast.js index 4ad0c9bb4..3a01fa008 100644 --- a/tests/dummy/app/controllers/components/toast.js +++ b/tests/dummy/app/controllers/components/toast.js @@ -12,6 +12,9 @@ export default class extends Controller { @tracked toastText = 'Hello world'; @tracked toastClass = ''; + @tracked showToast = false; + @tracked showToastWithout = false; + @action openToast() { this.showToast = true; @@ -33,11 +36,6 @@ export default class extends Controller { @action openServiceActionToast() { - console.log({ - duration: 4000, - toastClass: this.toastClass, - position: 'top right', - }); this.paperToaster.show(this.toastText, { duration: 4000, toastClass: this.toastClass, From 38a7f6b45ee3f564f1c303583baa1abc77525857 Mon Sep 17 00:00:00 2001 From: Gabriel Csapo Date: Fri, 6 Nov 2020 20:49:38 -0800 Subject: [PATCH 9/9] centers text only pages so that it doesn't align to the left --- tests/dummy/app/styles/demo.scss | 12 ++++++++---- tests/dummy/app/templates/addons.hbs | 2 +- tests/dummy/app/templates/theme.hbs | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/dummy/app/styles/demo.scss b/tests/dummy/app/styles/demo.scss index 05d85c33d..94d38d235 100644 --- a/tests/dummy/app/styles/demo.scss +++ b/tests/dummy/app/styles/demo.scss @@ -146,6 +146,14 @@ ul li:first-child { margin: 16px; } +.doc-content--text-page { + margin: 0 auto; +} + +.doc-content-example { + position: relative; +} + .doc-code-example { /* Initially we don't want any height, and we want the contents to be hidden */ max-height: 0; @@ -166,10 +174,6 @@ ul li:first-child { } } -.doc-content-example { - position: relative; -} - .list-demo .face { border-radius: 30px; border: 1px solid #ddd; diff --git a/tests/dummy/app/templates/addons.hbs b/tests/dummy/app/templates/addons.hbs index 21fb931db..936d28f20 100644 --- a/tests/dummy/app/templates/addons.hbs +++ b/tests/dummy/app/templates/addons.hbs @@ -1,5 +1,5 @@ -
+

ember-paper does not include every component mentioned in the material design specifications.

diff --git a/tests/dummy/app/templates/theme.hbs b/tests/dummy/app/templates/theme.hbs index 9b34dbeaf..c6c58a466 100644 --- a/tests/dummy/app/templates/theme.hbs +++ b/tests/dummy/app/templates/theme.hbs @@ -1,5 +1,5 @@ -
+

Color is a big part of any application. Ember paper allows you to customize how your app