fix(ui): fix build issues

Author: beeman

libs/angular-forms/src/forms.config.ts

@@ -1,4 +1,3 @@
-import { Validators } from '@angular/forms'
 import { ConfigOption } from '@ngx-formly/core'
 import { HorizontalComponent } from './wrappers/horizontal/horizontal.component'
 

libs/angular-ui/src/modules/footer/footer.module.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common'
 import { NgModule } from '@angular/core'
-import { LinkModule } from '../link'
+import { LinkModule } from '../link/link.module'
 import { FooterComponent } from './components/footer/footer.component'
 import { FooterLinksComponent } from './components/footer-links/footer-links.component'
 

libs/angular-ui/src/modules/header/header.module.ts

@@ -4,9 +4,9 @@ import { RouterModule } from '@angular/router'
 import { BsDropdownModule } from 'ngx-bootstrap'
 import { TimeAgoPipe } from '../../pipes/time-ago.pipe'
 
-import { AvatarModule } from '../avatar'
-import { BadgeModule } from '../badge'
-import { LinkModule } from '../link'
+import { AvatarModule } from '../avatar/avatar.module'
+import { BadgeModule } from '../badge/badge.module'
+import { LinkModule } from '../link/link.module'
 
 import { HeaderComponent } from './components/header/header.component'
 import { HeaderNotificationItemComponent } from './components/header-notification-item/header-notification-item.component'

libs/angular-ui/src/modules/layout/index.ts

@@ -1,3 +1,3 @@
-export * from './components/layout/layout.component'
-export * from './components/layout-base/layout-base.component'
+export { LayoutComponent } from './components/layout/layout.component'
+export { LayoutBaseComponent } from './components/layout-base/layout-base.component'
 export { LayoutModule } from './layout.module'

libs/angular-ui/src/modules/layout/layout.module.ts

@@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'
 import { RouterModule } from '@angular/router'
 import { LayoutComponent } from './components/layout/layout.component'
 import { LayoutBaseComponent } from './components/layout-base/layout-base.component'
-import { HeaderModule } from '../header'
-import { FooterModule } from '../footer'
+import { HeaderModule } from '../header/header.module'
+import { FooterModule } from '../footer/footer.module'
 
 @NgModule({
   imports: [ CommonModule, RouterModule, HeaderModule, FooterModule ],

libs/angular-ui/src/modules/link/link.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { RouterModule } from '@angular/router'
-import { BadgeModule } from '../badge'
+import { BadgeModule } from '../badge/badge.module'
 import { LinkContentComponent } from './components/link/link-content.component'
 import { LinkComponent } from './components/link/link.component'
 import { LinksComponent } from './components/links/links.component'

libs/angular-ui/src/modules/modules.module.ts

@@ -0,0 +1,55 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { RouterModule } from '@angular/router'
+
+import { BsDropdownModule } from 'ngx-bootstrap/dropdown'
+
+import { AlertModule } from './alert/alert.module'
+export { AlertModule } from './alert/alert.module'
+
+import { AvatarModule } from './avatar/avatar.module'
+export { AvatarModule } from './avatar/avatar.module'
+
+import { BadgeModule } from './badge/badge.module'
+export { BadgeModule } from './badge/badge.module'
+
+import { ButtonModule } from './button/button.module'
+export { ButtonModule } from './button/button.module'
+
+import { CardModule } from './card/card.module'
+export { CardModule } from './card/card.module'
+
+import { FooterModule } from './footer/footer.module'
+export { FooterModule } from './footer/footer.module'
+
+import { HeaderModule } from './header/header.module'
+export { HeaderModule } from './header/header.module'
+
+import { LayoutModule } from './layout/layout.module'
+export { LayoutModule } from './layout/layout.module'
+
+import { LinkModule } from './link/link.module'
+export { LinkModule } from './link/link.module'
+
+import { PageModule } from './page/page.module'
+export { PageModule } from './page/page.module'
+
+const uiModules = [
+  AlertModule,
+  AvatarModule,
+  BadgeModule,
+  ButtonModule,
+  CardModule,
+  FooterModule,
+  HeaderModule,
+  LayoutModule,
+  LinkModule,
+  PageModule,
+]
+
+@NgModule({
+  imports: [...uiModules],
+  exports: [...uiModules],
+})
+export class ModulesModule {}

libs/angular-ui/src/ui.module.ts

@@ -1,53 +1,13 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
-import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { RouterModule } from '@angular/router'
-import { NgPipesModule } from 'angular-pipes'
-import { BsDropdownModule } from 'ngx-bootstrap/dropdown'
 
-import { UiService } from './services/ui.service'
-
-import {
-  AlertModule,
-  AvatarModule,
-  BadgeModule,
-  ButtonModule,
-  CardModule,
-  FooterModule,
-  HeaderModule,
-  LayoutModule,
-  LinkModule,
-  PageModule,
-} from './modules'
+import { ModulesModule } from './modules/modules.module'
 
-const uiModules = [
-  AlertModule,
-  AvatarModule,
-  BadgeModule,
-  ButtonModule,
-  CardModule,
-  FooterModule,
-  HeaderModule,
-  LayoutModule,
-  LinkModule,
-  PageModule,
-]
+import { UiService } from './services/ui.service'
 
 @NgModule({
-  imports: [
-    CommonModule,
-    RouterModule,
-    FormsModule,
-    ReactiveFormsModule,
-    NgPipesModule,
-    BsDropdownModule.forRoot(),
-    ...uiModules,
-  ],
-  declarations: [],
-  exports: [
-    ...uiModules,
-    NgPipesModule,
-  ],
+  imports: [CommonModule, ModulesModule],
+  exports: [ModulesModule],
   providers: [UiService],
 })
 export class UiModule {}