From eba3142fff5b0cfc5e1a8f13673a12d9c8806632 Mon Sep 17 00:00:00 2001 From: Elain T Date: Wed, 13 Dec 2023 15:58:59 -0500 Subject: [PATCH] feat(design)!: shard button component (#2654) BREAKING CHANGE: `DaffButtonModule` has moved to its own package. Update imports to `@daffodil/design/button` --- .../home-callout-pwa/home-callout-pwa.module.ts | 3 +-- .../home/components/home-hero/home-hero.module.ts | 3 +-- .../src/app/content/not-found/not-found.module.ts | 3 +-- .../src/app/content/support/support.module.ts | 3 +-- .../components/why-pwa-hero/why-pwa-hero.module.ts | 3 +-- apps/daffio/src/app/core/footer/footer.module.ts | 5 +---- .../app/core/header/containers/header.module.ts | 2 +- apps/daffio/src/app/core/sidebar/sidebar.module.ts | 6 ++---- .../daffio/src/app/newsletter/newsletter.module.ts | 3 +-- .../add-to-cart-notification.module.ts | 3 +-- .../components/cart-sidebar/cart-sidebar.module.ts | 2 +- .../cart/components/view-cart/view-cart.module.ts | 2 +- .../payment/payment-form/payment-form.module.ts | 2 +- .../components/place-order/place-order.module.ts | 3 +-- .../shipping/shipping-form/shipping-form.module.ts | 2 +- apps/demo/src/app/core/footer/footer.module.ts | 3 +-- apps/demo/src/app/core/header/header.module.ts | 7 ++----- apps/demo/src/app/newsletter/newsletter.module.ts | 4 +--- .../components/add-to-cart/add-to-cart.module.ts | 2 +- .../print-order-summary.module.ts | 3 +-- apps/design-land/src/app/app.module.ts | 2 +- apps/design-land/src/app/button/button.module.ts | 2 +- apps/design-land/src/app/form/form.module.ts | 2 +- apps/design-land/src/app/menu/menu.module.ts | 6 ++---- libs/design/{src/atoms => }/button/README.md | 0 .../src/basic-button/basic-button.module.ts | 3 +-- .../examples/src/flat-button/flat-button.module.ts | 2 +- .../examples/src/icon-button/icon-button.module.ts | 3 +-- .../src/raised-button/raised-button.module.ts | 3 +-- .../src/sizeable-button/sizeable-button.module.ts | 3 +-- .../statusable-button/statusable-button.module.ts | 3 +-- .../src/stroked-button/stroked-button.module.ts | 3 +-- .../underline-button/underline-button.module.ts | 2 +- libs/design/button/ng-package.json | 9 +++++++++ .../src}/button-theme-variants/button.scss | 2 +- .../src}/button-theme-variants/flat.scss | 2 +- .../src}/button-theme-variants/icon.scss | 0 .../src}/button-theme-variants/raised.scss | 6 +++--- .../src}/button-theme-variants/stroked.scss | 2 +- .../src}/button-theme-variants/underline.scss | 0 .../atoms/button => button/src}/button-theme.scss | 4 ++-- .../atoms/button => button/src}/button.module.ts | 8 +++++--- .../src}/button/button.component.html | 0 .../src}/button/button.component.scss | 0 .../src}/button/button.component.spec.ts | 11 +++++++---- .../src}/button/button.component.ts | 14 +++++--------- libs/design/button/src/index.ts | 1 + libs/design/button/src/public_api.ts | 2 ++ .../callout-text-alignment.module.ts | 2 +- .../src/callout-theming/callout-theming.module.ts | 6 ++---- .../callout-with-grid/callout-with-grid.module.ts | 2 +- .../src/compact-callout/compact-callout.module.ts | 3 +-- .../examples/src/basic-card/basic-card.module.ts | 2 +- .../card-orientation/card-orientation.module.ts | 2 +- .../src/linkable-card/linkable-card.module.ts | 2 +- .../examples/src/raised-card/raised-card.module.ts | 2 +- .../src/stroked-card/stroked-card.module.ts | 2 +- .../src/basic-checkbox/basic-checkbox.module.ts | 7 ++----- .../src/checkbox-set/checkbox-set.module.ts | 6 ++---- .../src/compact-hero/compact-hero.module.ts | 6 ++---- .../hero-text-alignment.module.ts | 2 +- .../src/hero-theming/hero-theming.module.ts | 6 ++---- .../src/hero-with-grid/hero-with-grid.module.ts | 2 +- .../examples/src/basic-menu/basic-menu.module.ts | 6 ++---- .../examples/src/basic-modal/basic-modal.module.ts | 6 ++---- .../src/basic-navbar/basic-navbar.module.ts | 2 +- .../contained-navbar/contained-navbar.module.ts | 2 +- .../src/navbar-theming/navbar-theming.module.ts | 6 ++---- .../src/raised-navbar/raised-navbar.module.ts | 6 ++---- .../default-notification.module.ts | 2 +- .../dismissable-notification.module.ts | 2 +- .../notification-orientations.module.ts | 2 +- .../notification-status.module.ts | 2 +- libs/design/scss/theme.scss | 2 +- .../fixed-and-over-sidebar.module.ts | 2 +- .../src/under-sidebar/under-sidebar.module.ts | 2 +- libs/design/src/atoms/button/public_api.ts | 2 -- .../src/molecules/paginator/paginator.module.ts | 2 -- libs/design/src/public_api.ts | 1 - .../theme-switch-button.module.ts | 2 +- 80 files changed, 110 insertions(+), 150 deletions(-) rename libs/design/{src/atoms => }/button/README.md (100%) create mode 100644 libs/design/button/ng-package.json rename libs/design/{src/atoms/button => button/src}/button-theme-variants/button.scss (92%) rename libs/design/{src/atoms/button => button/src}/button-theme-variants/flat.scss (91%) rename libs/design/{src/atoms/button => button/src}/button-theme-variants/icon.scss (100%) rename libs/design/{src/atoms/button => button/src}/button-theme-variants/raised.scss (88%) rename libs/design/{src/atoms/button => button/src}/button-theme-variants/stroked.scss (93%) rename libs/design/{src/atoms/button => button/src}/button-theme-variants/underline.scss (100%) rename libs/design/{src/atoms/button => button/src}/button-theme.scss (99%) rename libs/design/{src/atoms/button => button/src}/button.module.ts (61%) rename libs/design/{src/atoms => button/src}/button/button.component.html (100%) rename libs/design/{src/atoms => button/src}/button/button.component.scss (100%) rename libs/design/{src/atoms => button/src}/button/button.component.spec.ts (97%) rename libs/design/{src/atoms => button/src}/button/button.component.ts (92%) create mode 100644 libs/design/button/src/index.ts create mode 100644 libs/design/button/src/public_api.ts delete mode 100644 libs/design/src/atoms/button/public_api.ts diff --git a/apps/daffio/src/app/content/home/components/home-callout-pwa/home-callout-pwa.module.ts b/apps/daffio/src/app/content/home/components/home-callout-pwa/home-callout-pwa.module.ts index b60cdc5b43..19619b5c79 100644 --- a/apps/daffio/src/app/content/home/components/home-callout-pwa/home-callout-pwa.module.ts +++ b/apps/daffio/src/app/content/home/components/home-callout-pwa/home-callout-pwa.module.ts @@ -5,14 +5,13 @@ import { RouterModule } from '@angular/router'; import { DaffContainerModule, DaffCalloutModule, - DaffButtonModule, DaffImageModule, DaffCardModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffioHomeCalloutPwaComponent } from './home-callout-pwa.component'; - @NgModule({ imports: [ CommonModule, diff --git a/apps/daffio/src/app/content/home/components/home-hero/home-hero.module.ts b/apps/daffio/src/app/content/home/components/home-hero/home-hero.module.ts index 0969e75847..3d657a3e2a 100644 --- a/apps/daffio/src/app/content/home/components/home-hero/home-hero.module.ts +++ b/apps/daffio/src/app/content/home/components/home-hero/home-hero.module.ts @@ -5,13 +5,12 @@ import { RouterModule } from '@angular/router'; import { DaffContainerModule, DaffHeroModule, - DaffButtonModule, DaffImageModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffioHomeHeroComponent } from './home-hero.component'; - @NgModule({ imports: [ CommonModule, diff --git a/apps/daffio/src/app/content/not-found/not-found.module.ts b/apps/daffio/src/app/content/not-found/not-found.module.ts index 98876cce67..bf365c7720 100644 --- a/apps/daffio/src/app/content/not-found/not-found.module.ts +++ b/apps/daffio/src/app/content/not-found/not-found.module.ts @@ -6,14 +6,13 @@ import { RouterModule } from '@angular/router'; import { DaffHeroModule, DaffContainerModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffioNotFoundComponent } from './component/not-found.component'; import { DaffioNotFoundRoutingModule } from './not-found-routing.module'; import { TemplateModule } from '../../core/template/template.module'; - @NgModule({ imports: [ CommonModule, diff --git a/apps/daffio/src/app/content/support/support.module.ts b/apps/daffio/src/app/content/support/support.module.ts index 9256ee82a5..2eb08ad1ca 100644 --- a/apps/daffio/src/app/content/support/support.module.ts +++ b/apps/daffio/src/app/content/support/support.module.ts @@ -6,14 +6,13 @@ import { RouterModule } from '@angular/router'; import { DaffHeroModule, DaffContainerModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffioSupportComponent } from './component/support.component'; import { DaffioSupportRoutingModule } from './support-routing.module'; import { TemplateModule } from '../../core/template/template.module'; - @NgModule({ imports: [ CommonModule, diff --git a/apps/daffio/src/app/content/why-pwa/components/why-pwa-hero/why-pwa-hero.module.ts b/apps/daffio/src/app/content/why-pwa/components/why-pwa-hero/why-pwa-hero.module.ts index 1548ebf00f..c1a7dc33b0 100644 --- a/apps/daffio/src/app/content/why-pwa/components/why-pwa-hero/why-pwa-hero.module.ts +++ b/apps/daffio/src/app/content/why-pwa/components/why-pwa-hero/why-pwa-hero.module.ts @@ -5,12 +5,11 @@ import { RouterModule } from '@angular/router'; import { DaffContainerModule, DaffHeroModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffioWhyPwaHeroComponent } from './why-pwa-hero.component'; - @NgModule({ imports: [ CommonModule, diff --git a/apps/daffio/src/app/core/footer/footer.module.ts b/apps/daffio/src/app/core/footer/footer.module.ts index 5b16f2a282..1ae5fd7cf7 100644 --- a/apps/daffio/src/app/core/footer/footer.module.ts +++ b/apps/daffio/src/app/core/footer/footer.module.ts @@ -11,18 +11,15 @@ import { DaffCalloutModule, DaffListModule, DaffButtonSetModule, - DaffButtonModule, DaffContainerModule, DaffInputModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffioSimpleFooterComponent } from './simple-footer/simple-footer.component'; import { DaffioSubFooterComponent } from './sub-footer/sub-footer.component'; import { DaffioNewsletterModule } from '../../newsletter/newsletter.module'; - - - @NgModule({ imports: [ CommonModule, diff --git a/apps/daffio/src/app/core/header/containers/header.module.ts b/apps/daffio/src/app/core/header/containers/header.module.ts index fb73e3662b..dde49e9824 100644 --- a/apps/daffio/src/app/core/header/containers/header.module.ts +++ b/apps/daffio/src/app/core/header/containers/header.module.ts @@ -4,7 +4,7 @@ import { RouterModule } from '@angular/router'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { DaffLogoModule } from '@daffodil/branding'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffThemeSwitchButtonModule } from '@daffodil/theme-switch'; import { DaffioHeaderContainer } from './header.component'; diff --git a/apps/daffio/src/app/core/sidebar/sidebar.module.ts b/apps/daffio/src/app/core/sidebar/sidebar.module.ts index a947aca3cb..00e7cdaf6a 100644 --- a/apps/daffio/src/app/core/sidebar/sidebar.module.ts +++ b/apps/daffio/src/app/core/sidebar/sidebar.module.ts @@ -2,10 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { - DaffSidebarModule, - DaffButtonModule, -} from '@daffodil/design'; +import { DaffSidebarModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffioSidebarViewportContainer } from './containers/sidebar-viewport/sidebar-viewport.component'; import { DaffioSidebarStateModule } from './sidebar.state.module'; diff --git a/apps/daffio/src/app/newsletter/newsletter.module.ts b/apps/daffio/src/app/newsletter/newsletter.module.ts index ac44904a9f..69e2adb6e4 100644 --- a/apps/daffio/src/app/newsletter/newsletter.module.ts +++ b/apps/daffio/src/app/newsletter/newsletter.module.ts @@ -3,13 +3,12 @@ import { NgModule } from '@angular/core'; import { DaffInputModule, - DaffButtonModule, DaffContainerModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffioNewsletterComponent } from './newsletter.component'; - @NgModule({ imports: [ CommonModule, diff --git a/apps/demo/src/app/cart/components/add-to-cart-notification/components/add-to-cart-notification/add-to-cart-notification.module.ts b/apps/demo/src/app/cart/components/add-to-cart-notification/components/add-to-cart-notification/add-to-cart-notification.module.ts index a95c757e23..84d0d661b2 100644 --- a/apps/demo/src/app/cart/components/add-to-cart-notification/components/add-to-cart-notification/add-to-cart-notification.module.ts +++ b/apps/demo/src/app/cart/components/add-to-cart-notification/components/add-to-cart-notification/add-to-cart-notification.module.ts @@ -5,15 +5,14 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { DaffButtonSetModule, DaffLoadingIconModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { AddToCartNotificationComponent } from './add-to-cart-notification.component'; import { ProceedToCheckoutModule } from '../../../proceed-to-checkout/proceed-to-checkout.module'; import { ViewCartModule } from '../../../view-cart/view-cart.module'; import { ProductAddedModule } from '../product-added/product-added.module'; - @NgModule({ imports: [ CommonModule, diff --git a/apps/demo/src/app/cart/components/cart-sidebar/cart-sidebar.module.ts b/apps/demo/src/app/cart/components/cart-sidebar/cart-sidebar.module.ts index 4d2b6fe31b..cc484ffc7d 100644 --- a/apps/demo/src/app/cart/components/cart-sidebar/cart-sidebar.module.ts +++ b/apps/demo/src/app/cart/components/cart-sidebar/cart-sidebar.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { CartSidebarComponent } from './cart-sidebar.component'; import { HelpBoxModule } from '../../../misc/help-box/help-box.module'; diff --git a/apps/demo/src/app/cart/components/view-cart/view-cart.module.ts b/apps/demo/src/app/cart/components/view-cart/view-cart.module.ts index 865f46bad1..472cdd2c45 100644 --- a/apps/demo/src/app/cart/components/view-cart/view-cart.module.ts +++ b/apps/demo/src/app/cart/components/view-cart/view-cart.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { ViewCartDirective } from './view-cart.directive'; diff --git a/apps/demo/src/app/checkout/components/payment/payment-form/payment-form.module.ts b/apps/demo/src/app/checkout/components/payment/payment-form/payment-form.module.ts index 60f6f13356..f8232c4adc 100644 --- a/apps/demo/src/app/checkout/components/payment/payment-form/payment-form.module.ts +++ b/apps/demo/src/app/checkout/components/payment/payment-form/payment-form.module.ts @@ -5,8 +5,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { DaffInputModule, DaffNativeSelectModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { PaymentFormComponent } from './payment-form.component'; import { AddressFormModule } from '../../forms/address-form/address-form.module'; diff --git a/apps/demo/src/app/checkout/components/place-order/place-order.module.ts b/apps/demo/src/app/checkout/components/place-order/place-order.module.ts index 62e599aed6..46dbe6ef89 100644 --- a/apps/demo/src/app/checkout/components/place-order/place-order.module.ts +++ b/apps/demo/src/app/checkout/components/place-order/place-order.module.ts @@ -1,11 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { PlaceOrderComponent } from './place-order.component'; - @NgModule({ imports: [ CommonModule, diff --git a/apps/demo/src/app/checkout/components/shipping/shipping-form/shipping-form.module.ts b/apps/demo/src/app/checkout/components/shipping/shipping-form/shipping-form.module.ts index a31ce40f88..ace790713b 100644 --- a/apps/demo/src/app/checkout/components/shipping/shipping-form/shipping-form.module.ts +++ b/apps/demo/src/app/checkout/components/shipping/shipping-form/shipping-form.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { ShippingFormComponent } from './shipping-form.component'; import { AddressFormModule } from '../../forms/address-form/address-form.module'; diff --git a/apps/demo/src/app/core/footer/footer.module.ts b/apps/demo/src/app/core/footer/footer.module.ts index 2ae7f0ec0b..32c897fa8a 100644 --- a/apps/demo/src/app/core/footer/footer.module.ts +++ b/apps/demo/src/app/core/footer/footer.module.ts @@ -5,13 +5,12 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { DaffListModule, - DaffButtonModule, DaffContainerModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { FooterComponent } from './footer.component'; - @NgModule({ imports: [ CommonModule, diff --git a/apps/demo/src/app/core/header/header.module.ts b/apps/demo/src/app/core/header/header.module.ts index ed1cfe2288..5751244afc 100644 --- a/apps/demo/src/app/core/header/header.module.ts +++ b/apps/demo/src/app/core/header/header.module.ts @@ -3,17 +3,14 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { - DaffNavbarModule, - DaffButtonModule, -} from '@daffodil/design'; +import { DaffNavbarModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DemoHeaderComponent } from './components/header/header.component'; import { DemoHeaderContainer } from './containers/header/header.component'; import { LogoModule } from '../logo/logo.module'; import { SidebarModule } from '../sidebar/sidebar.module'; - @NgModule({ imports: [ CommonModule, diff --git a/apps/demo/src/app/newsletter/newsletter.module.ts b/apps/demo/src/app/newsletter/newsletter.module.ts index 66dbfdb454..60d0e7bf3d 100644 --- a/apps/demo/src/app/newsletter/newsletter.module.ts +++ b/apps/demo/src/app/newsletter/newsletter.module.ts @@ -4,15 +4,13 @@ import { ReactiveFormsModule } from '@angular/forms'; import { DaffInputModule, - DaffButtonModule, DaffContainerModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffNewsletterStateModule } from '@daffodil/newsletter/state'; import { NewsletterComponent } from './newsletter.component'; - - @NgModule({ imports: [ CommonModule, diff --git a/apps/demo/src/app/product/components/add-to-cart/add-to-cart.module.ts b/apps/demo/src/app/product/components/add-to-cart/add-to-cart.module.ts index 142d3165ce..8205af6714 100644 --- a/apps/demo/src/app/product/components/add-to-cart/add-to-cart.module.ts +++ b/apps/demo/src/app/product/components/add-to-cart/add-to-cart.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { AddToCartComponent } from './add-to-cart.component'; diff --git a/apps/demo/src/app/thank-you/components/print-order-summary/print-order-summary.module.ts b/apps/demo/src/app/thank-you/components/print-order-summary/print-order-summary.module.ts index 9a3bd0d941..70cebb9b63 100644 --- a/apps/demo/src/app/thank-you/components/print-order-summary/print-order-summary.module.ts +++ b/apps/demo/src/app/thank-you/components/print-order-summary/print-order-summary.module.ts @@ -1,11 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { PrintOrderSummaryComponent } from './print-order-summary.component'; - @NgModule({ imports: [ CommonModule, diff --git a/apps/design-land/src/app/app.module.ts b/apps/design-land/src/app/app.module.ts index ef943fb516..861d14eab5 100644 --- a/apps/design-land/src/app/app.module.ts +++ b/apps/design-land/src/app/app.module.ts @@ -9,9 +9,9 @@ import { DaffLinkSetModule, DAFF_THEME_INITIALIZER, DaffNavbarModule, - DaffButtonModule, } from '@daffodil/design'; import { DaffArticleModule } from '@daffodil/design/article'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffThemeSwitchButtonModule } from '@daffodil/theme-switch'; import { DesignLandAppRoutingModule } from './app-routing.module'; diff --git a/apps/design-land/src/app/button/button.module.ts b/apps/design-land/src/app/button/button.module.ts index a6001abb3e..a8683bd373 100644 --- a/apps/design-land/src/app/button/button.module.ts +++ b/apps/design-land/src/app/button/button.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { DaffButtonModule } from '@daffodil/design'; import { DaffArticleModule } from '@daffodil/design/article'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DesignLandButtonRoutingModule } from './button-routing.module'; import { DesignLandButtonComponent } from './button.component'; diff --git a/apps/design-land/src/app/form/form.module.ts b/apps/design-land/src/app/form/form.module.ts index eaedfb315a..6bfd8b607d 100644 --- a/apps/design-land/src/app/form/form.module.ts +++ b/apps/design-land/src/app/form/form.module.ts @@ -5,8 +5,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { DaffInputModule, DaffFormFieldModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DesignLandFormRoutingModule } from './form-routing.module'; import { DesignLandFormComponent } from './form.component'; diff --git a/apps/design-land/src/app/menu/menu.module.ts b/apps/design-land/src/app/menu/menu.module.ts index d48841e713..4f2399d6ef 100644 --- a/apps/design-land/src/app/menu/menu.module.ts +++ b/apps/design-land/src/app/menu/menu.module.ts @@ -1,11 +1,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { - DaffButtonModule, - DaffMenuModule, -} from '@daffodil/design'; +import { DaffMenuModule } from '@daffodil/design'; import { DaffArticleModule } from '@daffodil/design/article'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DesignLandMenuRoutingModule } from './menu-routing-module'; import { DesignLandMenuComponent } from './menu.component'; diff --git a/libs/design/src/atoms/button/README.md b/libs/design/button/README.md similarity index 100% rename from libs/design/src/atoms/button/README.md rename to libs/design/button/README.md diff --git a/libs/design/button/examples/src/basic-button/basic-button.module.ts b/libs/design/button/examples/src/basic-button/basic-button.module.ts index c246d32a5e..de6306bcff 100644 --- a/libs/design/button/examples/src/basic-button/basic-button.module.ts +++ b/libs/design/button/examples/src/basic-button/basic-button.module.ts @@ -1,11 +1,10 @@ import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { BasicButtonComponent } from './basic-button.component'; - @NgModule({ declarations: [ BasicButtonComponent, diff --git a/libs/design/button/examples/src/flat-button/flat-button.module.ts b/libs/design/button/examples/src/flat-button/flat-button.module.ts index 4c28dfe327..3e4cbf9cd1 100644 --- a/libs/design/button/examples/src/flat-button/flat-button.module.ts +++ b/libs/design/button/examples/src/flat-button/flat-button.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { FlatButtonComponent } from './flat-button.component'; diff --git a/libs/design/button/examples/src/icon-button/icon-button.module.ts b/libs/design/button/examples/src/icon-button/icon-button.module.ts index 6b94e70d67..5d89f4eec9 100644 --- a/libs/design/button/examples/src/icon-button/icon-button.module.ts +++ b/libs/design/button/examples/src/icon-button/icon-button.module.ts @@ -1,11 +1,10 @@ import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { IconButtonComponent } from './icon-button.component'; - @NgModule({ declarations: [ IconButtonComponent, diff --git a/libs/design/button/examples/src/raised-button/raised-button.module.ts b/libs/design/button/examples/src/raised-button/raised-button.module.ts index 9fb0ea9f60..b8dba30d3d 100644 --- a/libs/design/button/examples/src/raised-button/raised-button.module.ts +++ b/libs/design/button/examples/src/raised-button/raised-button.module.ts @@ -1,11 +1,10 @@ import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { RaisedButtonComponent } from './raised-button.component'; - @NgModule({ declarations: [ RaisedButtonComponent, diff --git a/libs/design/button/examples/src/sizeable-button/sizeable-button.module.ts b/libs/design/button/examples/src/sizeable-button/sizeable-button.module.ts index ff4b379493..72e2ecf13b 100644 --- a/libs/design/button/examples/src/sizeable-button/sizeable-button.module.ts +++ b/libs/design/button/examples/src/sizeable-button/sizeable-button.module.ts @@ -1,11 +1,10 @@ import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { SizeableButtonComponent } from './sizeable-button.component'; - @NgModule({ declarations: [ SizeableButtonComponent, diff --git a/libs/design/button/examples/src/statusable-button/statusable-button.module.ts b/libs/design/button/examples/src/statusable-button/statusable-button.module.ts index d4c0503dab..502aa0225a 100644 --- a/libs/design/button/examples/src/statusable-button/statusable-button.module.ts +++ b/libs/design/button/examples/src/statusable-button/statusable-button.module.ts @@ -1,11 +1,10 @@ import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { StatusableButtonComponent } from './statusable-button.component'; - @NgModule({ declarations: [ StatusableButtonComponent, diff --git a/libs/design/button/examples/src/stroked-button/stroked-button.module.ts b/libs/design/button/examples/src/stroked-button/stroked-button.module.ts index e05ad08fd4..0304b0a919 100644 --- a/libs/design/button/examples/src/stroked-button/stroked-button.module.ts +++ b/libs/design/button/examples/src/stroked-button/stroked-button.module.ts @@ -1,11 +1,10 @@ import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { StrokedButtonComponent } from './stroked-button.component'; - @NgModule({ declarations: [ StrokedButtonComponent, diff --git a/libs/design/button/examples/src/underline-button/underline-button.module.ts b/libs/design/button/examples/src/underline-button/underline-button.module.ts index eb8d493ce8..e3c760dac1 100644 --- a/libs/design/button/examples/src/underline-button/underline-button.module.ts +++ b/libs/design/button/examples/src/underline-button/underline-button.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { UnderlineButtonComponent } from './underline-button.component'; diff --git a/libs/design/button/ng-package.json b/libs/design/button/ng-package.json new file mode 100644 index 0000000000..9489186971 --- /dev/null +++ b/libs/design/button/ng-package.json @@ -0,0 +1,9 @@ +{ + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../dist/design/button", + "deleteDestPath": false, + "lib": { + "entryFile": "src/index.ts", + "styleIncludePaths": ["../src/scss"] + } +} \ No newline at end of file diff --git a/libs/design/src/atoms/button/button-theme-variants/button.scss b/libs/design/button/src/button-theme-variants/button.scss similarity index 92% rename from libs/design/src/atoms/button/button-theme-variants/button.scss rename to libs/design/button/src/button-theme-variants/button.scss index 7f0c00e3ae..91b2368c4e 100644 --- a/libs/design/src/atoms/button/button-theme-variants/button.scss +++ b/libs/design/button/src/button-theme-variants/button.scss @@ -1,4 +1,4 @@ -@use '../../../../scss/theming'; +@use '../../../scss/theming'; @mixin daff-button-theme-variant( $base-color, diff --git a/libs/design/src/atoms/button/button-theme-variants/flat.scss b/libs/design/button/src/button-theme-variants/flat.scss similarity index 91% rename from libs/design/src/atoms/button/button-theme-variants/flat.scss rename to libs/design/button/src/button-theme-variants/flat.scss index e3dd04f890..ef93b30677 100644 --- a/libs/design/src/atoms/button/button-theme-variants/flat.scss +++ b/libs/design/button/src/button-theme-variants/flat.scss @@ -1,5 +1,5 @@ @use 'sass:map'; -@use '../../../../scss/theming'; +@use '../../../scss/theming'; @mixin daff-flat-button-theme-variant( $base-color, diff --git a/libs/design/src/atoms/button/button-theme-variants/icon.scss b/libs/design/button/src/button-theme-variants/icon.scss similarity index 100% rename from libs/design/src/atoms/button/button-theme-variants/icon.scss rename to libs/design/button/src/button-theme-variants/icon.scss diff --git a/libs/design/src/atoms/button/button-theme-variants/raised.scss b/libs/design/button/src/button-theme-variants/raised.scss similarity index 88% rename from libs/design/src/atoms/button/button-theme-variants/raised.scss rename to libs/design/button/src/button-theme-variants/raised.scss index 0bb039f09f..f9fdb489ed 100644 --- a/libs/design/src/atoms/button/button-theme-variants/raised.scss +++ b/libs/design/button/src/button-theme-variants/raised.scss @@ -1,7 +1,7 @@ @use 'sass:map'; -@use '../../../../scss/core'; -@use '../../../../scss/theming'; -@use '../../../../scss/accessibility' as a11y; +@use '../../../scss/core'; +@use '../../../scss/theming'; +@use '../../../scss/accessibility' as a11y; $black: theming.daff-color(theming.$daff-gray, 110); diff --git a/libs/design/src/atoms/button/button-theme-variants/stroked.scss b/libs/design/button/src/button-theme-variants/stroked.scss similarity index 93% rename from libs/design/src/atoms/button/button-theme-variants/stroked.scss rename to libs/design/button/src/button-theme-variants/stroked.scss index 5110262b59..e2813a9356 100644 --- a/libs/design/src/atoms/button/button-theme-variants/stroked.scss +++ b/libs/design/button/src/button-theme-variants/stroked.scss @@ -1,5 +1,5 @@ @use 'sass:map'; -@use '../../../../scss/theming'; +@use '../../../scss/theming'; @mixin daff-stroked-button-theme-variant( $base-color, diff --git a/libs/design/src/atoms/button/button-theme-variants/underline.scss b/libs/design/button/src/button-theme-variants/underline.scss similarity index 100% rename from libs/design/src/atoms/button/button-theme-variants/underline.scss rename to libs/design/button/src/button-theme-variants/underline.scss diff --git a/libs/design/src/atoms/button/button-theme.scss b/libs/design/button/src/button-theme.scss similarity index 99% rename from libs/design/src/atoms/button/button-theme.scss rename to libs/design/button/src/button-theme.scss index 56e3ed646e..b8952e9e8e 100644 --- a/libs/design/src/atoms/button/button-theme.scss +++ b/libs/design/button/src/button-theme.scss @@ -1,6 +1,6 @@ @use 'sass:map'; -@use '../../../scss/theming'; -@use '../../../scss/core'; +@use '../../scss/theming'; +@use '../../scss/core'; @use './button-theme-variants/button'; @use './button-theme-variants/icon'; @use './button-theme-variants/raised'; diff --git a/libs/design/src/atoms/button/button.module.ts b/libs/design/button/src/button.module.ts similarity index 61% rename from libs/design/src/atoms/button/button.module.ts rename to libs/design/button/src/button.module.ts index 26cbf69efc..6b09599b21 100644 --- a/libs/design/src/atoms/button/button.module.ts +++ b/libs/design/button/src/button.module.ts @@ -1,10 +1,12 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { DaffButtonComponent } from './button.component'; -import { DaffPrefixSuffixModule } from '../../core/prefix-suffix/prefix-suffix.module'; -import { DaffLoadingIconModule } from '../loading-icon/loading-icon.module'; +import { + DaffLoadingIconModule, + DaffPrefixSuffixModule, +} from '@daffodil/design'; +import { DaffButtonComponent } from './button/button.component'; @NgModule({ imports: [ diff --git a/libs/design/src/atoms/button/button.component.html b/libs/design/button/src/button/button.component.html similarity index 100% rename from libs/design/src/atoms/button/button.component.html rename to libs/design/button/src/button/button.component.html diff --git a/libs/design/src/atoms/button/button.component.scss b/libs/design/button/src/button/button.component.scss similarity index 100% rename from libs/design/src/atoms/button/button.component.scss rename to libs/design/button/src/button/button.component.scss diff --git a/libs/design/src/atoms/button/button.component.spec.ts b/libs/design/button/src/button/button.component.spec.ts similarity index 97% rename from libs/design/src/atoms/button/button.component.spec.ts rename to libs/design/button/src/button/button.component.spec.ts index 2216eb6985..310d9cb4ca 100644 --- a/libs/design/src/atoms/button/button.component.spec.ts +++ b/libs/design/button/src/button/button.component.spec.ts @@ -9,14 +9,17 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { + DaffPalette, + DaffStatus, + DaffLoadingIconComponent, + DaffLoadingIconModule, +} from '@daffodil/design'; + import { DaffButtonComponent, DaffButtonSize, } from './button.component'; -import { DaffPalette } from '../../core/colorable/public_api'; -import { DaffStatus } from '../../core/statusable/statusable'; -import { DaffLoadingIconComponent } from '../loading-icon/loading-icon.component'; -import { DaffLoadingIconModule } from '../loading-icon/loading-icon.module'; @Component({ template: ` diff --git a/libs/design/src/atoms/button/button.component.ts b/libs/design/button/src/button/button.component.ts similarity index 92% rename from libs/design/src/atoms/button/button.component.ts rename to libs/design/button/src/button/button.component.ts index 8a715440b6..73a3467b8b 100644 --- a/libs/design/src/atoms/button/button.component.ts +++ b/libs/design/button/src/button/button.component.ts @@ -10,26 +10,22 @@ import { Input, } from '@angular/core'; -import { daffArticleEncapsulatedMixin } from '../../core/article-encapsulated/public_api'; import { daffColorMixin, DaffColorable, -} from '../../core/colorable/public_api'; -import { DaffPrefixable, DaffSuffixable, daffPrefixableMixin, daffSuffixableMixin, -} from '../../core/prefix-suffix/public_api'; -import { DaffSizeable, DaffSizeSmallType, DaffSizeMediumType, DaffSizeLargeType, -} from '../../core/sizeable/sizeable'; -import { daffSizeMixin } from '../../core/sizeable/sizeable-mixin'; -import { DaffStatusable } from '../../core/statusable/statusable'; -import { daffStatusMixin } from '../../core/statusable/statusable-mixin'; + daffSizeMixin, + DaffStatusable, + daffStatusMixin, + daffArticleEncapsulatedMixin, +} from '@daffodil/design'; /** * List of classes to add to DaffButtonComponent instances based on host attributes to style as different variants. diff --git a/libs/design/button/src/index.ts b/libs/design/button/src/index.ts new file mode 100644 index 0000000000..4aaf8f92ed --- /dev/null +++ b/libs/design/button/src/index.ts @@ -0,0 +1 @@ +export * from './public_api'; diff --git a/libs/design/button/src/public_api.ts b/libs/design/button/src/public_api.ts new file mode 100644 index 0000000000..6d5884f78c --- /dev/null +++ b/libs/design/button/src/public_api.ts @@ -0,0 +1,2 @@ +export { DaffButtonComponent } from './button/button.component'; +export { DaffButtonModule } from './button.module'; diff --git a/libs/design/callout/examples/src/callout-text-alignment/callout-text-alignment.module.ts b/libs/design/callout/examples/src/callout-text-alignment/callout-text-alignment.module.ts index 5e15ec951f..0e9dfcbc2a 100644 --- a/libs/design/callout/examples/src/callout-text-alignment/callout-text-alignment.module.ts +++ b/libs/design/callout/examples/src/callout-text-alignment/callout-text-alignment.module.ts @@ -4,10 +4,10 @@ import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { - DaffButtonModule, DaffCalloutModule, DaffContainerModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { CalloutTextAlignmentComponent } from './callout-text-alignment.component'; diff --git a/libs/design/callout/examples/src/callout-theming/callout-theming.module.ts b/libs/design/callout/examples/src/callout-theming/callout-theming.module.ts index 8a31ba447d..dc8d9e654c 100644 --- a/libs/design/callout/examples/src/callout-theming/callout-theming.module.ts +++ b/libs/design/callout/examples/src/callout-theming/callout-theming.module.ts @@ -3,10 +3,8 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { - DaffButtonModule, - DaffCalloutModule, -} from '@daffodil/design'; +import { DaffCalloutModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { CalloutThemingComponent } from './callout-theming.component'; diff --git a/libs/design/callout/examples/src/callout-with-grid/callout-with-grid.module.ts b/libs/design/callout/examples/src/callout-with-grid/callout-with-grid.module.ts index 886fc62282..064f04a675 100644 --- a/libs/design/callout/examples/src/callout-with-grid/callout-with-grid.module.ts +++ b/libs/design/callout/examples/src/callout-with-grid/callout-with-grid.module.ts @@ -6,8 +6,8 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { DaffCalloutModule, DaffContainerModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { CalloutWithGridComponent } from './callout-with-grid.component'; diff --git a/libs/design/callout/examples/src/compact-callout/compact-callout.module.ts b/libs/design/callout/examples/src/compact-callout/compact-callout.module.ts index ff0aff3077..a3d473158e 100644 --- a/libs/design/callout/examples/src/compact-callout/compact-callout.module.ts +++ b/libs/design/callout/examples/src/compact-callout/compact-callout.module.ts @@ -1,13 +1,12 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { - DaffButtonModule, DaffCalloutModule, DaffContainerModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { CompactCalloutComponent } from './compact-callout.component'; diff --git a/libs/design/card/examples/src/basic-card/basic-card.module.ts b/libs/design/card/examples/src/basic-card/basic-card.module.ts index 02f639d477..34a1ca101e 100644 --- a/libs/design/card/examples/src/basic-card/basic-card.module.ts +++ b/libs/design/card/examples/src/basic-card/basic-card.module.ts @@ -5,8 +5,8 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { DaffCardModule, DaffImageModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { BasicCardComponent } from './basic-card.component'; diff --git a/libs/design/card/examples/src/card-orientation/card-orientation.module.ts b/libs/design/card/examples/src/card-orientation/card-orientation.module.ts index 0ad3d7cf6c..95a5295041 100644 --- a/libs/design/card/examples/src/card-orientation/card-orientation.module.ts +++ b/libs/design/card/examples/src/card-orientation/card-orientation.module.ts @@ -4,10 +4,10 @@ import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { - DaffButtonModule, DaffCardModule, DaffImageModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { CardOrientationComponent } from './card-orientation.component'; diff --git a/libs/design/card/examples/src/linkable-card/linkable-card.module.ts b/libs/design/card/examples/src/linkable-card/linkable-card.module.ts index 9db0293643..60cdd7482c 100644 --- a/libs/design/card/examples/src/linkable-card/linkable-card.module.ts +++ b/libs/design/card/examples/src/linkable-card/linkable-card.module.ts @@ -6,8 +6,8 @@ import { RouterModule } from '@angular/router'; import { DaffCardModule, DaffImageModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { LinkableCardComponent } from './linkable-card.component'; diff --git a/libs/design/card/examples/src/raised-card/raised-card.module.ts b/libs/design/card/examples/src/raised-card/raised-card.module.ts index aeff16575d..252ccb5905 100644 --- a/libs/design/card/examples/src/raised-card/raised-card.module.ts +++ b/libs/design/card/examples/src/raised-card/raised-card.module.ts @@ -5,8 +5,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { DaffCardModule, DaffImageModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { RaisedCardComponent } from './raised-card.component'; diff --git a/libs/design/card/examples/src/stroked-card/stroked-card.module.ts b/libs/design/card/examples/src/stroked-card/stroked-card.module.ts index 79b90e2b1a..e9861583c9 100644 --- a/libs/design/card/examples/src/stroked-card/stroked-card.module.ts +++ b/libs/design/card/examples/src/stroked-card/stroked-card.module.ts @@ -6,8 +6,8 @@ import { RouterModule } from '@angular/router'; import { DaffCardModule, DaffImageModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { StrokedCardComponent } from './stroked-card.component'; diff --git a/libs/design/checkbox/examples/src/basic-checkbox/basic-checkbox.module.ts b/libs/design/checkbox/examples/src/basic-checkbox/basic-checkbox.module.ts index d933219489..27c3d6e662 100644 --- a/libs/design/checkbox/examples/src/basic-checkbox/basic-checkbox.module.ts +++ b/libs/design/checkbox/examples/src/basic-checkbox/basic-checkbox.module.ts @@ -1,14 +1,11 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; -import { - DaffButtonModule, - DaffCheckboxModule, -} from '@daffodil/design'; +import { DaffCheckboxModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { BasicCheckboxComponent } from './basic-checkbox.component'; - @NgModule({ declarations: [ BasicCheckboxComponent, diff --git a/libs/design/checkbox/examples/src/checkbox-set/checkbox-set.module.ts b/libs/design/checkbox/examples/src/checkbox-set/checkbox-set.module.ts index c6c29deced..9fac9b4a60 100644 --- a/libs/design/checkbox/examples/src/checkbox-set/checkbox-set.module.ts +++ b/libs/design/checkbox/examples/src/checkbox-set/checkbox-set.module.ts @@ -1,10 +1,8 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; -import { - DaffButtonModule, - DaffCheckboxModule, -} from '@daffodil/design'; +import { DaffCheckboxModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { CheckboxSetComponent } from './checkbox-set.component'; diff --git a/libs/design/hero/examples/src/compact-hero/compact-hero.module.ts b/libs/design/hero/examples/src/compact-hero/compact-hero.module.ts index 561cb2eb34..6bb5ba2bdf 100644 --- a/libs/design/hero/examples/src/compact-hero/compact-hero.module.ts +++ b/libs/design/hero/examples/src/compact-hero/compact-hero.module.ts @@ -3,10 +3,8 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { - DaffHeroModule, - DaffButtonModule, -} from '@daffodil/design'; +import { DaffHeroModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { CompactHeroComponent } from './compact-hero.component'; diff --git a/libs/design/hero/examples/src/hero-text-alignment/hero-text-alignment.module.ts b/libs/design/hero/examples/src/hero-text-alignment/hero-text-alignment.module.ts index ee9a7327f8..75e5b4d5ef 100644 --- a/libs/design/hero/examples/src/hero-text-alignment/hero-text-alignment.module.ts +++ b/libs/design/hero/examples/src/hero-text-alignment/hero-text-alignment.module.ts @@ -6,8 +6,8 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { DaffHeroModule, DaffContainerModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { HeroTextAlignmentComponent } from './hero-text-alignment.component'; diff --git a/libs/design/hero/examples/src/hero-theming/hero-theming.module.ts b/libs/design/hero/examples/src/hero-theming/hero-theming.module.ts index b38693c28e..f477cbac80 100644 --- a/libs/design/hero/examples/src/hero-theming/hero-theming.module.ts +++ b/libs/design/hero/examples/src/hero-theming/hero-theming.module.ts @@ -3,10 +3,8 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { - DaffHeroModule, - DaffButtonModule, -} from '@daffodil/design'; +import { DaffHeroModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { HeroThemingComponent } from './hero-theming.component'; diff --git a/libs/design/hero/examples/src/hero-with-grid/hero-with-grid.module.ts b/libs/design/hero/examples/src/hero-with-grid/hero-with-grid.module.ts index a268ac1719..87cac7e147 100644 --- a/libs/design/hero/examples/src/hero-with-grid/hero-with-grid.module.ts +++ b/libs/design/hero/examples/src/hero-with-grid/hero-with-grid.module.ts @@ -6,8 +6,8 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { DaffHeroModule, DaffContainerModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { HeroWithGridComponent } from './hero-with-grid.component'; diff --git a/libs/design/menu/examples/src/basic-menu/basic-menu.module.ts b/libs/design/menu/examples/src/basic-menu/basic-menu.module.ts index 486072817b..e18e08d999 100644 --- a/libs/design/menu/examples/src/basic-menu/basic-menu.module.ts +++ b/libs/design/menu/examples/src/basic-menu/basic-menu.module.ts @@ -1,10 +1,8 @@ import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { - DaffButtonModule, - DaffMenuModule, -} from '@daffodil/design'; +import { DaffMenuModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { BasicMenuComponent } from './basic-menu.component'; import { MenuContentComponent } from './menu-content/menu-content.component'; diff --git a/libs/design/modal/examples/src/basic-modal/basic-modal.module.ts b/libs/design/modal/examples/src/basic-modal/basic-modal.module.ts index 469f233f60..a077b32aa9 100644 --- a/libs/design/modal/examples/src/basic-modal/basic-modal.module.ts +++ b/libs/design/modal/examples/src/basic-modal/basic-modal.module.ts @@ -1,9 +1,7 @@ import { NgModule } from '@angular/core'; -import { - DaffModalModule, - DaffButtonModule, -} from '@daffodil/design'; +import { DaffModalModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { BasicModalComponent } from './basic-modal.component'; import { BasicModalContentComponent } from './modal-content.component'; diff --git a/libs/design/navbar/examples/src/basic-navbar/basic-navbar.module.ts b/libs/design/navbar/examples/src/basic-navbar/basic-navbar.module.ts index 62d716cc6c..028986fa39 100644 --- a/libs/design/navbar/examples/src/basic-navbar/basic-navbar.module.ts +++ b/libs/design/navbar/examples/src/basic-navbar/basic-navbar.module.ts @@ -2,10 +2,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { - DaffButtonModule, DaffContainerModule, DaffNavbarModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { BasicNavbarComponent } from './basic-navbar.component'; diff --git a/libs/design/navbar/examples/src/contained-navbar/contained-navbar.module.ts b/libs/design/navbar/examples/src/contained-navbar/contained-navbar.module.ts index 78b9b0c1a1..18b8b0d9c0 100644 --- a/libs/design/navbar/examples/src/contained-navbar/contained-navbar.module.ts +++ b/libs/design/navbar/examples/src/contained-navbar/contained-navbar.module.ts @@ -2,10 +2,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { - DaffButtonModule, DaffContainerModule, DaffNavbarModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { ContainedNavbarComponent } from './contained-navbar.component'; diff --git a/libs/design/navbar/examples/src/navbar-theming/navbar-theming.module.ts b/libs/design/navbar/examples/src/navbar-theming/navbar-theming.module.ts index 04de5ccaf2..4e1a940734 100644 --- a/libs/design/navbar/examples/src/navbar-theming/navbar-theming.module.ts +++ b/libs/design/navbar/examples/src/navbar-theming/navbar-theming.module.ts @@ -2,10 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; -import { - DaffButtonModule, - DaffNavbarModule, -} from '@daffodil/design'; +import { DaffNavbarModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { NavbarThemingComponent } from './navbar-theming.component'; diff --git a/libs/design/navbar/examples/src/raised-navbar/raised-navbar.module.ts b/libs/design/navbar/examples/src/raised-navbar/raised-navbar.module.ts index 69a49cae6b..33eac6c1de 100644 --- a/libs/design/navbar/examples/src/raised-navbar/raised-navbar.module.ts +++ b/libs/design/navbar/examples/src/raised-navbar/raised-navbar.module.ts @@ -1,10 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { - DaffButtonModule, - DaffNavbarModule, -} from '@daffodil/design'; +import { DaffNavbarModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { RaisedNavbarComponent } from './raised-navbar.component'; diff --git a/libs/design/notification/examples/src/default-notification/default-notification.module.ts b/libs/design/notification/examples/src/default-notification/default-notification.module.ts index 87cbc7422f..55bf10b85b 100644 --- a/libs/design/notification/examples/src/default-notification/default-notification.module.ts +++ b/libs/design/notification/examples/src/default-notification/default-notification.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffNotificationModule } from '@daffodil/design/notification'; import { DefaultNotificationComponent } from './default-notification.component'; diff --git a/libs/design/notification/examples/src/dismissable-notification/dismissable-notification.module.ts b/libs/design/notification/examples/src/dismissable-notification/dismissable-notification.module.ts index 088fa6c2c9..bb5c74730e 100644 --- a/libs/design/notification/examples/src/dismissable-notification/dismissable-notification.module.ts +++ b/libs/design/notification/examples/src/dismissable-notification/dismissable-notification.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffNotificationModule } from '@daffodil/design/notification'; import { DismissableNotificationComponent } from './dismissable-notification.component'; diff --git a/libs/design/notification/examples/src/notification-orientations/notification-orientations.module.ts b/libs/design/notification/examples/src/notification-orientations/notification-orientations.module.ts index 13d91a8345..87ef01262f 100644 --- a/libs/design/notification/examples/src/notification-orientations/notification-orientations.module.ts +++ b/libs/design/notification/examples/src/notification-orientations/notification-orientations.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffNotificationModule } from '@daffodil/design/notification'; import { NotificationOrientationsComponent } from './notification-orientations.component'; diff --git a/libs/design/notification/examples/src/notification-status/notification-status.module.ts b/libs/design/notification/examples/src/notification-status/notification-status.module.ts index d1a4e3063b..42d0f38936 100644 --- a/libs/design/notification/examples/src/notification-status/notification-status.module.ts +++ b/libs/design/notification/examples/src/notification-status/notification-status.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffNotificationModule } from '@daffodil/design/notification'; import { NotificationStatusComponent } from './notification-status.component'; diff --git a/libs/design/scss/theme.scss b/libs/design/scss/theme.scss index 7ba365276b..822ab3e1f1 100644 --- a/libs/design/scss/theme.scss +++ b/libs/design/scss/theme.scss @@ -18,7 +18,7 @@ // @daffodil/design components @use './theming/theme-css-variables' as variables; -@use '../src/atoms/button/button-theme' as button; +@use '../button/src/button-theme' as button; @use '../article/src/article-theme' as article; @use '../src/atoms/form/error-message/error-message-theme' as error-message; @use '../src/atoms/form/form-field/form-field/form-field-theme' as form-field; diff --git a/libs/design/sidebar/examples/src/fixed-and-over-sidebar/fixed-and-over-sidebar.module.ts b/libs/design/sidebar/examples/src/fixed-and-over-sidebar/fixed-and-over-sidebar.module.ts index de110c6a61..9c3b84fc8d 100644 --- a/libs/design/sidebar/examples/src/fixed-and-over-sidebar/fixed-and-over-sidebar.module.ts +++ b/libs/design/sidebar/examples/src/fixed-and-over-sidebar/fixed-and-over-sidebar.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { DaffSidebarModule, DaffNavbarModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { FixedAndOverSidebarComponent } from './fixed-and-over-sidebar.component'; diff --git a/libs/design/sidebar/examples/src/under-sidebar/under-sidebar.module.ts b/libs/design/sidebar/examples/src/under-sidebar/under-sidebar.module.ts index f7dfeb00da..cec5fee30c 100644 --- a/libs/design/sidebar/examples/src/under-sidebar/under-sidebar.module.ts +++ b/libs/design/sidebar/examples/src/under-sidebar/under-sidebar.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { DaffSidebarModule, DaffNavbarModule, - DaffButtonModule, } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { UnderSidebarComponent } from './under-sidebar.component'; diff --git a/libs/design/src/atoms/button/public_api.ts b/libs/design/src/atoms/button/public_api.ts deleted file mode 100644 index 95099554be..0000000000 --- a/libs/design/src/atoms/button/public_api.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './button.component'; -export { DaffButtonModule } from './button.module'; diff --git a/libs/design/src/molecules/paginator/paginator.module.ts b/libs/design/src/molecules/paginator/paginator.module.ts index 230a50b013..4bf49976f5 100644 --- a/libs/design/src/molecules/paginator/paginator.module.ts +++ b/libs/design/src/molecules/paginator/paginator.module.ts @@ -4,14 +4,12 @@ import { RouterModule } from '@angular/router'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { DaffPaginatorComponent } from './paginator.component'; -import { DaffButtonModule } from '../../atoms/button/public_api'; @NgModule({ imports: [ CommonModule, RouterModule, FontAwesomeModule, - DaffButtonModule, ], declarations: [ DaffPaginatorComponent, diff --git a/libs/design/src/public_api.ts b/libs/design/src/public_api.ts index 0a713d3509..05fa2bd21f 100644 --- a/libs/design/src/public_api.ts +++ b/libs/design/src/public_api.ts @@ -3,7 +3,6 @@ */ // Atoms -export * from './atoms/button/public_api'; export * from './atoms/form/core/public_api'; export * from './atoms/form/form-field/public_api'; export * from './atoms/form/error-message/public_api'; diff --git a/libs/theme-switch/src/lib/theme-switch-button/theme-switch-button.module.ts b/libs/theme-switch/src/lib/theme-switch-button/theme-switch-button.module.ts index 34063e643e..5ccea86706 100644 --- a/libs/theme-switch/src/lib/theme-switch-button/theme-switch-button.module.ts +++ b/libs/theme-switch/src/lib/theme-switch-button/theme-switch-button.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffThemeSwitchButtonComponent } from './theme-switch-button.component';