diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8abd564..1304c9d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -23,7 +23,7 @@ import { AppRoutingModule } from './app-routing.module'; import { AppStoreModule } from './app-store.module'; import { AppL10NModule } from './app-l10n.module'; -import { MaterialModule } from './commons/ui/material/material.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; import { AppComponent } from './app.component'; diff --git a/src/app/commons/component/layouts.module.ts b/src/app/commons/component/layouts.module.ts deleted file mode 100644 index 84cf642..0000000 --- a/src/app/commons/component/layouts.module.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SidebarComponent } from './sidebar/sidebar.component'; -import { HeaderComponent } from './header/header.component'; -import { FooterComponent } from './footer/footer.component'; -import { MenuItemComponent } from './menu-item/menu-item.component'; -import { SubMenubarComponent } from './sub-menubar/sub-menubar.component'; -import { FlexLayoutModule } from '@angular/flex-layout'; -import { InfoTableComponent } from './info-table/info-table.component'; -import { SensorSummaryComponent } from './sensor-summary/sensor-summary.component'; -import { SensorItemFilterComponent } from './sensor-item-filter/sensor-item-filter.component'; -import { HostSummaryCardComponent } from './host-summary-card/host-summary-card.component'; -import { AppSummaryCardComponent } from './app-summary-card/app-summary-card.component'; - -@NgModule({ - imports: [ - CommonModule, - FlexLayoutModule - ], - declarations: [ - SidebarComponent, - HeaderComponent, - FooterComponent, - MenuItemComponent, - SubMenubarComponent, - InfoTableComponent, - SensorSummaryComponent, - SensorItemFilterComponent, - HostSummaryCardComponent, - AppSummaryCardComponent - ] -}) -export class LayoutsModule { } diff --git a/src/app/pages/alert/alert-page.module.ts b/src/app/pages/alert/alert-page.module.ts index c649316..606197f 100644 --- a/src/app/pages/alert/alert-page.module.ts +++ b/src/app/pages/alert/alert-page.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { MaterialModule } from 'packages/commons/material/material.module'; + import { AlertPageRoutingModule } from './alert-page-routing.module'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; import { AlertPageComponent } from './alert-page.component'; @NgModule({ diff --git a/src/app/pages/dashboard/dashboard-page.module.ts b/src/app/pages/dashboard/dashboard-page.module.ts index 904bfd7..73a4fe3 100644 --- a/src/app/pages/dashboard/dashboard-page.module.ts +++ b/src/app/pages/dashboard/dashboard-page.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { DashboardPageRoutingModule } from './dashboard-page-routing.module'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; import {DashboardPageComponent} from './dashboard-page.component'; @NgModule({ diff --git a/src/app/pages/discovery/discovery-page.module.ts b/src/app/pages/discovery/discovery-page.module.ts index 407071e..92f01bc 100644 --- a/src/app/pages/discovery/discovery-page.module.ts +++ b/src/app/pages/discovery/discovery-page.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { DiscoveryModule } from 'packages/discovery/discovery.module'; + import { DiscoveryPageComponent } from './discovery-page.component'; import { DiscoveryPageRoutingModule } from './discovery-page-routing.module'; -import { DiscoveryModule } from 'packages/discovery/discovery.module'; - @NgModule({ imports: [ CommonModule, diff --git a/src/app/pages/home/home-page.module.ts b/src/app/pages/home/home-page.module.ts index f6b58be..f6a9eeb 100644 --- a/src/app/pages/home/home-page.module.ts +++ b/src/app/pages/home/home-page.module.ts @@ -1,5 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; + import { HomePageComponent } from './home-page.component'; import { HomePageRoutingModule } from './home-page-routing.module'; diff --git a/src/app/pages/infra/infra-page.module.ts b/src/app/pages/infra/infra-page.module.ts index e4c6b75..23547f4 100644 --- a/src/app/pages/infra/infra-page.module.ts +++ b/src/app/pages/infra/infra-page.module.ts @@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common'; import { InfraPageComponent } from './infra-page.component'; import { InfraPageRoutingModule } from './infra-page-routing.module'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; import { InfraModule } from 'packages/infra/infra.module'; import { SettingComponent as DiscoverySettingComponent } from 'packages/discovery/component/setting/setting.component'; diff --git a/src/app/pages/notification/notification-page.module.ts b/src/app/pages/notification/notification-page.module.ts index b975110..0fc93d8 100644 --- a/src/app/pages/notification/notification-page.module.ts +++ b/src/app/pages/notification/notification-page.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { NotificationPageComponent } from './notification-page.component'; import { NotificationPageRoutingModule } from './notification-page-routing.module'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; import { NotificationModule } from 'packages/notification/notification.module'; @NgModule({ diff --git a/src/app/pages/overview/overview-page.module.ts b/src/app/pages/overview/overview-page.module.ts index ad803ec..2e3586a 100644 --- a/src/app/pages/overview/overview-page.module.ts +++ b/src/app/pages/overview/overview-page.module.ts @@ -1,36 +1,44 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; + import { OverviewPageRoutingModule } from 'app/pages/overview/overview-page-routing.module'; import { OverviewPageComponent } from 'app/pages/overview/overview-page.component'; -import { DashboardCardComponent } from 'app/commons/component/dashboard-card/dashboard-card.component'; -import { DashboardCardModule } from 'app/commons/component/dashboard-card/dashboard-card.module'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; import { AddDashboardDialogComponent } from './add-dashboard-dialog/add-dashboard-dialog.component'; -import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; -import { SensorSummaryComponent } from '../../commons/component/sensor-summary/sensor-summary.component'; -import { SensorItemFilterComponent } from '../../commons/component/sensor-item-filter/sensor-item-filter.component'; -import { HostSummaryCardComponent } from '../../commons/component/host-summary-card/host-summary-card.component'; -import { AppSummaryCardComponent } from '../../commons/component/app-summary-card/app-summary-card.component'; -import { FormsModule } from '@angular/forms'; + import { SensorItemModule } from 'packages/sensor-item/sensor-item.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; + +import { DashboardCardModule } from 'packages/commons/component/dashboard-card/dashboard-card.module'; +import { SensorSummaryModule } from 'packages/commons/component/sensor-summary/sensor-summary.module'; +import { SensorItemFilterModule } from 'packages/commons/component/sensor-item-filter/sensor-item-filter.module'; +import { HostSummaryCardModule } from 'packages/commons/component/host-summary-card/host-summary-card.module'; +import { AppSummaryCardModule } from 'packages/commons/component/app-summary-card/app-summary-card.module'; + @NgModule({ imports: [ CommonModule, - OverviewPageRoutingModule, - DashboardCardModule, - MaterialModule, - PerfectScrollbarModule, FormsModule, + PerfectScrollbarModule, + MaterialModule, + + DashboardCardModule, + SensorSummaryModule, + SensorItemFilterModule, + HostSummaryCardModule, + AppSummaryCardModule, + SensorItemModule, + + OverviewPageRoutingModule, + ], declarations: [ OverviewPageComponent, AddDashboardDialogComponent, - SensorSummaryComponent, - SensorItemFilterComponent, - HostSummaryCardComponent, - AppSummaryCardComponent ], entryComponents: [ AddDashboardDialogComponent diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index abea3b6..051f0d0 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -1,22 +1,26 @@ import { NgModule, APP_INITIALIZER} from '@angular/core'; import { CommonModule } from '@angular/common'; -import { PagesComponent } from './pages.component'; -import { PagesRoutingModule } from './pages-routing.module'; -import { SidebarComponent } from 'app/commons/component/sidebar/sidebar.component'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; -import { HeaderComponent } from 'app/commons/component/header/header.component'; -import { FooterComponent } from 'app/commons/component/footer/footer.component'; -import { MenuItemComponent } from 'app/commons/component/menu-item/menu-item.component'; + import { PerfectScrollbarModule, PERFECT_SCROLLBAR_CONFIG, PerfectScrollbarConfigInterface } from 'ngx-perfect-scrollbar'; -import { NotificationModule } from 'packages/notification/notification.module'; + import { LocalizationModule, } from 'angular-l10n'; -import {MemberModule} from '../../packages/member/member.module'; + +import { NotificationModule } from 'packages/notification/notification.module'; +import { MemberModule } from 'packages/member/member.module'; + +import { MaterialModule } from 'packages/commons/material/material.module'; +import { HeaderModule } from 'packages/commons/component/header/header.module'; +import { SidebarModule } from 'packages/commons/component/sidebar/sidebar.module'; + +import { PagesComponent } from './pages.component'; +import { PagesRoutingModule } from './pages-routing.module'; + const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { suppressScrollX: true @@ -27,18 +31,16 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { imports: [ CommonModule, PagesRoutingModule, - MaterialModule, PerfectScrollbarModule, - NotificationModule, LocalizationModule, + MaterialModule, + HeaderModule, + SidebarModule, + NotificationModule, MemberModule, ], declarations: [ PagesComponent, - SidebarComponent, - HeaderComponent, - FooterComponent, - MenuItemComponent, ], providers: [ { diff --git a/src/app/pages/probe/probe-page.module.ts b/src/app/pages/probe/probe-page.module.ts index 2d58d8a..81dbee0 100644 --- a/src/app/pages/probe/probe-page.module.ts +++ b/src/app/pages/probe/probe-page.module.ts @@ -1,10 +1,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; + +import { ProbeModule } from 'packages/probe/probe.module'; + +import { MaterialModule } from 'packages/commons/material/material.module'; +import { SubMenubarModule } from 'packages/commons/component/sub-menubar/sub-menubar.module'; + import { ProbePageComponent } from './probe-page.component'; import { ProbePageRoutingModule } from './probe-page-routing.module'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; -import { ProbeModule } from 'packages/probe/probe.module'; -import { SubMenubarModule } from 'app/commons/component/sub-menubar/sub-menubar.module'; @NgModule({ imports: [ diff --git a/src/app/pages/probes/probes-page.module.ts b/src/app/pages/probes/probes-page.module.ts index 5158215..9e8b97a 100644 --- a/src/app/pages/probes/probes-page.module.ts +++ b/src/app/pages/probes/probes-page.module.ts @@ -1,11 +1,14 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ProbesPageComponent } from './probes-page.component'; -import { ProbesPageRoutingModule } from './probes-page-routing.module'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; + +import { MaterialModule } from 'packages/commons/material/material.module'; +import { SubMenubarModule } from 'packages/commons/component/sub-menubar/sub-menubar.module'; + import { ProbeModule } from 'packages/probe/probe.module'; import { NoauthModule } from 'packages/noauth/noauth.module'; -import { SubMenubarModule } from 'app/commons/component/sub-menubar/sub-menubar.module'; + +import { ProbesPageComponent } from './probes-page.component'; +import { ProbesPageRoutingModule } from './probes-page-routing.module'; @NgModule({ imports: [ diff --git a/src/app/pages/sensor-setting/sensor-setting-page.module.ts b/src/app/pages/sensor-setting/sensor-setting-page.module.ts index b8d5cfd..0d93145 100644 --- a/src/app/pages/sensor-setting/sensor-setting-page.module.ts +++ b/src/app/pages/sensor-setting/sensor-setting-page.module.ts @@ -1,15 +1,17 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { SensorSettingPageRoutingModule } from 'app/pages/sensor-setting/sensor-setting-page-routing.module'; -import { SensorSettingPageComponent } from 'app/pages/sensor-setting/sensor-setting-page.component'; -import { SensorModule } from 'packages/sensor/sensor.module'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; - import { FormsModule } from '@angular/forms'; -import { SettingComponent as DiscoverySettingComponent } from 'packages/discovery/component/setting/setting.component'; + +import { SensorModule } from 'packages/sensor/sensor.module'; import { DiscoveryModule } from 'packages/discovery/discovery.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; + +import { SettingComponent as DiscoverySettingComponent } from 'packages/discovery/component/setting/setting.component'; + +import { SensorSettingPageRoutingModule } from './sensor-setting-page-routing.module'; +import { SensorSettingPageComponent } from './sensor-setting-page.component'; @NgModule({ diff --git a/src/app/pages/sensor/sensor-page.module.ts b/src/app/pages/sensor/sensor-page.module.ts index f2f52d7..f0737ce 100644 --- a/src/app/pages/sensor/sensor-page.module.ts +++ b/src/app/pages/sensor/sensor-page.module.ts @@ -1,10 +1,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; -import { SubMenubarModule } from 'app/commons/component/sub-menubar/sub-menubar.module'; -import { SensorPageComponent } from './sensor-page.component'; + import { SensorModule } from 'packages/sensor/sensor.module'; + +import { MaterialModule } from 'packages/commons/material/material.module'; +import { SubMenubarModule } from 'packages/commons/component/sub-menubar/sub-menubar.module'; + import { SensorPageRoutingModule } from './sensor-page-routing.module'; +import { SensorPageComponent } from './sensor-page.component'; @NgModule({ imports: [ diff --git a/src/app/pages/sensors/sensors-page.module.ts b/src/app/pages/sensors/sensors-page.module.ts index 98c2d20..416480b 100644 --- a/src/app/pages/sensors/sensors-page.module.ts +++ b/src/app/pages/sensors/sensors-page.module.ts @@ -1,9 +1,12 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MaterialModule } from '../../commons/ui/material/material.module'; + +import { SensorModule } from 'packages/sensor/sensor.module'; + +import { MaterialModule } from 'packages/commons/material/material.module'; + import { SensorsPageComponent } from './sensors-page.component'; import { SensorsPageRoutingModule } from './sensors-page-routing.module'; -import { SensorModule } from 'packages/sensor/sensor.module'; @NgModule({ imports: [ diff --git a/src/app/pages/settings/member/member-page.module.ts b/src/app/pages/settings/member/member-page.module.ts index e5fb821..2da9f06 100644 --- a/src/app/pages/settings/member/member-page.module.ts +++ b/src/app/pages/settings/member/member-page.module.ts @@ -1,9 +1,12 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; + +import { MaterialModule } from 'packages/commons/material/material.module'; + +import { MemberTotpModule } from 'packages/settings/member/member-totp.module'; + import { MemberPageComponent } from './member-page.component'; import { MemberPageRoutingModule } from './member-page-routing.module'; -import { MemberTotpModule } from 'packages/settings/member/member-totp.module'; @NgModule({ imports: [ diff --git a/src/app/pages/target/target-page.module.ts b/src/app/pages/target/target-page.module.ts index 97d94dc..9584e1c 100644 --- a/src/app/pages/target/target-page.module.ts +++ b/src/app/pages/target/target-page.module.ts @@ -1,10 +1,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; + +import { TargetModule } from 'packages/target/target.module'; + +import { MaterialModule } from 'packages/commons/material/material.module'; +import { SubMenubarModule } from 'packages/commons/component/sub-menubar/sub-menubar.module'; + import { TargetPageComponent } from './target-page.component'; import { TargetPageRoutingModule } from './target-page-routing.module'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; -import { TargetModule } from 'packages/target/target.module'; -import { SubMenubarModule } from 'app/commons/component/sub-menubar/sub-menubar.module'; @NgModule({ imports: [ diff --git a/src/app/pages/targets/targets-page.module.ts b/src/app/pages/targets/targets-page.module.ts index 99f65d9..bb7c9b3 100644 --- a/src/app/pages/targets/targets-page.module.ts +++ b/src/app/pages/targets/targets-page.module.ts @@ -1,10 +1,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; -import { SubMenubarModule } from 'app/commons/component/sub-menubar/sub-menubar.module'; -import { TargetsPageComponent } from 'app/pages/targets/targets-page.component'; + import { TargetModule } from 'packages/target/target.module'; -import { TargetsPageRoutingModule } from 'app/pages/targets/targets-page-routing.module'; + +import { MaterialModule } from 'packages/commons/material/material.module'; +import { SubMenubarModule } from 'packages/commons/component/sub-menubar/sub-menubar.module'; + +import { TargetsPageRoutingModule } from './targets-page-routing.module'; +import { TargetsPageComponent } from './targets-page.component'; @NgModule({ imports: [ diff --git a/src/packages/commons/chart/area/area.module.ts b/src/commons/chart/area/area.module.ts similarity index 81% rename from src/packages/commons/chart/area/area.module.ts rename to src/commons/chart/area/area.module.ts index 051d39a..5f17876 100644 --- a/src/packages/commons/chart/area/area.module.ts +++ b/src/commons/chart/area/area.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { NvD3Module } from 'packages/commons/chart/core/nvd3/nvd3.module'; +import { NvD3Module } from 'commons/chart/core/nvd3/nvd3.module'; import { AreaComponent } from './component/area.component'; diff --git a/src/packages/commons/chart/area/component/area.component.html b/src/commons/chart/area/component/area.component.html similarity index 100% rename from src/packages/commons/chart/area/component/area.component.html rename to src/commons/chart/area/component/area.component.html diff --git a/src/packages/commons/chart/area/component/area.component.scss b/src/commons/chart/area/component/area.component.scss similarity index 100% rename from src/packages/commons/chart/area/component/area.component.scss rename to src/commons/chart/area/component/area.component.scss diff --git a/src/packages/commons/chart/area/component/area.component.spec.ts b/src/commons/chart/area/component/area.component.spec.ts similarity index 100% rename from src/packages/commons/chart/area/component/area.component.spec.ts rename to src/commons/chart/area/component/area.component.spec.ts diff --git a/src/packages/commons/chart/area/component/area.component.ts b/src/commons/chart/area/component/area.component.ts similarity index 100% rename from src/packages/commons/chart/area/component/area.component.ts rename to src/commons/chart/area/component/area.component.ts diff --git a/src/packages/commons/chart/core/nvd3/component/nvd3.component.spec.ts b/src/commons/chart/core/nvd3/component/nvd3.component.spec.ts similarity index 100% rename from src/packages/commons/chart/core/nvd3/component/nvd3.component.spec.ts rename to src/commons/chart/core/nvd3/component/nvd3.component.spec.ts diff --git a/src/packages/commons/chart/core/nvd3/component/nvd3.component.ts b/src/commons/chart/core/nvd3/component/nvd3.component.ts similarity index 100% rename from src/packages/commons/chart/core/nvd3/component/nvd3.component.ts rename to src/commons/chart/core/nvd3/component/nvd3.component.ts diff --git a/src/packages/commons/chart/core/nvd3/model/Config.ts b/src/commons/chart/core/nvd3/model/Config.ts similarity index 100% rename from src/packages/commons/chart/core/nvd3/model/Config.ts rename to src/commons/chart/core/nvd3/model/Config.ts diff --git a/src/packages/commons/chart/core/nvd3/nvd3.module.ts b/src/commons/chart/core/nvd3/nvd3.module.ts similarity index 100% rename from src/packages/commons/chart/core/nvd3/nvd3.module.ts rename to src/commons/chart/core/nvd3/nvd3.module.ts diff --git a/src/packages/commons/chart/line/component/line.component.html b/src/commons/chart/line/component/line.component.html similarity index 100% rename from src/packages/commons/chart/line/component/line.component.html rename to src/commons/chart/line/component/line.component.html diff --git a/src/packages/commons/chart/line/component/line.component.scss b/src/commons/chart/line/component/line.component.scss similarity index 100% rename from src/packages/commons/chart/line/component/line.component.scss rename to src/commons/chart/line/component/line.component.scss diff --git a/src/packages/commons/chart/line/component/line.component.spec.ts b/src/commons/chart/line/component/line.component.spec.ts similarity index 100% rename from src/packages/commons/chart/line/component/line.component.spec.ts rename to src/commons/chart/line/component/line.component.spec.ts diff --git a/src/packages/commons/chart/line/component/line.component.ts b/src/commons/chart/line/component/line.component.ts similarity index 100% rename from src/packages/commons/chart/line/component/line.component.ts rename to src/commons/chart/line/component/line.component.ts diff --git a/src/packages/commons/chart/line/line.module.ts b/src/commons/chart/line/line.module.ts similarity index 81% rename from src/packages/commons/chart/line/line.module.ts rename to src/commons/chart/line/line.module.ts index c856228..4be0f8b 100644 --- a/src/packages/commons/chart/line/line.module.ts +++ b/src/commons/chart/line/line.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { NvD3Module } from 'packages/commons/chart/core/nvd3/nvd3.module'; +import { NvD3Module } from 'commons/chart/core/nvd3/nvd3.module'; import { LineComponent } from './component/line.component'; diff --git a/src/packages/commons/chart/pie/component/pie.component.html b/src/commons/chart/pie/component/pie.component.html similarity index 100% rename from src/packages/commons/chart/pie/component/pie.component.html rename to src/commons/chart/pie/component/pie.component.html diff --git a/src/packages/commons/chart/pie/component/pie.component.scss b/src/commons/chart/pie/component/pie.component.scss similarity index 100% rename from src/packages/commons/chart/pie/component/pie.component.scss rename to src/commons/chart/pie/component/pie.component.scss diff --git a/src/packages/commons/chart/pie/component/pie.component.spec.ts b/src/commons/chart/pie/component/pie.component.spec.ts similarity index 100% rename from src/packages/commons/chart/pie/component/pie.component.spec.ts rename to src/commons/chart/pie/component/pie.component.spec.ts diff --git a/src/packages/commons/chart/pie/component/pie.component.ts b/src/commons/chart/pie/component/pie.component.ts similarity index 100% rename from src/packages/commons/chart/pie/component/pie.component.ts rename to src/commons/chart/pie/component/pie.component.ts diff --git a/src/packages/commons/chart/pie/pie.module.ts b/src/commons/chart/pie/pie.module.ts similarity index 81% rename from src/packages/commons/chart/pie/pie.module.ts rename to src/commons/chart/pie/pie.module.ts index 3bd0871..f2b99c7 100644 --- a/src/packages/commons/chart/pie/pie.module.ts +++ b/src/commons/chart/pie/pie.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { NvD3Module } from 'packages/commons/chart/core/nvd3/nvd3.module'; +import { NvD3Module } from 'commons/chart/core/nvd3/nvd3.module'; import { PieComponent } from './component/pie.component'; diff --git a/src/app/commons/component/app-summary-card/app-summary-card.component.html b/src/packages/commons/component/app-summary-card/app-summary-card.component.html similarity index 100% rename from src/app/commons/component/app-summary-card/app-summary-card.component.html rename to src/packages/commons/component/app-summary-card/app-summary-card.component.html diff --git a/src/app/commons/component/app-summary-card/app-summary-card.component.scss b/src/packages/commons/component/app-summary-card/app-summary-card.component.scss similarity index 100% rename from src/app/commons/component/app-summary-card/app-summary-card.component.scss rename to src/packages/commons/component/app-summary-card/app-summary-card.component.scss diff --git a/src/app/commons/component/app-summary-card/app-summary-card.component.spec.ts b/src/packages/commons/component/app-summary-card/app-summary-card.component.spec.ts similarity index 100% rename from src/app/commons/component/app-summary-card/app-summary-card.component.spec.ts rename to src/packages/commons/component/app-summary-card/app-summary-card.component.spec.ts diff --git a/src/app/commons/component/app-summary-card/app-summary-card.component.ts b/src/packages/commons/component/app-summary-card/app-summary-card.component.ts similarity index 100% rename from src/app/commons/component/app-summary-card/app-summary-card.component.ts rename to src/packages/commons/component/app-summary-card/app-summary-card.component.ts diff --git a/src/packages/commons/component/app-summary-card/app-summary-card.module.ts b/src/packages/commons/component/app-summary-card/app-summary-card.module.ts new file mode 100644 index 0000000..f06ec99 --- /dev/null +++ b/src/packages/commons/component/app-summary-card/app-summary-card.module.ts @@ -0,0 +1,23 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule } from '@angular/router'; +import { Ng2OdometerModule } from 'ng2-odometer'; + +import { MaterialModule } from 'packages/commons/material/material.module'; +import { AppSummaryCardComponent } from './app-summary-card.component'; + + +@NgModule({ + imports: [ + CommonModule, + MaterialModule, + RouterModule + ], + declarations: [ + AppSummaryCardComponent, + ], + exports: [ + AppSummaryCardComponent + ] +}) +export class AppSummaryCardModule { } diff --git a/src/app/commons/component/app-summary-card/data.ts b/src/packages/commons/component/app-summary-card/data.ts similarity index 100% rename from src/app/commons/component/app-summary-card/data.ts rename to src/packages/commons/component/app-summary-card/data.ts diff --git a/src/app/commons/component/confirm-dialog/confirm-dialog.component.html b/src/packages/commons/component/confirm-dialog/confirm-dialog.component.html similarity index 100% rename from src/app/commons/component/confirm-dialog/confirm-dialog.component.html rename to src/packages/commons/component/confirm-dialog/confirm-dialog.component.html diff --git a/src/app/commons/component/confirm-dialog/confirm-dialog.component.scss b/src/packages/commons/component/confirm-dialog/confirm-dialog.component.scss similarity index 100% rename from src/app/commons/component/confirm-dialog/confirm-dialog.component.scss rename to src/packages/commons/component/confirm-dialog/confirm-dialog.component.scss diff --git a/src/app/commons/component/confirm-dialog/confirm-dialog.component.spec.ts b/src/packages/commons/component/confirm-dialog/confirm-dialog.component.spec.ts similarity index 100% rename from src/app/commons/component/confirm-dialog/confirm-dialog.component.spec.ts rename to src/packages/commons/component/confirm-dialog/confirm-dialog.component.spec.ts diff --git a/src/app/commons/component/confirm-dialog/confirm-dialog.component.ts b/src/packages/commons/component/confirm-dialog/confirm-dialog.component.ts similarity index 100% rename from src/app/commons/component/confirm-dialog/confirm-dialog.component.ts rename to src/packages/commons/component/confirm-dialog/confirm-dialog.component.ts diff --git a/src/packages/commons/component/confirm-dialog/confirm-dialog.module.ts b/src/packages/commons/component/confirm-dialog/confirm-dialog.module.ts new file mode 100644 index 0000000..e8e8e10 --- /dev/null +++ b/src/packages/commons/component/confirm-dialog/confirm-dialog.module.ts @@ -0,0 +1,23 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule } from '@angular/router'; +import { Ng2OdometerModule } from 'ng2-odometer'; + +import { MaterialModule } from 'packages/commons/material/material.module'; +import { ConfirmDialogComponent } from './confirm-dialog.component'; + + +@NgModule({ + imports: [ + CommonModule, + MaterialModule, + RouterModule + ], + declarations: [ + ConfirmDialogComponent, + ], + exports: [ + ConfirmDialogComponent + ] +}) +export class ConfirmDialogModule { } diff --git a/src/app/commons/component/dashboard-card/dashboard-card.component.html b/src/packages/commons/component/dashboard-card/dashboard-card.component.html similarity index 100% rename from src/app/commons/component/dashboard-card/dashboard-card.component.html rename to src/packages/commons/component/dashboard-card/dashboard-card.component.html diff --git a/src/app/commons/component/dashboard-card/dashboard-card.component.scss b/src/packages/commons/component/dashboard-card/dashboard-card.component.scss similarity index 100% rename from src/app/commons/component/dashboard-card/dashboard-card.component.scss rename to src/packages/commons/component/dashboard-card/dashboard-card.component.scss diff --git a/src/app/commons/component/dashboard-card/dashboard-card.component.spec.ts b/src/packages/commons/component/dashboard-card/dashboard-card.component.spec.ts similarity index 100% rename from src/app/commons/component/dashboard-card/dashboard-card.component.spec.ts rename to src/packages/commons/component/dashboard-card/dashboard-card.component.spec.ts diff --git a/src/app/commons/component/dashboard-card/dashboard-card.component.ts b/src/packages/commons/component/dashboard-card/dashboard-card.component.ts similarity index 100% rename from src/app/commons/component/dashboard-card/dashboard-card.component.ts rename to src/packages/commons/component/dashboard-card/dashboard-card.component.ts diff --git a/src/app/commons/component/dashboard-card/dashboard-card.module.ts b/src/packages/commons/component/dashboard-card/dashboard-card.module.ts similarity index 71% rename from src/app/commons/component/dashboard-card/dashboard-card.module.ts rename to src/packages/commons/component/dashboard-card/dashboard-card.module.ts index eb38f7a..0861ca1 100644 --- a/src/app/commons/component/dashboard-card/dashboard-card.module.ts +++ b/src/packages/commons/component/dashboard-card/dashboard-card.module.ts @@ -1,10 +1,11 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; -import { DashboardCardComponent } from 'app/commons/component/dashboard-card/dashboard-card.component'; import { Ng2OdometerModule } from 'ng2-odometer'; +import { MaterialModule } from 'packages/commons/material/material.module'; +import { DashboardCardComponent } from './dashboard-card.component'; + @NgModule({ imports: [ diff --git a/src/app/commons/component/footer/footer.component.html b/src/packages/commons/component/footer/footer.component.html similarity index 100% rename from src/app/commons/component/footer/footer.component.html rename to src/packages/commons/component/footer/footer.component.html diff --git a/src/app/commons/component/footer/footer.component.scss b/src/packages/commons/component/footer/footer.component.scss similarity index 100% rename from src/app/commons/component/footer/footer.component.scss rename to src/packages/commons/component/footer/footer.component.scss diff --git a/src/app/commons/component/footer/footer.component.spec.ts b/src/packages/commons/component/footer/footer.component.spec.ts similarity index 100% rename from src/app/commons/component/footer/footer.component.spec.ts rename to src/packages/commons/component/footer/footer.component.spec.ts diff --git a/src/app/commons/component/footer/footer.component.ts b/src/packages/commons/component/footer/footer.component.ts similarity index 100% rename from src/app/commons/component/footer/footer.component.ts rename to src/packages/commons/component/footer/footer.component.ts diff --git a/src/packages/commons/component/footer/footer.module.ts b/src/packages/commons/component/footer/footer.module.ts new file mode 100644 index 0000000..e641953 --- /dev/null +++ b/src/packages/commons/component/footer/footer.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MaterialModule } from 'packages/commons/material/material.module'; + +import { FooterComponent } from './footer.component'; + +@NgModule({ + imports: [ + CommonModule, + MaterialModule + ], + declarations: [ + FooterComponent + ], + exports: [ + FooterComponent + ] +}) +export class FooterModule { } diff --git a/src/app/commons/component/header/header.component.html b/src/packages/commons/component/header/header.component.html similarity index 100% rename from src/app/commons/component/header/header.component.html rename to src/packages/commons/component/header/header.component.html diff --git a/src/app/commons/component/header/header.component.scss b/src/packages/commons/component/header/header.component.scss similarity index 100% rename from src/app/commons/component/header/header.component.scss rename to src/packages/commons/component/header/header.component.scss diff --git a/src/app/commons/component/header/header.component.spec.ts b/src/packages/commons/component/header/header.component.spec.ts similarity index 100% rename from src/app/commons/component/header/header.component.spec.ts rename to src/packages/commons/component/header/header.component.spec.ts diff --git a/src/app/commons/component/header/header.component.ts b/src/packages/commons/component/header/header.component.ts similarity index 100% rename from src/app/commons/component/header/header.component.ts rename to src/packages/commons/component/header/header.component.ts diff --git a/src/packages/commons/component/header/header.module.ts b/src/packages/commons/component/header/header.module.ts new file mode 100644 index 0000000..ccff5f3 --- /dev/null +++ b/src/packages/commons/component/header/header.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MaterialModule } from 'packages/commons/material/material.module'; + +import { NotificationModule } from 'packages/notification/notification.module'; + +import { HeaderComponent } from './header.component'; + +@NgModule({ + imports: [ + CommonModule, + MaterialModule, + NotificationModule, + ], + declarations: [ + HeaderComponent + ], + exports: [ + HeaderComponent + ] +}) +export class HeaderModule { } diff --git a/src/app/commons/component/host-summary-card/data.ts b/src/packages/commons/component/host-summary-card/data.ts similarity index 100% rename from src/app/commons/component/host-summary-card/data.ts rename to src/packages/commons/component/host-summary-card/data.ts diff --git a/src/app/commons/component/host-summary-card/host-summary-card.component.html b/src/packages/commons/component/host-summary-card/host-summary-card.component.html similarity index 100% rename from src/app/commons/component/host-summary-card/host-summary-card.component.html rename to src/packages/commons/component/host-summary-card/host-summary-card.component.html diff --git a/src/app/commons/component/host-summary-card/host-summary-card.component.scss b/src/packages/commons/component/host-summary-card/host-summary-card.component.scss similarity index 100% rename from src/app/commons/component/host-summary-card/host-summary-card.component.scss rename to src/packages/commons/component/host-summary-card/host-summary-card.component.scss diff --git a/src/app/commons/component/host-summary-card/host-summary-card.component.spec.ts b/src/packages/commons/component/host-summary-card/host-summary-card.component.spec.ts similarity index 100% rename from src/app/commons/component/host-summary-card/host-summary-card.component.spec.ts rename to src/packages/commons/component/host-summary-card/host-summary-card.component.spec.ts diff --git a/src/app/commons/component/host-summary-card/host-summary-card.component.ts b/src/packages/commons/component/host-summary-card/host-summary-card.component.ts similarity index 100% rename from src/app/commons/component/host-summary-card/host-summary-card.component.ts rename to src/packages/commons/component/host-summary-card/host-summary-card.component.ts diff --git a/src/packages/commons/component/host-summary-card/host-summary-card.module.ts b/src/packages/commons/component/host-summary-card/host-summary-card.module.ts new file mode 100644 index 0000000..c30db02 --- /dev/null +++ b/src/packages/commons/component/host-summary-card/host-summary-card.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MaterialModule } from 'packages/commons/material/material.module'; + +import { HostSummaryCardComponent } from './host-summary-card.component'; + +@NgModule({ + imports: [ + CommonModule, + MaterialModule + ], + declarations: [ + HostSummaryCardComponent + ], + exports: [ + HostSummaryCardComponent + ] +}) +export class HostSummaryCardModule { } diff --git a/src/app/commons/component/info-table/info-table.component.html b/src/packages/commons/component/info-table/info-table.component.html similarity index 100% rename from src/app/commons/component/info-table/info-table.component.html rename to src/packages/commons/component/info-table/info-table.component.html diff --git a/src/app/commons/component/info-table/info-table.component.scss b/src/packages/commons/component/info-table/info-table.component.scss similarity index 100% rename from src/app/commons/component/info-table/info-table.component.scss rename to src/packages/commons/component/info-table/info-table.component.scss diff --git a/src/app/commons/component/info-table/info-table.component.spec.ts b/src/packages/commons/component/info-table/info-table.component.spec.ts similarity index 100% rename from src/app/commons/component/info-table/info-table.component.spec.ts rename to src/packages/commons/component/info-table/info-table.component.spec.ts diff --git a/src/app/commons/component/info-table/info-table.component.ts b/src/packages/commons/component/info-table/info-table.component.ts similarity index 100% rename from src/app/commons/component/info-table/info-table.component.ts rename to src/packages/commons/component/info-table/info-table.component.ts diff --git a/src/app/commons/component/info-table/info-table.module.ts b/src/packages/commons/component/info-table/info-table.module.ts similarity index 62% rename from src/app/commons/component/info-table/info-table.module.ts rename to src/packages/commons/component/info-table/info-table.module.ts index 35bbf51..dd5796c 100644 --- a/src/app/commons/component/info-table/info-table.module.ts +++ b/src/packages/commons/component/info-table/info-table.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { InfoTableComponent } from 'app/commons/component/info-table/info-table.component'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; + +import { InfoTableComponent } from './info-table.component'; @NgModule({ imports: [ diff --git a/src/app/commons/component/input-chip/input-chip.component.html b/src/packages/commons/component/input-chip/input-chip.component.html similarity index 100% rename from src/app/commons/component/input-chip/input-chip.component.html rename to src/packages/commons/component/input-chip/input-chip.component.html diff --git a/src/app/commons/component/input-chip/input-chip.component.scss b/src/packages/commons/component/input-chip/input-chip.component.scss similarity index 100% rename from src/app/commons/component/input-chip/input-chip.component.scss rename to src/packages/commons/component/input-chip/input-chip.component.scss diff --git a/src/app/commons/component/input-chip/input-chip.component.spec.ts b/src/packages/commons/component/input-chip/input-chip.component.spec.ts similarity index 100% rename from src/app/commons/component/input-chip/input-chip.component.spec.ts rename to src/packages/commons/component/input-chip/input-chip.component.spec.ts diff --git a/src/app/commons/component/input-chip/input-chip.component.ts b/src/packages/commons/component/input-chip/input-chip.component.ts similarity index 100% rename from src/app/commons/component/input-chip/input-chip.component.ts rename to src/packages/commons/component/input-chip/input-chip.component.ts diff --git a/src/packages/commons/component/input-chip/input-chip.module.ts b/src/packages/commons/component/input-chip/input-chip.module.ts new file mode 100644 index 0000000..6cd609f --- /dev/null +++ b/src/packages/commons/component/input-chip/input-chip.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule } from '@angular/router'; + +import { MaterialModule } from 'packages/commons/material/material.module'; +import { InputChipComponent } from './input-chip.component'; + +@NgModule({ + imports: [ + CommonModule, + MaterialModule, + RouterModule + ], + declarations: [ + InputChipComponent, + ], + exports: [ + InputChipComponent, + ] +}) +export class InputChipModule { } diff --git a/src/app/commons/component/menu-item/menu-item.component.html b/src/packages/commons/component/menu-item/menu-item.component.html similarity index 100% rename from src/app/commons/component/menu-item/menu-item.component.html rename to src/packages/commons/component/menu-item/menu-item.component.html diff --git a/src/app/commons/component/menu-item/menu-item.component.scss b/src/packages/commons/component/menu-item/menu-item.component.scss similarity index 100% rename from src/app/commons/component/menu-item/menu-item.component.scss rename to src/packages/commons/component/menu-item/menu-item.component.scss diff --git a/src/app/commons/component/menu-item/menu-item.component.spec.ts b/src/packages/commons/component/menu-item/menu-item.component.spec.ts similarity index 100% rename from src/app/commons/component/menu-item/menu-item.component.spec.ts rename to src/packages/commons/component/menu-item/menu-item.component.spec.ts diff --git a/src/app/commons/component/menu-item/menu-item.component.ts b/src/packages/commons/component/menu-item/menu-item.component.ts similarity index 100% rename from src/app/commons/component/menu-item/menu-item.component.ts rename to src/packages/commons/component/menu-item/menu-item.component.ts diff --git a/src/packages/commons/component/menu-item/menu-item.module.ts b/src/packages/commons/component/menu-item/menu-item.module.ts new file mode 100644 index 0000000..f909cb1 --- /dev/null +++ b/src/packages/commons/component/menu-item/menu-item.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule } from '@angular/router'; + +import { MaterialModule } from 'packages/commons/material/material.module'; +import { MenuItemComponent } from './menu-item.component'; + +@NgModule({ + imports: [ + CommonModule, + MaterialModule, + RouterModule + ], + declarations: [ + MenuItemComponent, + ], + exports: [ + MenuItemComponent, + ] +}) +export class MenuItemModule { } diff --git a/src/app/commons/component/sensor-item-filter/sensor-item-filter.component.html b/src/packages/commons/component/sensor-item-filter/sensor-item-filter.component.html similarity index 100% rename from src/app/commons/component/sensor-item-filter/sensor-item-filter.component.html rename to src/packages/commons/component/sensor-item-filter/sensor-item-filter.component.html diff --git a/src/app/commons/component/sensor-item-filter/sensor-item-filter.component.scss b/src/packages/commons/component/sensor-item-filter/sensor-item-filter.component.scss similarity index 100% rename from src/app/commons/component/sensor-item-filter/sensor-item-filter.component.scss rename to src/packages/commons/component/sensor-item-filter/sensor-item-filter.component.scss diff --git a/src/app/commons/component/sensor-item-filter/sensor-item-filter.component.spec.ts b/src/packages/commons/component/sensor-item-filter/sensor-item-filter.component.spec.ts similarity index 100% rename from src/app/commons/component/sensor-item-filter/sensor-item-filter.component.spec.ts rename to src/packages/commons/component/sensor-item-filter/sensor-item-filter.component.spec.ts diff --git a/src/app/commons/component/sensor-item-filter/sensor-item-filter.component.ts b/src/packages/commons/component/sensor-item-filter/sensor-item-filter.component.ts similarity index 100% rename from src/app/commons/component/sensor-item-filter/sensor-item-filter.component.ts rename to src/packages/commons/component/sensor-item-filter/sensor-item-filter.component.ts diff --git a/src/packages/commons/component/sensor-item-filter/sensor-item-filter.module.ts b/src/packages/commons/component/sensor-item-filter/sensor-item-filter.module.ts new file mode 100644 index 0000000..616a062 --- /dev/null +++ b/src/packages/commons/component/sensor-item-filter/sensor-item-filter.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule } from '@angular/router'; + +import { MaterialModule } from 'packages/commons/material/material.module'; +import { SensorItemFilterComponent } from './sensor-item-filter.component'; + +@NgModule({ + imports: [ + CommonModule, + MaterialModule, + RouterModule + ], + declarations: [ + SensorItemFilterComponent, + ], + exports: [ + SensorItemFilterComponent, + ] +}) +export class SensorItemFilterModule { } diff --git a/src/app/commons/component/sensor-summary/sensor-summary.component.html b/src/packages/commons/component/sensor-summary/sensor-summary.component.html similarity index 100% rename from src/app/commons/component/sensor-summary/sensor-summary.component.html rename to src/packages/commons/component/sensor-summary/sensor-summary.component.html diff --git a/src/app/commons/component/sensor-summary/sensor-summary.component.scss b/src/packages/commons/component/sensor-summary/sensor-summary.component.scss similarity index 100% rename from src/app/commons/component/sensor-summary/sensor-summary.component.scss rename to src/packages/commons/component/sensor-summary/sensor-summary.component.scss diff --git a/src/app/commons/component/sensor-summary/sensor-summary.component.spec.ts b/src/packages/commons/component/sensor-summary/sensor-summary.component.spec.ts similarity index 100% rename from src/app/commons/component/sensor-summary/sensor-summary.component.spec.ts rename to src/packages/commons/component/sensor-summary/sensor-summary.component.spec.ts diff --git a/src/app/commons/component/sensor-summary/sensor-summary.component.ts b/src/packages/commons/component/sensor-summary/sensor-summary.component.ts similarity index 100% rename from src/app/commons/component/sensor-summary/sensor-summary.component.ts rename to src/packages/commons/component/sensor-summary/sensor-summary.component.ts diff --git a/src/packages/commons/component/sensor-summary/sensor-summary.module.ts b/src/packages/commons/component/sensor-summary/sensor-summary.module.ts new file mode 100644 index 0000000..574d8b9 --- /dev/null +++ b/src/packages/commons/component/sensor-summary/sensor-summary.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule } from '@angular/router'; + +import { MaterialModule } from 'packages/commons/material/material.module'; +import { SensorSummaryComponent } from './sensor-summary.component'; + +@NgModule({ + imports: [ + CommonModule, + MaterialModule, + RouterModule + ], + declarations: [ + SensorSummaryComponent, + ], + exports: [ + SensorSummaryComponent, + ] +}) +export class SensorSummaryModule { } diff --git a/src/app/commons/component/sidebar/menu-element.ts b/src/packages/commons/component/sidebar/menu-element.ts similarity index 100% rename from src/app/commons/component/sidebar/menu-element.ts rename to src/packages/commons/component/sidebar/menu-element.ts diff --git a/src/app/commons/component/sidebar/sidebar.component.html b/src/packages/commons/component/sidebar/sidebar.component.html similarity index 100% rename from src/app/commons/component/sidebar/sidebar.component.html rename to src/packages/commons/component/sidebar/sidebar.component.html diff --git a/src/app/commons/component/sidebar/sidebar.component.scss b/src/packages/commons/component/sidebar/sidebar.component.scss similarity index 100% rename from src/app/commons/component/sidebar/sidebar.component.scss rename to src/packages/commons/component/sidebar/sidebar.component.scss diff --git a/src/app/commons/component/sidebar/sidebar.component.spec.ts b/src/packages/commons/component/sidebar/sidebar.component.spec.ts similarity index 100% rename from src/app/commons/component/sidebar/sidebar.component.spec.ts rename to src/packages/commons/component/sidebar/sidebar.component.spec.ts diff --git a/src/app/commons/component/sidebar/sidebar.component.ts b/src/packages/commons/component/sidebar/sidebar.component.ts similarity index 100% rename from src/app/commons/component/sidebar/sidebar.component.ts rename to src/packages/commons/component/sidebar/sidebar.component.ts diff --git a/src/packages/commons/component/sidebar/sidebar.module.ts b/src/packages/commons/component/sidebar/sidebar.module.ts new file mode 100644 index 0000000..2071724 --- /dev/null +++ b/src/packages/commons/component/sidebar/sidebar.module.ts @@ -0,0 +1,30 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule } from '@angular/router'; + +import { + PerfectScrollbarModule, +} from 'ngx-perfect-scrollbar'; + +import { MaterialModule } from 'packages/commons/material/material.module'; + +import { MenuItemModule } from 'packages/commons/component/menu-item/menu-item.module'; + +import { SidebarComponent } from './sidebar.component'; + +@NgModule({ + imports: [ + CommonModule, + MaterialModule, + RouterModule, + PerfectScrollbarModule, + MenuItemModule, + ], + declarations: [ + SidebarComponent, + ], + exports: [ + SidebarComponent, + ] +}) +export class SidebarModule { } diff --git a/src/app/commons/component/sub-menubar/sub-menubar.component.html b/src/packages/commons/component/sub-menubar/sub-menubar.component.html similarity index 100% rename from src/app/commons/component/sub-menubar/sub-menubar.component.html rename to src/packages/commons/component/sub-menubar/sub-menubar.component.html diff --git a/src/app/commons/component/sub-menubar/sub-menubar.component.scss b/src/packages/commons/component/sub-menubar/sub-menubar.component.scss similarity index 100% rename from src/app/commons/component/sub-menubar/sub-menubar.component.scss rename to src/packages/commons/component/sub-menubar/sub-menubar.component.scss diff --git a/src/app/commons/component/sub-menubar/sub-menubar.component.spec.ts b/src/packages/commons/component/sub-menubar/sub-menubar.component.spec.ts similarity index 100% rename from src/app/commons/component/sub-menubar/sub-menubar.component.spec.ts rename to src/packages/commons/component/sub-menubar/sub-menubar.component.spec.ts diff --git a/src/app/commons/component/sub-menubar/sub-menubar.component.ts b/src/packages/commons/component/sub-menubar/sub-menubar.component.ts similarity index 100% rename from src/app/commons/component/sub-menubar/sub-menubar.component.ts rename to src/packages/commons/component/sub-menubar/sub-menubar.component.ts diff --git a/src/app/commons/component/sub-menubar/sub-menubar.module.ts b/src/packages/commons/component/sub-menubar/sub-menubar.module.ts similarity index 67% rename from src/app/commons/component/sub-menubar/sub-menubar.module.ts rename to src/packages/commons/component/sub-menubar/sub-menubar.module.ts index 7d706ff..59f83b1 100644 --- a/src/app/commons/component/sub-menubar/sub-menubar.module.ts +++ b/src/packages/commons/component/sub-menubar/sub-menubar.module.ts @@ -1,9 +1,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { SubMenubarComponent } from 'app/commons/component/sub-menubar/sub-menubar.component'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; import { RouterModule } from '@angular/router'; +import { MaterialModule } from 'packages/commons/material/material.module'; +import { SubMenubarComponent } from './sub-menubar.component'; + @NgModule({ imports: [ CommonModule, diff --git a/src/app/commons/ui/material/material.module.ts b/src/packages/commons/material/material.module.ts similarity index 99% rename from src/app/commons/ui/material/material.module.ts rename to src/packages/commons/material/material.module.ts index 40d657e..2670a60 100644 --- a/src/app/commons/ui/material/material.module.ts +++ b/src/packages/commons/material/material.module.ts @@ -10,6 +10,7 @@ import { MatDialogModule, MatGridListModule, MatTableModule, MatPaginatorModule, MatProgressBarModule } from '@angular/material'; + import { FlexLayoutModule } from '@angular/flex-layout'; const MATERIAL_MODULES: any[] = [ diff --git a/src/packages/discovery/component/index.ts b/src/packages/discovery/component/index.ts index 276e457..81ac9cc 100644 --- a/src/packages/discovery/component/index.ts +++ b/src/packages/discovery/component/index.ts @@ -1,7 +1,5 @@ import { SettingComponent } from './setting/setting.component'; -import { InputChipComponent } from 'app/commons/component/input-chip/input-chip.component'; export const COMPONENTS = [ SettingComponent, - InputChipComponent ]; diff --git a/src/packages/discovery/component/setting/setting.component.ts b/src/packages/discovery/component/setting/setting.component.ts index 672c313..c7d2b8d 100644 --- a/src/packages/discovery/component/setting/setting.component.ts +++ b/src/packages/discovery/component/setting/setting.component.ts @@ -3,6 +3,7 @@ import { MatCheckboxChange } from '@angular/material'; import { FormGroup } from '@angular/forms'; import { Store, select } from '@ngrx/store'; import { RPCError } from 'packages/core/rpc/error'; + import * as DiscoverySettingStore from '../../store/setting'; import { DiscoveryStartInfo } from '../../model'; diff --git a/src/packages/discovery/discovery-store.module.ts b/src/packages/discovery/discovery-store.module.ts index 5e6c480..b8f2310 100644 --- a/src/packages/discovery/discovery-store.module.ts +++ b/src/packages/discovery/discovery-store.module.ts @@ -1,12 +1,7 @@ import { NgModule } from '@angular/core'; import { StoreModule } from '@ngrx/store'; -import { StoreDevtoolsModule } from '@ngrx/store-devtools'; -import { - StoreRouterConnectingModule, - RouterStateSerializer, -} from '@ngrx/router-store'; + import { EffectsModule } from '@ngrx/effects'; -import { combineReducers, ActionReducer, ActionReducerMap, MetaReducer } from '@ngrx/store'; import { REDUCERS, @@ -21,4 +16,4 @@ import { MODULE } from './discovery.constant'; EffectsModule.forFeature(EFFECTS), ], }) -export class MemberStoreModule { } +export class DiscoveryStoreModule { } diff --git a/src/packages/discovery/discovery.module.ts b/src/packages/discovery/discovery.module.ts index 6d22a94..2d78d82 100644 --- a/src/packages/discovery/discovery.module.ts +++ b/src/packages/discovery/discovery.module.ts @@ -1,20 +1,22 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - -import { COMPONENTS } from './component'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; - -import { MemberStoreModule } from './discovery-store.module'; - -import { SERVICES } from './service'; import { FormsModule } from '@angular/forms'; +import { MaterialModule } from 'packages/commons/material/material.module'; + +import { InputChipModule } from 'packages/commons/component/input-chip/input-chip.module'; + +import { DiscoveryStoreModule } from './discovery-store.module'; +import { COMPONENTS } from './component'; +import { SERVICES } from './service'; + @NgModule({ imports: [ CommonModule, MaterialModule, - MemberStoreModule, - FormsModule + InputChipModule, + FormsModule, + DiscoveryStoreModule, ], declarations: [ COMPONENTS diff --git a/src/packages/infra/infra-store.module.ts b/src/packages/infra/infra-store.module.ts index 41831e2..efcb0bc 100644 --- a/src/packages/infra/infra-store.module.ts +++ b/src/packages/infra/infra-store.module.ts @@ -1,12 +1,7 @@ import { NgModule } from '@angular/core'; import { StoreModule } from '@ngrx/store'; -import { StoreDevtoolsModule } from '@ngrx/store-devtools'; -import { - StoreRouterConnectingModule, - RouterStateSerializer, -} from '@ngrx/router-store'; + import { EffectsModule } from '@ngrx/effects'; -import { combineReducers, ActionReducer, ActionReducerMap, MetaReducer } from '@ngrx/store'; import { REDUCERS, diff --git a/src/packages/infra/infra.module.ts b/src/packages/infra/infra.module.ts index 03f3de6..9159f2c 100644 --- a/src/packages/infra/infra.module.ts +++ b/src/packages/infra/infra.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; import { InfraStoreModule } from './infra-store.module'; diff --git a/src/packages/member/member.module.ts b/src/packages/member/member.module.ts index 197e387..3b6062f 100644 --- a/src/packages/member/member.module.ts +++ b/src/packages/member/member.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; import { MemberStoreModule } from './member-store.module'; diff --git a/src/packages/noauth/noauth.module.ts b/src/packages/noauth/noauth.module.ts index 64cfe1c..0dabfbf 100644 --- a/src/packages/noauth/noauth.module.ts +++ b/src/packages/noauth/noauth.module.ts @@ -5,7 +5,7 @@ import { NoAuthProbeStoreModule } from './noauth-probe-store.module'; import { COMPONENTS } from './component'; import { SERVICES } from './service'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; @NgModule({ imports: [ diff --git a/src/packages/notification/notification.module.ts b/src/packages/notification/notification.module.ts index 870417a..19b8154 100644 --- a/src/packages/notification/notification.module.ts +++ b/src/packages/notification/notification.module.ts @@ -4,7 +4,7 @@ import { PerfectScrollbarModule, } from 'ngx-perfect-scrollbar'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; import { COMPONENTS } from './component'; import { SERVICES } from './service'; diff --git a/src/packages/probe/component/detail/detail.component.ts b/src/packages/probe/component/detail/detail.component.ts index d9a16fc..2ac053d 100644 --- a/src/packages/probe/component/detail/detail.component.ts +++ b/src/packages/probe/component/detail/detail.component.ts @@ -1,12 +1,15 @@ import { Component, OnInit, Inject, AfterContentInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; -import { ConfirmDialogComponent } from 'app/commons/component/confirm-dialog/confirm-dialog.component'; +import { Store, select } from '@ngrx/store'; + +import { RPCError } from 'packages/core/rpc/error'; + +import { ConfirmDialogComponent } from 'packages/commons/component/confirm-dialog/confirm-dialog.component'; + import * as DetailStore from '../../store/detail'; import { DetailSelector } from '../../store'; -import { Store, select } from '@ngrx/store'; import { Probe } from '../../model'; -import { RPCError } from 'packages/core/rpc/error'; @Component({ selector: 'of-probe-detail', diff --git a/src/packages/probe/component/index.ts b/src/packages/probe/component/index.ts index 4372035..4efee54 100644 --- a/src/packages/probe/component/index.ts +++ b/src/packages/probe/component/index.ts @@ -1,11 +1,9 @@ import { DetailComponent } from './detail/detail.component'; import { ListComponent } from './list/list.component'; import { DownloadComponent } from './download/download.component'; -import { ConfirmDialogComponent } from 'app/commons/component/confirm-dialog/confirm-dialog.component'; export const COMPONENTS = [ ListComponent, DetailComponent, DownloadComponent, - ConfirmDialogComponent ]; diff --git a/src/packages/probe/probe.module.ts b/src/packages/probe/probe.module.ts index f1cb636..9cae8ad 100644 --- a/src/packages/probe/probe.module.ts +++ b/src/packages/probe/probe.module.ts @@ -1,18 +1,22 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; -import { InfoTableModule } from 'app/commons/component/info-table/info-table.module'; + +import { MaterialModule } from 'packages/commons/material/material.module'; + +import { InfoTableModule } from 'packages/commons/component/info-table/info-table.module'; +import { ConfirmDialogModule } from 'packages/commons/component/confirm-dialog/confirm-dialog.module'; +import { ConfirmDialogComponent } from 'packages/commons/component/confirm-dialog/confirm-dialog.component'; import { COMPONENTS } from './component'; import { ProbeStoreModule } from './probe-store.module'; import { SERVICES } from './service'; -import { ConfirmDialogComponent } from 'app/commons/component/confirm-dialog/confirm-dialog.component'; @NgModule({ imports: [ CommonModule, MaterialModule, InfoTableModule, + ConfirmDialogModule, ProbeStoreModule, ], declarations: [ diff --git a/src/packages/sensor-item/sensor-item.module.ts b/src/packages/sensor-item/sensor-item.module.ts index 56d1024..bf301c5 100644 --- a/src/packages/sensor-item/sensor-item.module.ts +++ b/src/packages/sensor-item/sensor-item.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; import { COMPONENTS } from './component'; diff --git a/src/packages/sensor/component/detail/detail.component.ts b/src/packages/sensor/component/detail/detail.component.ts index aa37841..557d59d 100644 --- a/src/packages/sensor/component/detail/detail.component.ts +++ b/src/packages/sensor/component/detail/detail.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, Inject } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; -import { ConfirmDialogComponent } from 'app/commons/component/confirm-dialog/confirm-dialog.component'; +import { ConfirmDialogComponent } from 'packages/commons/component/confirm-dialog/confirm-dialog.component'; @Component({ selector: 'of-sensor-detail', diff --git a/src/packages/sensor/sensor.module.ts b/src/packages/sensor/sensor.module.ts index 45ceb75..8da94dc 100644 --- a/src/packages/sensor/sensor.module.ts +++ b/src/packages/sensor/sensor.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import {FormsModule} from '@angular/forms'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; import { COMPONENTS } from './component'; import { SERVICES } from './service'; diff --git a/src/packages/settings/member/member-totp.module.ts b/src/packages/settings/member/member-totp.module.ts index e8086c9..14ac18b 100644 --- a/src/packages/settings/member/member-totp.module.ts +++ b/src/packages/settings/member/member-totp.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; import { QRCodeModule } from 'angularx-qrcode'; import { COMPONENTS } from './component'; @@ -29,4 +29,4 @@ import { MemberTotpStoreModule } from './member-totp-store.module'; SERVICES, ], }) -export class MemberTotpModule{ } +export class MemberTotpModule { } diff --git a/src/packages/target/target.module.ts b/src/packages/target/target.module.ts index e99ad1b..7606895 100644 --- a/src/packages/target/target.module.ts +++ b/src/packages/target/target.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MaterialModule } from 'app/commons/ui/material/material.module'; -import { InfoTableModule } from 'app/commons/component/info-table/info-table.module'; +import { MaterialModule } from 'packages/commons/material/material.module'; +import { InfoTableModule } from 'packages/commons/component/info-table/info-table.module'; import { COMPONENTS } from './component'; import { SERVICES } from './service'; diff --git a/src/theme/theme.scss b/src/theme/theme.scss index 88925df..e50ff81 100644 --- a/src/theme/theme.scss +++ b/src/theme/theme.scss @@ -1,9 +1,9 @@ @import '~@angular/material/theming'; @import '~app/pages/pages.component.scss'; -@import '~app/commons/component/sidebar/sidebar.component.scss'; -@import '~app/commons/component/menu-item/menu-item.component.scss'; -@import '~app/commons/component/dashboard-card/dashboard-card.component.scss'; -@import '~app/commons/component/sensor-summary/sensor-summary.component.scss'; +@import '~packages/commons/component/sidebar/sidebar.component.scss'; +@import '~packages/commons/component/menu-item/menu-item.component.scss'; +@import '~packages/commons/component/dashboard-card/dashboard-card.component.scss'; +@import '~packages/commons/component/sensor-summary/sensor-summary.component.scss'; $mat-light-theme-background: ( status-bar: map_get($mat-grey, 300),