diff --git a/apps/daffio/src/app/docs/components/table-of-contents/table-of-contents.component.spec.ts b/apps/daffio/src/app/docs/components/table-of-contents/table-of-contents.component.spec.ts index b7f3906c7d..9254a2256d 100644 --- a/apps/daffio/src/app/docs/components/table-of-contents/table-of-contents.component.spec.ts +++ b/apps/daffio/src/app/docs/components/table-of-contents/table-of-contents.component.spec.ts @@ -6,7 +6,7 @@ import { import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; -import { DaffLinkSetModule } from '@daffodil/design'; +import { DaffLinkSetModule } from '@daffodil/design/link-set'; import { DaffioDocsTableOfContentsComponent } from './table-of-contents.component'; import { DaffioDoc } from '../../models/doc'; diff --git a/apps/daffio/src/app/docs/components/table-of-contents/table-of-contents.module.ts b/apps/daffio/src/app/docs/components/table-of-contents/table-of-contents.module.ts index 7427ce8711..8954a533f4 100644 --- a/apps/daffio/src/app/docs/components/table-of-contents/table-of-contents.module.ts +++ b/apps/daffio/src/app/docs/components/table-of-contents/table-of-contents.module.ts @@ -2,11 +2,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { - DaffListModule, - DaffLinkSetModule, -} from '@daffodil/design'; +import { DaffListModule } from '@daffodil/design'; import { DaffAccordionModule } from '@daffodil/design/accordion'; +import { DaffLinkSetModule } from '@daffodil/design/link-set'; import { DaffioDocsTableOfContentsComponent } from './table-of-contents.component'; diff --git a/apps/demo/src/app/core/sidebar/components/sidebar-list/sidebar-list.component.spec.ts b/apps/demo/src/app/core/sidebar/components/sidebar-list/sidebar-list.component.spec.ts index 0113563bbf..bbd908e80a 100644 --- a/apps/demo/src/app/core/sidebar/components/sidebar-list/sidebar-list.component.spec.ts +++ b/apps/demo/src/app/core/sidebar/components/sidebar-list/sidebar-list.component.spec.ts @@ -10,7 +10,7 @@ import { import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; -import { DaffLinkSetModule } from '@daffodil/design'; +import { DaffLinkSetModule } from '@daffodil/design/link-set'; import { DaffNavigationTree } from '@daffodil/navigation'; import { DaffNavigationTreeFactory } from '@daffodil/navigation/testing'; diff --git a/apps/demo/src/app/core/sidebar/containers/sidebar/sidebar.component.spec.ts b/apps/demo/src/app/core/sidebar/containers/sidebar/sidebar.component.spec.ts index 1dc601afc2..5dab114b0a 100644 --- a/apps/demo/src/app/core/sidebar/containers/sidebar/sidebar.component.spec.ts +++ b/apps/demo/src/app/core/sidebar/containers/sidebar/sidebar.component.spec.ts @@ -10,7 +10,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { provideMockStore } from '@ngrx/store/testing'; import { of } from 'rxjs'; -import { DaffLinkSetModule } from '@daffodil/design'; +import { DaffLinkSetModule } from '@daffodil/design/link-set'; import { DaffLoadingIconModule } from '@daffodil/design/loading-icon'; import { DaffSidebarModule, diff --git a/apps/demo/src/app/core/sidebar/sidebar.module.ts b/apps/demo/src/app/core/sidebar/sidebar.module.ts index 61f38fead8..22a1e93a75 100644 --- a/apps/demo/src/app/core/sidebar/sidebar.module.ts +++ b/apps/demo/src/app/core/sidebar/sidebar.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffLinkSetModule } from '@daffodil/design'; +import { DaffLinkSetModule } from '@daffodil/design/link-set'; import { DaffLoadingIconModule } from '@daffodil/design/loading-icon'; import { DaffSidebarModule } from '@daffodil/design/sidebar'; import { DaffNavigationStateModule } from '@daffodil/navigation/state'; @@ -13,7 +13,6 @@ import { SidebarContainer } from './containers/sidebar/sidebar.component'; import { SidebarViewportContainer } from './containers/sidebar-viewport/sidebar-viewport.component'; import { DemoSidebarStateModule } from './sidebar.state.module'; - @NgModule({ imports: [ CommonModule, diff --git a/apps/design-land/src/app/app.module.ts b/apps/design-land/src/app/app.module.ts index e2ac1c7103..e636904ae8 100644 --- a/apps/design-land/src/app/app.module.ts +++ b/apps/design-land/src/app/app.module.ts @@ -5,12 +5,12 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { - DaffLinkSetModule, DAFF_THEME_INITIALIZER, DaffNavbarModule, } from '@daffodil/design'; import { DaffArticleModule } from '@daffodil/design/article'; import { DaffButtonModule } from '@daffodil/design/button'; +import { DaffLinkSetModule } from '@daffodil/design/link-set'; import { DaffSidebarModule } from '@daffodil/design/sidebar'; import { DaffThemeSwitchButtonModule } from '@daffodil/theme-switch'; diff --git a/apps/design-land/src/app/link-set/link-set.module.ts b/apps/design-land/src/app/link-set/link-set.module.ts index ae8214a107..11f31eb2f6 100644 --- a/apps/design-land/src/app/link-set/link-set.module.ts +++ b/apps/design-land/src/app/link-set/link-set.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { DaffLinkSetModule } from '@daffodil/design'; +import { DaffLinkSetModule } from '@daffodil/design/link-set'; import { DesignLandLinkSetRoutingModule } from './link-set-routing.module'; import { DesignLandLinkSetComponent } from './link-set.component'; diff --git a/libs/design/src/molecules/link-set/README.md b/libs/design/link-set/README.md similarity index 100% rename from libs/design/src/molecules/link-set/README.md rename to libs/design/link-set/README.md diff --git a/libs/design/link-set/ng-package.json b/libs/design/link-set/ng-package.json new file mode 100644 index 0000000000..6651cf853f --- /dev/null +++ b/libs/design/link-set/ng-package.json @@ -0,0 +1,9 @@ +{ + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../dist/design/link-set", + "deleteDestPath": false, + "lib": { + "entryFile": "src/index.ts", + "styleIncludePaths": ["../src/scss"] + } +} \ No newline at end of file diff --git a/libs/design/link-set/src/index.ts b/libs/design/link-set/src/index.ts new file mode 100644 index 0000000000..4aaf8f92ed --- /dev/null +++ b/libs/design/link-set/src/index.ts @@ -0,0 +1 @@ +export * from './public_api'; diff --git a/libs/design/src/molecules/link-set/link-set-heading/link-set-heading.directive.spec.ts b/libs/design/link-set/src/link-set-heading/link-set-heading.directive.spec.ts similarity index 100% rename from libs/design/src/molecules/link-set/link-set-heading/link-set-heading.directive.spec.ts rename to libs/design/link-set/src/link-set-heading/link-set-heading.directive.spec.ts diff --git a/libs/design/src/molecules/link-set/link-set-heading/link-set-heading.directive.ts b/libs/design/link-set/src/link-set-heading/link-set-heading.directive.ts similarity index 100% rename from libs/design/src/molecules/link-set/link-set-heading/link-set-heading.directive.ts rename to libs/design/link-set/src/link-set-heading/link-set-heading.directive.ts diff --git a/libs/design/src/molecules/link-set/link-set-item/link-set-item.component.spec.ts b/libs/design/link-set/src/link-set-item/link-set-item.component.spec.ts similarity index 100% rename from libs/design/src/molecules/link-set/link-set-item/link-set-item.component.spec.ts rename to libs/design/link-set/src/link-set-item/link-set-item.component.spec.ts diff --git a/libs/design/src/molecules/link-set/link-set-item/link-set-item.component.ts b/libs/design/link-set/src/link-set-item/link-set-item.component.ts similarity index 100% rename from libs/design/src/molecules/link-set/link-set-item/link-set-item.component.ts rename to libs/design/link-set/src/link-set-item/link-set-item.component.ts diff --git a/libs/design/src/molecules/link-set/link-set-subheading/link-set-subheading.directive.spec.ts b/libs/design/link-set/src/link-set-subheading/link-set-subheading.directive.spec.ts similarity index 100% rename from libs/design/src/molecules/link-set/link-set-subheading/link-set-subheading.directive.spec.ts rename to libs/design/link-set/src/link-set-subheading/link-set-subheading.directive.spec.ts diff --git a/libs/design/src/molecules/link-set/link-set-subheading/link-set-subheading.directive.ts b/libs/design/link-set/src/link-set-subheading/link-set-subheading.directive.ts similarity index 100% rename from libs/design/src/molecules/link-set/link-set-subheading/link-set-subheading.directive.ts rename to libs/design/link-set/src/link-set-subheading/link-set-subheading.directive.ts diff --git a/libs/design/src/molecules/link-set/link-set.module.ts b/libs/design/link-set/src/link-set.module.ts similarity index 100% rename from libs/design/src/molecules/link-set/link-set.module.ts rename to libs/design/link-set/src/link-set.module.ts diff --git a/libs/design/src/molecules/link-set/link-set/link-set.component.scss b/libs/design/link-set/src/link-set/link-set.component.scss similarity index 88% rename from libs/design/src/molecules/link-set/link-set/link-set.component.scss rename to libs/design/link-set/src/link-set/link-set.component.scss index 4eb05c135d..e7b8ba65ed 100644 --- a/libs/design/src/molecules/link-set/link-set/link-set.component.scss +++ b/libs/design/link-set/src/link-set/link-set.component.scss @@ -1,5 +1,5 @@ -@use '../../../../scss/typography' as t; -@use '../../../../scss/interactions'; +@use '../../../scss/typography' as t; +@use '../../../scss/interactions'; .daff-link-set { display: block; diff --git a/libs/design/src/molecules/link-set/link-set/link-set.component.spec.ts b/libs/design/link-set/src/link-set/link-set.component.spec.ts similarity index 100% rename from libs/design/src/molecules/link-set/link-set/link-set.component.spec.ts rename to libs/design/link-set/src/link-set/link-set.component.spec.ts diff --git a/libs/design/src/molecules/link-set/link-set/link-set.component.ts b/libs/design/link-set/src/link-set/link-set.component.ts similarity index 91% rename from libs/design/src/molecules/link-set/link-set/link-set.component.ts rename to libs/design/link-set/src/link-set/link-set.component.ts index 69651647fe..3df90809dd 100644 --- a/libs/design/src/molecules/link-set/link-set/link-set.component.ts +++ b/libs/design/link-set/src/link-set/link-set.component.ts @@ -7,7 +7,7 @@ import { Renderer2, } from '@angular/core'; -import { daffArticleEncapsulatedMixin } from '../../../core/article-encapsulated/public_api'; +import { daffArticleEncapsulatedMixin } from '@daffodil/design'; /** * An _elementRef and an instance of renderer2 are needed for the link set mixins diff --git a/libs/design/src/molecules/link-set/public_api.ts b/libs/design/link-set/src/public_api.ts similarity index 100% rename from libs/design/src/molecules/link-set/public_api.ts rename to libs/design/link-set/src/public_api.ts diff --git a/libs/design/sidebar/examples/src/basic-sidebar/basic-sidebar.module.ts b/libs/design/sidebar/examples/src/basic-sidebar/basic-sidebar.module.ts index 88bf7fdeca..bf4ccfd18f 100644 --- a/libs/design/sidebar/examples/src/basic-sidebar/basic-sidebar.module.ts +++ b/libs/design/sidebar/examples/src/basic-sidebar/basic-sidebar.module.ts @@ -1,9 +1,7 @@ import { NgModule } from '@angular/core'; -import { - DaffNavbarModule, - DaffLinkSetModule, -} from '@daffodil/design'; +import { DaffNavbarModule } from '@daffodil/design'; +import { DaffLinkSetModule } from '@daffodil/design/link-set'; import { DaffSidebarModule } from '@daffodil/design/sidebar'; import { BasicSidebarComponent } from './basic-sidebar.component'; diff --git a/libs/design/sidebar/examples/src/over-and-under-sidebars/over-and-under-sidebars.module.ts b/libs/design/sidebar/examples/src/over-and-under-sidebars/over-and-under-sidebars.module.ts index 21ee4dd179..99679a5a22 100644 --- a/libs/design/sidebar/examples/src/over-and-under-sidebars/over-and-under-sidebars.module.ts +++ b/libs/design/sidebar/examples/src/over-and-under-sidebars/over-and-under-sidebars.module.ts @@ -2,11 +2,9 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { - DaffNavbarModule, - DaffLinkSetModule, -} from '@daffodil/design'; +import { DaffNavbarModule } from '@daffodil/design'; import { DaffButtonModule } from '@daffodil/design/button'; +import { DaffLinkSetModule } from '@daffodil/design/link-set'; import { DaffSidebarModule } from '@daffodil/design/sidebar'; import { OverandUnderSidebarsComponent } from './over-and-under-sidebars.component'; diff --git a/libs/design/src/public_api.ts b/libs/design/src/public_api.ts index 25c4cc562c..10559246e6 100644 --- a/libs/design/src/public_api.ts +++ b/libs/design/src/public_api.ts @@ -19,7 +19,6 @@ export * from './molecules/backdrop/public_api'; export * from './molecules/button-set/public_api'; export * from './molecules/image-gallery/public_api'; export * from './molecules/image-list/public_api'; -export * from './molecules/link-set/public_api'; export * from './molecules/list/public_api'; export * from './molecules/media-gallery/public_api'; export * from './molecules/menu/public_api';