From 7e5ffb9d6505ba8310c5bbff626d2a2653412059 Mon Sep 17 00:00:00 2001 From: crusader Date: Fri, 2 Mar 2018 17:43:13 +0900 Subject: [PATCH] ing --- .../commons/router/guards/auth-guard.spec.ts | 15 ----------- src/app/commons/router/guards/auth-guard.ts | 9 ------- .../simple-router-state-serializer.ts | 1 - src/app/commons/service/rest.service.ts | 5 ++-- src/app/packages/sensor/sensor.module.ts | 25 ------------------- src/app/pages/auth/auth-page.module.ts | 2 +- .../pages/discovery/discovery-page.module.ts | 2 +- src/app/pages/infra/infra-page.module.ts | 2 +- .../pages/overview/overview-page.module.ts | 2 +- src/app/pages/pages.module.ts | 4 +-- .../pages/probe/probe-page-routing.module.ts | 4 +-- src/app/pages/probe/probe-page.module.ts | 2 +- .../probes/probes-page-routing.module.ts | 8 +++--- src/app/pages/probes/probes-page.module.ts | 4 +-- .../sensor-setting-page.component.ts | 2 +- .../sensor-setting-page.module.ts | 4 +-- src/app/pages/target/target-page.module.ts | 2 +- .../targets/targets-page-routing.module.ts | 2 +- src/app/pages/targets/targets-page.module.ts | 2 +- .../component/setting/setting.component.html | 0 .../component/setting/setting.component.scss | 0 .../setting/setting.component.spec.ts | 0 .../component/setting/setting.component.ts | 0 .../packages/discovery/discovery.module.ts | 12 ++++----- .../infra/component/map/map.component.html | 0 .../infra/component/map/map.component.scss | 0 .../infra/component/map/map.component.spec.ts | 0 .../infra/component/map/map.component.ts | 0 src/{app => }/packages/infra/infra.module.ts | 15 +++++------ .../component/modify/modify.component.html | 0 .../component/modify/modify.component.scss | 0 .../component/modify/modify.component.spec.ts | 0 .../component/modify/modify.component.ts | 0 .../reset-password.component.html | 0 .../reset-password.component.scss | 0 .../reset-password.component.spec.ts | 0 .../reset-password.component.ts | 0 .../component/signin/signin.component.html | 0 .../component/signin/signin.component.scss | 0 .../component/signin/signin.component.spec.ts | 0 .../component/signin/signin.component.ts | 0 .../component/signup/signup.component.html | 0 .../component/signup/signup.component.scss | 0 .../component/signup/signup.component.spec.ts | 0 .../component/signup/signup.component.ts | 0 .../packages/member/guard/auth.guard.spec.ts | 0 .../packages/member/guard/auth.guard.ts | 0 .../packages/member/member-store.module.ts | 0 .../packages/member/member.constant.ts | 0 .../packages/member/member.module.ts | 0 src/{app => }/packages/member/model/member.ts | 0 .../member/service/member.service.spec.ts | 0 .../packages/member/service/member.service.ts | 0 .../packages/member/store/auth/auth.action.ts | 0 .../member/store/auth/auth.effect.spec.ts | 0 .../packages/member/store/auth/auth.effect.ts | 0 .../member/store/auth/auth.reducer.ts | 0 .../packages/member/store/auth/auth.state.ts | 0 .../packages/member/store/auth/index.ts | 0 src/{app => }/packages/member/store/effect.ts | 0 .../packages/member/store/reducer.ts | 0 .../packages/member/store/signup/index.ts | 0 .../member/store/signup/signup.action.ts | 0 .../member/store/signup/signup.effect.spec.ts | 0 .../member/store/signup/signup.effect.ts | 0 .../member/store/signup/signup.reducer.ts | 0 .../member/store/signup/signup.state.ts | 0 src/{app => }/packages/member/store/state.ts | 0 .../noauth/component/list/list.component.html | 0 .../noauth/component/list/list.component.scss | 0 .../component/list/list.component.spec.ts | 0 .../noauth/component/list/list.component.ts | 0 .../packages/noauth/noauth.module.ts | 12 ++++++--- .../notification/notification.component.html | 0 .../notification/notification.component.scss | 0 .../notification.component.spec.ts | 0 .../notification/notification.component.ts | 0 .../notification/notification.module.ts | 25 +++++++++++++++++++ .../component/detail/detail.component.html | 0 .../component/detail/detail.component.scss | 0 .../component/detail/detail.component.spec.ts | 0 .../component/detail/detail.component.ts | 0 .../download/download.component.html | 0 .../download/download.component.scss | 0 .../download/download.component.spec.ts | 0 .../component/download/download.component.ts | 0 .../probe/component/list/list.component.html | 0 .../probe/component/list/list.component.scss | 0 .../component/list/list.component.spec.ts | 0 .../probe/component/list/list.component.ts | 0 src/{app => }/packages/probe/probe.module.ts | 20 +++++++++------ .../component/list/list.component.html | 0 .../component/list/list.component.scss | 0 .../component/list/list.component.spec.ts | 0 .../component/list/list.component.ts | 0 .../sensor-item/sensor-item.module.ts | 12 ++++----- .../setting-result.component.html | 0 .../setting-result.component.scss | 0 .../setting-result.component.spec.ts | 0 .../setting-result.component.ts | 0 .../component/setting/setting.component.html | 0 .../component/setting/setting.component.scss | 0 .../setting/setting.component.spec.ts | 0 .../component/setting/setting.component.ts | 0 src/packages/sensor/sensor.module.ts | 24 ++++++++++++++++++ .../component/detail/detail.component.html | 0 .../component/detail/detail.component.scss | 0 .../component/detail/detail.component.spec.ts | 0 .../component/detail/detail.component.ts | 0 .../target/component/list/list.component.html | 0 .../target/component/list/list.component.scss | 0 .../component/list/list.component.spec.ts | 0 .../target/component/list/list.component.ts | 0 .../packages/target/target.module.ts | 17 +++++++------ 114 files changed, 123 insertions(+), 111 deletions(-) delete mode 100644 src/app/commons/router/guards/auth-guard.spec.ts delete mode 100644 src/app/commons/router/guards/auth-guard.ts delete mode 100644 src/app/packages/sensor/sensor.module.ts rename src/{app => }/packages/discovery/component/setting/setting.component.html (100%) rename src/{app => }/packages/discovery/component/setting/setting.component.scss (100%) rename src/{app => }/packages/discovery/component/setting/setting.component.spec.ts (100%) rename src/{app => }/packages/discovery/component/setting/setting.component.ts (100%) rename src/{app => }/packages/discovery/discovery.module.ts (76%) rename src/{app => }/packages/infra/component/map/map.component.html (100%) rename src/{app => }/packages/infra/component/map/map.component.scss (100%) rename src/{app => }/packages/infra/component/map/map.component.spec.ts (100%) rename src/{app => }/packages/infra/component/map/map.component.ts (100%) rename src/{app => }/packages/infra/infra.module.ts (76%) rename src/{app => }/packages/member/component/modify/modify.component.html (100%) rename src/{app => }/packages/member/component/modify/modify.component.scss (100%) rename src/{app => }/packages/member/component/modify/modify.component.spec.ts (100%) rename src/{app => }/packages/member/component/modify/modify.component.ts (100%) rename src/{app => }/packages/member/component/reset-password/reset-password.component.html (100%) rename src/{app => }/packages/member/component/reset-password/reset-password.component.scss (100%) rename src/{app => }/packages/member/component/reset-password/reset-password.component.spec.ts (100%) rename src/{app => }/packages/member/component/reset-password/reset-password.component.ts (100%) rename src/{app => }/packages/member/component/signin/signin.component.html (100%) rename src/{app => }/packages/member/component/signin/signin.component.scss (100%) rename src/{app => }/packages/member/component/signin/signin.component.spec.ts (100%) rename src/{app => }/packages/member/component/signin/signin.component.ts (100%) rename src/{app => }/packages/member/component/signup/signup.component.html (100%) rename src/{app => }/packages/member/component/signup/signup.component.scss (100%) rename src/{app => }/packages/member/component/signup/signup.component.spec.ts (100%) rename src/{app => }/packages/member/component/signup/signup.component.ts (100%) rename src/{app => }/packages/member/guard/auth.guard.spec.ts (100%) rename src/{app => }/packages/member/guard/auth.guard.ts (100%) rename src/{app => }/packages/member/member-store.module.ts (100%) rename src/{app => }/packages/member/member.constant.ts (100%) rename src/{app => }/packages/member/member.module.ts (100%) rename src/{app => }/packages/member/model/member.ts (100%) rename src/{app => }/packages/member/service/member.service.spec.ts (100%) rename src/{app => }/packages/member/service/member.service.ts (100%) rename src/{app => }/packages/member/store/auth/auth.action.ts (100%) rename src/{app => }/packages/member/store/auth/auth.effect.spec.ts (100%) rename src/{app => }/packages/member/store/auth/auth.effect.ts (100%) rename src/{app => }/packages/member/store/auth/auth.reducer.ts (100%) rename src/{app => }/packages/member/store/auth/auth.state.ts (100%) rename src/{app => }/packages/member/store/auth/index.ts (100%) rename src/{app => }/packages/member/store/effect.ts (100%) rename src/{app => }/packages/member/store/reducer.ts (100%) rename src/{app => }/packages/member/store/signup/index.ts (100%) rename src/{app => }/packages/member/store/signup/signup.action.ts (100%) rename src/{app => }/packages/member/store/signup/signup.effect.spec.ts (100%) rename src/{app => }/packages/member/store/signup/signup.effect.ts (100%) rename src/{app => }/packages/member/store/signup/signup.reducer.ts (100%) rename src/{app => }/packages/member/store/signup/signup.state.ts (100%) rename src/{app => }/packages/member/store/state.ts (100%) rename src/{app => }/packages/noauth/component/list/list.component.html (100%) rename src/{app => }/packages/noauth/component/list/list.component.scss (100%) rename src/{app => }/packages/noauth/component/list/list.component.spec.ts (100%) rename src/{app => }/packages/noauth/component/list/list.component.ts (100%) rename src/{app => }/packages/noauth/noauth.module.ts (50%) rename src/{app/packages => packages/notification/component}/notification/notification.component.html (100%) rename src/{app/packages => packages/notification/component}/notification/notification.component.scss (100%) rename src/{app/packages => packages/notification/component}/notification/notification.component.spec.ts (100%) rename src/{app/packages => packages/notification/component}/notification/notification.component.ts (100%) create mode 100644 src/packages/notification/notification.module.ts rename src/{app => }/packages/probe/component/detail/detail.component.html (100%) rename src/{app => }/packages/probe/component/detail/detail.component.scss (100%) rename src/{app => }/packages/probe/component/detail/detail.component.spec.ts (100%) rename src/{app => }/packages/probe/component/detail/detail.component.ts (100%) rename src/{app => }/packages/probe/component/download/download.component.html (100%) rename src/{app => }/packages/probe/component/download/download.component.scss (100%) rename src/{app => }/packages/probe/component/download/download.component.spec.ts (100%) rename src/{app => }/packages/probe/component/download/download.component.ts (100%) rename src/{app => }/packages/probe/component/list/list.component.html (100%) rename src/{app => }/packages/probe/component/list/list.component.scss (100%) rename src/{app => }/packages/probe/component/list/list.component.spec.ts (100%) rename src/{app => }/packages/probe/component/list/list.component.ts (100%) rename src/{app => }/packages/probe/probe.module.ts (51%) rename src/{app => }/packages/sensor-item/component/list/list.component.html (100%) rename src/{app => }/packages/sensor-item/component/list/list.component.scss (100%) rename src/{app => }/packages/sensor-item/component/list/list.component.spec.ts (100%) rename src/{app => }/packages/sensor-item/component/list/list.component.ts (100%) rename src/{app => }/packages/sensor-item/sensor-item.module.ts (77%) rename src/{app => }/packages/sensor/component/setting-result/setting-result.component.html (100%) rename src/{app => }/packages/sensor/component/setting-result/setting-result.component.scss (100%) rename src/{app => }/packages/sensor/component/setting-result/setting-result.component.spec.ts (100%) rename src/{app => }/packages/sensor/component/setting-result/setting-result.component.ts (100%) rename src/{app => }/packages/sensor/component/setting/setting.component.html (100%) rename src/{app => }/packages/sensor/component/setting/setting.component.scss (100%) rename src/{app => }/packages/sensor/component/setting/setting.component.spec.ts (100%) rename src/{app => }/packages/sensor/component/setting/setting.component.ts (100%) create mode 100644 src/packages/sensor/sensor.module.ts rename src/{app => }/packages/target/component/detail/detail.component.html (100%) rename src/{app => }/packages/target/component/detail/detail.component.scss (100%) rename src/{app => }/packages/target/component/detail/detail.component.spec.ts (100%) rename src/{app => }/packages/target/component/detail/detail.component.ts (100%) rename src/{app => }/packages/target/component/list/list.component.html (100%) rename src/{app => }/packages/target/component/list/list.component.scss (100%) rename src/{app => }/packages/target/component/list/list.component.spec.ts (100%) rename src/{app => }/packages/target/component/list/list.component.ts (100%) rename src/{app => }/packages/target/target.module.ts (70%) diff --git a/src/app/commons/router/guards/auth-guard.spec.ts b/src/app/commons/router/guards/auth-guard.spec.ts deleted file mode 100644 index 1752942..0000000 --- a/src/app/commons/router/guards/auth-guard.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; - -import { AuthGuard } from './auth-guard'; - -describe('AuthGuardService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [AuthGuard] - }); - }); - - it('should be created', inject([AuthGuard], (service: AuthGuard) => { - expect(service).toBeTruthy(); - })); -}); diff --git a/src/app/commons/router/guards/auth-guard.ts b/src/app/commons/router/guards/auth-guard.ts deleted file mode 100644 index 57e2b03..0000000 --- a/src/app/commons/router/guards/auth-guard.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Injectable } from '@angular/core'; -import { CanActivate } from '@angular/router'; -import { Store, select } from '@ngrx/store'; -import { Observable } from 'rxjs/Observable'; -import { map, take } from 'rxjs/operators'; - -@Injectable() -export class AuthGuard { -} diff --git a/src/app/commons/router/state/serializer/simple-router-state-serializer.ts b/src/app/commons/router/state/serializer/simple-router-state-serializer.ts index 0b953b7..002f1d8 100644 --- a/src/app/commons/router/state/serializer/simple-router-state-serializer.ts +++ b/src/app/commons/router/state/serializer/simple-router-state-serializer.ts @@ -9,7 +9,6 @@ import { RouterStateSnapshot, Params } from '@angular/router'; * need the URL and query parameters from the snapshot in the store. Other items could be * returned such as route parameters and static route data. */ - export interface RouterStateURL { url: string; params: Params; diff --git a/src/app/commons/service/rest.service.ts b/src/app/commons/service/rest.service.ts index 91cf2f6..7c92574 100644 --- a/src/app/commons/service/rest.service.ts +++ b/src/app/commons/service/rest.service.ts @@ -14,6 +14,7 @@ export class RESTService { constructor( @Inject(HttpClient) private _httpClient: HttpClient, ) { + this.baseURL = 'http://192.168.1.101:80/webapp'; this.httpHeaders = new HttpHeaders() .set('Accept', 'application/json') .set('Content-Type', 'application/json'); @@ -27,7 +28,7 @@ export class RESTService { const headers: HttpHeaders = this.httpHeaders; return this._httpClient - .get('', { + .get(`${this.baseURL}${entry}`, { headers: headers, params: params, responseType: 'json', @@ -38,7 +39,7 @@ export class RESTService { const headers: HttpHeaders = this.httpHeaders; return this._httpClient - .post('', body, { + .post(`${this.baseURL}${entry}`, body, { headers: headers, params: params, responseType: 'json', diff --git a/src/app/packages/sensor/sensor.module.ts b/src/app/packages/sensor/sensor.module.ts deleted file mode 100644 index d675b58..0000000 --- a/src/app/packages/sensor/sensor.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MaterialModule } from 'app/commons/ui/material/material.module'; -import { DiscoverySettingComponent } from 'app/packages/sensor/component/setting/setting.component'; -import { SettingResultComponent } from 'app/packages/sensor/component/setting-result/setting-result.component'; - -import {FormsModule} from '@angular/forms'; - -@NgModule({ - imports: [ - CommonModule, - MaterialModule, - FormsModule - ], - declarations: [ - DiscoverySettingComponent, - SettingResultComponent, - ], - exports: [ - DiscoverySettingComponent, - SettingResultComponent - ] -}) -export class SensorModule { } diff --git a/src/app/pages/auth/auth-page.module.ts b/src/app/pages/auth/auth-page.module.ts index 93fa1f6..b4d6a0e 100644 --- a/src/app/pages/auth/auth-page.module.ts +++ b/src/app/pages/auth/auth-page.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { FlexLayoutModule } from '@angular/flex-layout'; -import { MemberModule } from 'app/packages/member/member.module'; +import { MemberModule } from 'packages/member/member.module'; import { AuthPageComponent } from './auth-page.component'; import { AuthPageRoutingModule } from './auth-page-routing.module'; diff --git a/src/app/pages/discovery/discovery-page.module.ts b/src/app/pages/discovery/discovery-page.module.ts index 354d4ea..407071e 100644 --- a/src/app/pages/discovery/discovery-page.module.ts +++ b/src/app/pages/discovery/discovery-page.module.ts @@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common'; import { DiscoveryPageComponent } from './discovery-page.component'; import { DiscoveryPageRoutingModule } from './discovery-page-routing.module'; -import { DiscoveryModule } from '../../packages/discovery/discovery.module'; +import { DiscoveryModule } from 'packages/discovery/discovery.module'; @NgModule({ imports: [ diff --git a/src/app/pages/infra/infra-page.module.ts b/src/app/pages/infra/infra-page.module.ts index c447a78..f6e7281 100644 --- a/src/app/pages/infra/infra-page.module.ts +++ b/src/app/pages/infra/infra-page.module.ts @@ -6,7 +6,7 @@ import { InfraPageRoutingModule } from './infra-page-routing.module'; import { MaterialModule } from 'app/commons/ui/material/material.module'; -import { InfraModule } from '../../packages/infra/infra.module'; +import { InfraModule } from 'packages/infra/infra.module'; @NgModule({ imports: [ diff --git a/src/app/pages/overview/overview-page.module.ts b/src/app/pages/overview/overview-page.module.ts index b8c8061..949b038 100644 --- a/src/app/pages/overview/overview-page.module.ts +++ b/src/app/pages/overview/overview-page.module.ts @@ -13,7 +13,7 @@ import { NgxChartsModule } from '@swimlane/ngx-charts'; 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 { SensorItemModule } from 'packages/sensor-item/sensor-item.module'; @NgModule({ imports: [ diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 6a126a8..a4c3026 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -13,7 +13,7 @@ import { PERFECT_SCROLLBAR_CONFIG, PerfectScrollbarConfigInterface } from 'ngx-perfect-scrollbar'; -import { NotificationComponent } from 'app/packages/notification/notification.component'; +import { NotificationModule } from 'packages/notification/notification.module'; const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { suppressScrollX: true @@ -27,6 +27,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { CovalentModule, MaterialModule, PerfectScrollbarModule, + NotificationModule, ], declarations: [ PagesComponent, @@ -34,7 +35,6 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { HeaderComponent, FooterComponent, MenuItemComponent, - NotificationComponent, ], providers: [ { diff --git a/src/app/pages/probe/probe-page-routing.module.ts b/src/app/pages/probe/probe-page-routing.module.ts index 46952b7..75df806 100644 --- a/src/app/pages/probe/probe-page-routing.module.ts +++ b/src/app/pages/probe/probe-page-routing.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { ProbePageComponent } from './probe-page.component'; -import { DetailComponent as ProbeDetailComponent } from 'app/packages/probe/component/detail/detail.component'; -import { ListComponent as TargetListComponent } from 'app/packages/target/component/list/list.component'; +import { DetailComponent as ProbeDetailComponent } from 'packages/probe/component/detail/detail.component'; +import { ListComponent as TargetListComponent } from 'packages/target/component/list/list.component'; const routes: Routes = [ { diff --git a/src/app/pages/probe/probe-page.module.ts b/src/app/pages/probe/probe-page.module.ts index d5b8adb..2d58d8a 100644 --- a/src/app/pages/probe/probe-page.module.ts +++ b/src/app/pages/probe/probe-page.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; 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 'app/packages/probe/probe.module'; +import { ProbeModule } from 'packages/probe/probe.module'; import { SubMenubarModule } from 'app/commons/component/sub-menubar/sub-menubar.module'; @NgModule({ diff --git a/src/app/pages/probes/probes-page-routing.module.ts b/src/app/pages/probes/probes-page-routing.module.ts index 3205cba..d191c31 100644 --- a/src/app/pages/probes/probes-page-routing.module.ts +++ b/src/app/pages/probes/probes-page-routing.module.ts @@ -1,10 +1,10 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { ProbesPageComponent } from './probes-page.component'; -import { ListComponent as ProbeListComponent } from 'app/packages/probe/component/list/list.component'; -import { ListComponent as NoauthListComponent } from 'app/packages/noauth/component/list/list.component'; -import { DownloadComponent } from 'app/packages/probe/component/download/download.component'; -import { DetailComponent as ProbeDetailComponent } from 'app/packages/probe/component/detail/detail.component'; +import { ListComponent as ProbeListComponent } from 'packages/probe/component/list/list.component'; +import { ListComponent as NoauthListComponent } from 'packages/noauth/component/list/list.component'; +import { DownloadComponent } from 'packages/probe/component/download/download.component'; +import { DetailComponent as ProbeDetailComponent } from 'packages/probe/component/detail/detail.component'; const routes: Routes = [ { diff --git a/src/app/pages/probes/probes-page.module.ts b/src/app/pages/probes/probes-page.module.ts index 472a54d..5158215 100644 --- a/src/app/pages/probes/probes-page.module.ts +++ b/src/app/pages/probes/probes-page.module.ts @@ -3,8 +3,8 @@ 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 { ProbeModule } from 'app/packages/probe/probe.module'; -import { NoauthModule } from 'app/packages/noauth/noauth.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'; @NgModule({ diff --git a/src/app/pages/sensor-setting/sensor-setting-page.component.ts b/src/app/pages/sensor-setting/sensor-setting-page.component.ts index 023b9c3..a86316b 100644 --- a/src/app/pages/sensor-setting/sensor-setting-page.component.ts +++ b/src/app/pages/sensor-setting/sensor-setting-page.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import {MatDialog} from '@angular/material'; -import { DiscoverySettingComponent } from 'app/packages/sensor/component/setting/setting.component'; +import { DiscoverySettingComponent } from 'packages/sensor/component/setting/setting.component'; @Component({ 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 9477ed7..d273ede 100644 --- a/src/app/pages/sensor-setting/sensor-setting-page.module.ts +++ b/src/app/pages/sensor-setting/sensor-setting-page.module.ts @@ -2,12 +2,12 @@ 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 'app/packages/sensor/sensor.module'; +import { SensorModule } from 'packages/sensor/sensor.module'; import { MaterialModule } from 'app/commons/ui/material/material.module'; import { FormsModule } from '@angular/forms'; -import { DiscoverySettingComponent } from 'app/packages/sensor/component/setting/setting.component'; +import { DiscoverySettingComponent } from 'packages/sensor/component/setting/setting.component'; diff --git a/src/app/pages/target/target-page.module.ts b/src/app/pages/target/target-page.module.ts index 12db881..97d94dc 100644 --- a/src/app/pages/target/target-page.module.ts +++ b/src/app/pages/target/target-page.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; 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 'app/packages/target/target.module'; +import { TargetModule } from 'packages/target/target.module'; import { SubMenubarModule } from 'app/commons/component/sub-menubar/sub-menubar.module'; @NgModule({ diff --git a/src/app/pages/targets/targets-page-routing.module.ts b/src/app/pages/targets/targets-page-routing.module.ts index 12cef22..ecc2dd4 100644 --- a/src/app/pages/targets/targets-page-routing.module.ts +++ b/src/app/pages/targets/targets-page-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { ListComponent as ProbeListComponent } from 'app/packages/probe/component/list/list.component'; +import { ListComponent as ProbeListComponent } from 'packages/probe/component/list/list.component'; import { TargetsPageComponent } from 'app/pages/targets/targets-page.component'; const routes: Routes = [ diff --git a/src/app/pages/targets/targets-page.module.ts b/src/app/pages/targets/targets-page.module.ts index 2f572ff..99f65d9 100644 --- a/src/app/pages/targets/targets-page.module.ts +++ b/src/app/pages/targets/targets-page.module.ts @@ -3,7 +3,7 @@ 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 'app/packages/target/target.module'; +import { TargetModule } from 'packages/target/target.module'; import { TargetsPageRoutingModule } from 'app/pages/targets/targets-page-routing.module'; @NgModule({ diff --git a/src/app/packages/discovery/component/setting/setting.component.html b/src/packages/discovery/component/setting/setting.component.html similarity index 100% rename from src/app/packages/discovery/component/setting/setting.component.html rename to src/packages/discovery/component/setting/setting.component.html diff --git a/src/app/packages/discovery/component/setting/setting.component.scss b/src/packages/discovery/component/setting/setting.component.scss similarity index 100% rename from src/app/packages/discovery/component/setting/setting.component.scss rename to src/packages/discovery/component/setting/setting.component.scss diff --git a/src/app/packages/discovery/component/setting/setting.component.spec.ts b/src/packages/discovery/component/setting/setting.component.spec.ts similarity index 100% rename from src/app/packages/discovery/component/setting/setting.component.spec.ts rename to src/packages/discovery/component/setting/setting.component.spec.ts diff --git a/src/app/packages/discovery/component/setting/setting.component.ts b/src/packages/discovery/component/setting/setting.component.ts similarity index 100% rename from src/app/packages/discovery/component/setting/setting.component.ts rename to src/packages/discovery/component/setting/setting.component.ts diff --git a/src/app/packages/discovery/discovery.module.ts b/src/packages/discovery/discovery.module.ts similarity index 76% rename from src/app/packages/discovery/discovery.module.ts rename to src/packages/discovery/discovery.module.ts index ee6a259..f578baa 100644 --- a/src/app/packages/discovery/discovery.module.ts +++ b/src/packages/discovery/discovery.module.ts @@ -4,16 +4,16 @@ import { CommonModule } from '@angular/common'; import { SettingComponent } from './component/setting/setting.component'; import { MaterialModule } from 'app/commons/ui/material/material.module'; +export const COMPONENTS = [ + SettingComponent, +]; + @NgModule({ imports: [ CommonModule, MaterialModule ], - declarations: [ - SettingComponent, - ], - exports: [ - SettingComponent, - ] + declarations: COMPONENTS, + exports: COMPONENTS, }) export class DiscoveryModule { } diff --git a/src/app/packages/infra/component/map/map.component.html b/src/packages/infra/component/map/map.component.html similarity index 100% rename from src/app/packages/infra/component/map/map.component.html rename to src/packages/infra/component/map/map.component.html diff --git a/src/app/packages/infra/component/map/map.component.scss b/src/packages/infra/component/map/map.component.scss similarity index 100% rename from src/app/packages/infra/component/map/map.component.scss rename to src/packages/infra/component/map/map.component.scss diff --git a/src/app/packages/infra/component/map/map.component.spec.ts b/src/packages/infra/component/map/map.component.spec.ts similarity index 100% rename from src/app/packages/infra/component/map/map.component.spec.ts rename to src/packages/infra/component/map/map.component.spec.ts diff --git a/src/app/packages/infra/component/map/map.component.ts b/src/packages/infra/component/map/map.component.ts similarity index 100% rename from src/app/packages/infra/component/map/map.component.ts rename to src/packages/infra/component/map/map.component.ts diff --git a/src/app/packages/infra/infra.module.ts b/src/packages/infra/infra.module.ts similarity index 76% rename from src/app/packages/infra/infra.module.ts rename to src/packages/infra/infra.module.ts index b14010b..b6bf749 100644 --- a/src/app/packages/infra/infra.module.ts +++ b/src/packages/infra/infra.module.ts @@ -1,19 +1,20 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MapComponent } from './component/map/map.component'; import { MaterialModule } from 'app/commons/ui/material/material.module'; +import { MapComponent } from './component/map/map.component'; + +export const COMPONENTS = [ + MapComponent, +]; + @NgModule({ imports: [ CommonModule, MaterialModule ], - declarations: [ - MapComponent, - ], - exports: [ - MapComponent, - ] + declarations: COMPONENTS, + exports: COMPONENTS, }) export class InfraModule { } diff --git a/src/app/packages/member/component/modify/modify.component.html b/src/packages/member/component/modify/modify.component.html similarity index 100% rename from src/app/packages/member/component/modify/modify.component.html rename to src/packages/member/component/modify/modify.component.html diff --git a/src/app/packages/member/component/modify/modify.component.scss b/src/packages/member/component/modify/modify.component.scss similarity index 100% rename from src/app/packages/member/component/modify/modify.component.scss rename to src/packages/member/component/modify/modify.component.scss diff --git a/src/app/packages/member/component/modify/modify.component.spec.ts b/src/packages/member/component/modify/modify.component.spec.ts similarity index 100% rename from src/app/packages/member/component/modify/modify.component.spec.ts rename to src/packages/member/component/modify/modify.component.spec.ts diff --git a/src/app/packages/member/component/modify/modify.component.ts b/src/packages/member/component/modify/modify.component.ts similarity index 100% rename from src/app/packages/member/component/modify/modify.component.ts rename to src/packages/member/component/modify/modify.component.ts diff --git a/src/app/packages/member/component/reset-password/reset-password.component.html b/src/packages/member/component/reset-password/reset-password.component.html similarity index 100% rename from src/app/packages/member/component/reset-password/reset-password.component.html rename to src/packages/member/component/reset-password/reset-password.component.html diff --git a/src/app/packages/member/component/reset-password/reset-password.component.scss b/src/packages/member/component/reset-password/reset-password.component.scss similarity index 100% rename from src/app/packages/member/component/reset-password/reset-password.component.scss rename to src/packages/member/component/reset-password/reset-password.component.scss diff --git a/src/app/packages/member/component/reset-password/reset-password.component.spec.ts b/src/packages/member/component/reset-password/reset-password.component.spec.ts similarity index 100% rename from src/app/packages/member/component/reset-password/reset-password.component.spec.ts rename to src/packages/member/component/reset-password/reset-password.component.spec.ts diff --git a/src/app/packages/member/component/reset-password/reset-password.component.ts b/src/packages/member/component/reset-password/reset-password.component.ts similarity index 100% rename from src/app/packages/member/component/reset-password/reset-password.component.ts rename to src/packages/member/component/reset-password/reset-password.component.ts diff --git a/src/app/packages/member/component/signin/signin.component.html b/src/packages/member/component/signin/signin.component.html similarity index 100% rename from src/app/packages/member/component/signin/signin.component.html rename to src/packages/member/component/signin/signin.component.html diff --git a/src/app/packages/member/component/signin/signin.component.scss b/src/packages/member/component/signin/signin.component.scss similarity index 100% rename from src/app/packages/member/component/signin/signin.component.scss rename to src/packages/member/component/signin/signin.component.scss diff --git a/src/app/packages/member/component/signin/signin.component.spec.ts b/src/packages/member/component/signin/signin.component.spec.ts similarity index 100% rename from src/app/packages/member/component/signin/signin.component.spec.ts rename to src/packages/member/component/signin/signin.component.spec.ts diff --git a/src/app/packages/member/component/signin/signin.component.ts b/src/packages/member/component/signin/signin.component.ts similarity index 100% rename from src/app/packages/member/component/signin/signin.component.ts rename to src/packages/member/component/signin/signin.component.ts diff --git a/src/app/packages/member/component/signup/signup.component.html b/src/packages/member/component/signup/signup.component.html similarity index 100% rename from src/app/packages/member/component/signup/signup.component.html rename to src/packages/member/component/signup/signup.component.html diff --git a/src/app/packages/member/component/signup/signup.component.scss b/src/packages/member/component/signup/signup.component.scss similarity index 100% rename from src/app/packages/member/component/signup/signup.component.scss rename to src/packages/member/component/signup/signup.component.scss diff --git a/src/app/packages/member/component/signup/signup.component.spec.ts b/src/packages/member/component/signup/signup.component.spec.ts similarity index 100% rename from src/app/packages/member/component/signup/signup.component.spec.ts rename to src/packages/member/component/signup/signup.component.spec.ts diff --git a/src/app/packages/member/component/signup/signup.component.ts b/src/packages/member/component/signup/signup.component.ts similarity index 100% rename from src/app/packages/member/component/signup/signup.component.ts rename to src/packages/member/component/signup/signup.component.ts diff --git a/src/app/packages/member/guard/auth.guard.spec.ts b/src/packages/member/guard/auth.guard.spec.ts similarity index 100% rename from src/app/packages/member/guard/auth.guard.spec.ts rename to src/packages/member/guard/auth.guard.spec.ts diff --git a/src/app/packages/member/guard/auth.guard.ts b/src/packages/member/guard/auth.guard.ts similarity index 100% rename from src/app/packages/member/guard/auth.guard.ts rename to src/packages/member/guard/auth.guard.ts diff --git a/src/app/packages/member/member-store.module.ts b/src/packages/member/member-store.module.ts similarity index 100% rename from src/app/packages/member/member-store.module.ts rename to src/packages/member/member-store.module.ts diff --git a/src/app/packages/member/member.constant.ts b/src/packages/member/member.constant.ts similarity index 100% rename from src/app/packages/member/member.constant.ts rename to src/packages/member/member.constant.ts diff --git a/src/app/packages/member/member.module.ts b/src/packages/member/member.module.ts similarity index 100% rename from src/app/packages/member/member.module.ts rename to src/packages/member/member.module.ts diff --git a/src/app/packages/member/model/member.ts b/src/packages/member/model/member.ts similarity index 100% rename from src/app/packages/member/model/member.ts rename to src/packages/member/model/member.ts diff --git a/src/app/packages/member/service/member.service.spec.ts b/src/packages/member/service/member.service.spec.ts similarity index 100% rename from src/app/packages/member/service/member.service.spec.ts rename to src/packages/member/service/member.service.spec.ts diff --git a/src/app/packages/member/service/member.service.ts b/src/packages/member/service/member.service.ts similarity index 100% rename from src/app/packages/member/service/member.service.ts rename to src/packages/member/service/member.service.ts diff --git a/src/app/packages/member/store/auth/auth.action.ts b/src/packages/member/store/auth/auth.action.ts similarity index 100% rename from src/app/packages/member/store/auth/auth.action.ts rename to src/packages/member/store/auth/auth.action.ts diff --git a/src/app/packages/member/store/auth/auth.effect.spec.ts b/src/packages/member/store/auth/auth.effect.spec.ts similarity index 100% rename from src/app/packages/member/store/auth/auth.effect.spec.ts rename to src/packages/member/store/auth/auth.effect.spec.ts diff --git a/src/app/packages/member/store/auth/auth.effect.ts b/src/packages/member/store/auth/auth.effect.ts similarity index 100% rename from src/app/packages/member/store/auth/auth.effect.ts rename to src/packages/member/store/auth/auth.effect.ts diff --git a/src/app/packages/member/store/auth/auth.reducer.ts b/src/packages/member/store/auth/auth.reducer.ts similarity index 100% rename from src/app/packages/member/store/auth/auth.reducer.ts rename to src/packages/member/store/auth/auth.reducer.ts diff --git a/src/app/packages/member/store/auth/auth.state.ts b/src/packages/member/store/auth/auth.state.ts similarity index 100% rename from src/app/packages/member/store/auth/auth.state.ts rename to src/packages/member/store/auth/auth.state.ts diff --git a/src/app/packages/member/store/auth/index.ts b/src/packages/member/store/auth/index.ts similarity index 100% rename from src/app/packages/member/store/auth/index.ts rename to src/packages/member/store/auth/index.ts diff --git a/src/app/packages/member/store/effect.ts b/src/packages/member/store/effect.ts similarity index 100% rename from src/app/packages/member/store/effect.ts rename to src/packages/member/store/effect.ts diff --git a/src/app/packages/member/store/reducer.ts b/src/packages/member/store/reducer.ts similarity index 100% rename from src/app/packages/member/store/reducer.ts rename to src/packages/member/store/reducer.ts diff --git a/src/app/packages/member/store/signup/index.ts b/src/packages/member/store/signup/index.ts similarity index 100% rename from src/app/packages/member/store/signup/index.ts rename to src/packages/member/store/signup/index.ts diff --git a/src/app/packages/member/store/signup/signup.action.ts b/src/packages/member/store/signup/signup.action.ts similarity index 100% rename from src/app/packages/member/store/signup/signup.action.ts rename to src/packages/member/store/signup/signup.action.ts diff --git a/src/app/packages/member/store/signup/signup.effect.spec.ts b/src/packages/member/store/signup/signup.effect.spec.ts similarity index 100% rename from src/app/packages/member/store/signup/signup.effect.spec.ts rename to src/packages/member/store/signup/signup.effect.spec.ts diff --git a/src/app/packages/member/store/signup/signup.effect.ts b/src/packages/member/store/signup/signup.effect.ts similarity index 100% rename from src/app/packages/member/store/signup/signup.effect.ts rename to src/packages/member/store/signup/signup.effect.ts diff --git a/src/app/packages/member/store/signup/signup.reducer.ts b/src/packages/member/store/signup/signup.reducer.ts similarity index 100% rename from src/app/packages/member/store/signup/signup.reducer.ts rename to src/packages/member/store/signup/signup.reducer.ts diff --git a/src/app/packages/member/store/signup/signup.state.ts b/src/packages/member/store/signup/signup.state.ts similarity index 100% rename from src/app/packages/member/store/signup/signup.state.ts rename to src/packages/member/store/signup/signup.state.ts diff --git a/src/app/packages/member/store/state.ts b/src/packages/member/store/state.ts similarity index 100% rename from src/app/packages/member/store/state.ts rename to src/packages/member/store/state.ts diff --git a/src/app/packages/noauth/component/list/list.component.html b/src/packages/noauth/component/list/list.component.html similarity index 100% rename from src/app/packages/noauth/component/list/list.component.html rename to src/packages/noauth/component/list/list.component.html diff --git a/src/app/packages/noauth/component/list/list.component.scss b/src/packages/noauth/component/list/list.component.scss similarity index 100% rename from src/app/packages/noauth/component/list/list.component.scss rename to src/packages/noauth/component/list/list.component.scss diff --git a/src/app/packages/noauth/component/list/list.component.spec.ts b/src/packages/noauth/component/list/list.component.spec.ts similarity index 100% rename from src/app/packages/noauth/component/list/list.component.spec.ts rename to src/packages/noauth/component/list/list.component.spec.ts diff --git a/src/app/packages/noauth/component/list/list.component.ts b/src/packages/noauth/component/list/list.component.ts similarity index 100% rename from src/app/packages/noauth/component/list/list.component.ts rename to src/packages/noauth/component/list/list.component.ts diff --git a/src/app/packages/noauth/noauth.module.ts b/src/packages/noauth/noauth.module.ts similarity index 50% rename from src/app/packages/noauth/noauth.module.ts rename to src/packages/noauth/noauth.module.ts index 58a0e20..25fc428 100644 --- a/src/app/packages/noauth/noauth.module.ts +++ b/src/packages/noauth/noauth.module.ts @@ -1,13 +1,17 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ListComponent } from 'app/packages/noauth/component/list/list.component'; + +import { ListComponent } from './component/list/list.component'; + +export const COMPONENTS = [ + ListComponent, +]; @NgModule({ imports: [ CommonModule ], - declarations: [ - ListComponent - ] + declarations: COMPONENTS, + exports: COMPONENTS, }) export class NoauthModule { } diff --git a/src/app/packages/notification/notification.component.html b/src/packages/notification/component/notification/notification.component.html similarity index 100% rename from src/app/packages/notification/notification.component.html rename to src/packages/notification/component/notification/notification.component.html diff --git a/src/app/packages/notification/notification.component.scss b/src/packages/notification/component/notification/notification.component.scss similarity index 100% rename from src/app/packages/notification/notification.component.scss rename to src/packages/notification/component/notification/notification.component.scss diff --git a/src/app/packages/notification/notification.component.spec.ts b/src/packages/notification/component/notification/notification.component.spec.ts similarity index 100% rename from src/app/packages/notification/notification.component.spec.ts rename to src/packages/notification/component/notification/notification.component.spec.ts diff --git a/src/app/packages/notification/notification.component.ts b/src/packages/notification/component/notification/notification.component.ts similarity index 100% rename from src/app/packages/notification/notification.component.ts rename to src/packages/notification/component/notification/notification.component.ts diff --git a/src/packages/notification/notification.module.ts b/src/packages/notification/notification.module.ts new file mode 100644 index 0000000..6e4319a --- /dev/null +++ b/src/packages/notification/notification.module.ts @@ -0,0 +1,25 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { + PerfectScrollbarModule, +} from 'ngx-perfect-scrollbar'; + +import { MaterialModule } from 'app/commons/ui/material/material.module'; + +import { NotificationComponent } from './component/notification/notification.component'; + +export const COMPONENTS = [ + NotificationComponent, +]; + + +@NgModule({ + imports: [ + CommonModule, + PerfectScrollbarModule, + MaterialModule, + ], + declarations: COMPONENTS, + exports: COMPONENTS, +}) +export class NotificationModule { } diff --git a/src/app/packages/probe/component/detail/detail.component.html b/src/packages/probe/component/detail/detail.component.html similarity index 100% rename from src/app/packages/probe/component/detail/detail.component.html rename to src/packages/probe/component/detail/detail.component.html diff --git a/src/app/packages/probe/component/detail/detail.component.scss b/src/packages/probe/component/detail/detail.component.scss similarity index 100% rename from src/app/packages/probe/component/detail/detail.component.scss rename to src/packages/probe/component/detail/detail.component.scss diff --git a/src/app/packages/probe/component/detail/detail.component.spec.ts b/src/packages/probe/component/detail/detail.component.spec.ts similarity index 100% rename from src/app/packages/probe/component/detail/detail.component.spec.ts rename to src/packages/probe/component/detail/detail.component.spec.ts diff --git a/src/app/packages/probe/component/detail/detail.component.ts b/src/packages/probe/component/detail/detail.component.ts similarity index 100% rename from src/app/packages/probe/component/detail/detail.component.ts rename to src/packages/probe/component/detail/detail.component.ts diff --git a/src/app/packages/probe/component/download/download.component.html b/src/packages/probe/component/download/download.component.html similarity index 100% rename from src/app/packages/probe/component/download/download.component.html rename to src/packages/probe/component/download/download.component.html diff --git a/src/app/packages/probe/component/download/download.component.scss b/src/packages/probe/component/download/download.component.scss similarity index 100% rename from src/app/packages/probe/component/download/download.component.scss rename to src/packages/probe/component/download/download.component.scss diff --git a/src/app/packages/probe/component/download/download.component.spec.ts b/src/packages/probe/component/download/download.component.spec.ts similarity index 100% rename from src/app/packages/probe/component/download/download.component.spec.ts rename to src/packages/probe/component/download/download.component.spec.ts diff --git a/src/app/packages/probe/component/download/download.component.ts b/src/packages/probe/component/download/download.component.ts similarity index 100% rename from src/app/packages/probe/component/download/download.component.ts rename to src/packages/probe/component/download/download.component.ts diff --git a/src/app/packages/probe/component/list/list.component.html b/src/packages/probe/component/list/list.component.html similarity index 100% rename from src/app/packages/probe/component/list/list.component.html rename to src/packages/probe/component/list/list.component.html diff --git a/src/app/packages/probe/component/list/list.component.scss b/src/packages/probe/component/list/list.component.scss similarity index 100% rename from src/app/packages/probe/component/list/list.component.scss rename to src/packages/probe/component/list/list.component.scss diff --git a/src/app/packages/probe/component/list/list.component.spec.ts b/src/packages/probe/component/list/list.component.spec.ts similarity index 100% rename from src/app/packages/probe/component/list/list.component.spec.ts rename to src/packages/probe/component/list/list.component.spec.ts diff --git a/src/app/packages/probe/component/list/list.component.ts b/src/packages/probe/component/list/list.component.ts similarity index 100% rename from src/app/packages/probe/component/list/list.component.ts rename to src/packages/probe/component/list/list.component.ts diff --git a/src/app/packages/probe/probe.module.ts b/src/packages/probe/probe.module.ts similarity index 51% rename from src/app/packages/probe/probe.module.ts rename to src/packages/probe/probe.module.ts index 18bd017..0466f63 100644 --- a/src/app/packages/probe/probe.module.ts +++ b/src/packages/probe/probe.module.ts @@ -1,10 +1,17 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ListComponent } from 'app/packages/probe/component/list/list.component'; -import { DownloadComponent } from 'app/packages/probe/component/download/download.component'; import { MaterialModule } from 'app/commons/ui/material/material.module'; import { InfoTableModule } from 'app/commons/component/info-table/info-table.module'; -import { DetailComponent } from 'app/packages/probe/component/detail/detail.component'; + +import { DetailComponent } from './component/detail/detail.component'; +import { ListComponent } from './component/list/list.component'; +import { DownloadComponent } from './component/download/download.component'; + +export const COMPONENTS = [ + ListComponent, + DetailComponent, + DownloadComponent, +]; @NgModule({ imports: [ @@ -12,10 +19,7 @@ import { DetailComponent } from 'app/packages/probe/component/detail/detail.comp MaterialModule, InfoTableModule, ], - declarations: [ - ListComponent, - DownloadComponent, - DetailComponent, - ], + declarations: COMPONENTS, + exports: COMPONENTS, }) export class ProbeModule { } diff --git a/src/app/packages/sensor-item/component/list/list.component.html b/src/packages/sensor-item/component/list/list.component.html similarity index 100% rename from src/app/packages/sensor-item/component/list/list.component.html rename to src/packages/sensor-item/component/list/list.component.html diff --git a/src/app/packages/sensor-item/component/list/list.component.scss b/src/packages/sensor-item/component/list/list.component.scss similarity index 100% rename from src/app/packages/sensor-item/component/list/list.component.scss rename to src/packages/sensor-item/component/list/list.component.scss diff --git a/src/app/packages/sensor-item/component/list/list.component.spec.ts b/src/packages/sensor-item/component/list/list.component.spec.ts similarity index 100% rename from src/app/packages/sensor-item/component/list/list.component.spec.ts rename to src/packages/sensor-item/component/list/list.component.spec.ts diff --git a/src/app/packages/sensor-item/component/list/list.component.ts b/src/packages/sensor-item/component/list/list.component.ts similarity index 100% rename from src/app/packages/sensor-item/component/list/list.component.ts rename to src/packages/sensor-item/component/list/list.component.ts diff --git a/src/app/packages/sensor-item/sensor-item.module.ts b/src/packages/sensor-item/sensor-item.module.ts similarity index 77% rename from src/app/packages/sensor-item/sensor-item.module.ts rename to src/packages/sensor-item/sensor-item.module.ts index 071b7c6..d235669 100644 --- a/src/app/packages/sensor-item/sensor-item.module.ts +++ b/src/packages/sensor-item/sensor-item.module.ts @@ -3,17 +3,17 @@ import { CommonModule } from '@angular/common'; import { MaterialModule } from 'app/commons/ui/material/material.module'; import { ListComponent } from './component/list/list.component'; +export const COMPONENTS = [ + ListComponent, +]; + @NgModule({ imports: [ CommonModule, MaterialModule, ], - declarations: [ - ListComponent - ], - exports: [ - ListComponent - ] + declarations: COMPONENTS, + exports: COMPONENTS, }) export class SensorItemModule { } diff --git a/src/app/packages/sensor/component/setting-result/setting-result.component.html b/src/packages/sensor/component/setting-result/setting-result.component.html similarity index 100% rename from src/app/packages/sensor/component/setting-result/setting-result.component.html rename to src/packages/sensor/component/setting-result/setting-result.component.html diff --git a/src/app/packages/sensor/component/setting-result/setting-result.component.scss b/src/packages/sensor/component/setting-result/setting-result.component.scss similarity index 100% rename from src/app/packages/sensor/component/setting-result/setting-result.component.scss rename to src/packages/sensor/component/setting-result/setting-result.component.scss diff --git a/src/app/packages/sensor/component/setting-result/setting-result.component.spec.ts b/src/packages/sensor/component/setting-result/setting-result.component.spec.ts similarity index 100% rename from src/app/packages/sensor/component/setting-result/setting-result.component.spec.ts rename to src/packages/sensor/component/setting-result/setting-result.component.spec.ts diff --git a/src/app/packages/sensor/component/setting-result/setting-result.component.ts b/src/packages/sensor/component/setting-result/setting-result.component.ts similarity index 100% rename from src/app/packages/sensor/component/setting-result/setting-result.component.ts rename to src/packages/sensor/component/setting-result/setting-result.component.ts diff --git a/src/app/packages/sensor/component/setting/setting.component.html b/src/packages/sensor/component/setting/setting.component.html similarity index 100% rename from src/app/packages/sensor/component/setting/setting.component.html rename to src/packages/sensor/component/setting/setting.component.html diff --git a/src/app/packages/sensor/component/setting/setting.component.scss b/src/packages/sensor/component/setting/setting.component.scss similarity index 100% rename from src/app/packages/sensor/component/setting/setting.component.scss rename to src/packages/sensor/component/setting/setting.component.scss diff --git a/src/app/packages/sensor/component/setting/setting.component.spec.ts b/src/packages/sensor/component/setting/setting.component.spec.ts similarity index 100% rename from src/app/packages/sensor/component/setting/setting.component.spec.ts rename to src/packages/sensor/component/setting/setting.component.spec.ts diff --git a/src/app/packages/sensor/component/setting/setting.component.ts b/src/packages/sensor/component/setting/setting.component.ts similarity index 100% rename from src/app/packages/sensor/component/setting/setting.component.ts rename to src/packages/sensor/component/setting/setting.component.ts diff --git a/src/packages/sensor/sensor.module.ts b/src/packages/sensor/sensor.module.ts new file mode 100644 index 0000000..80b9ca6 --- /dev/null +++ b/src/packages/sensor/sensor.module.ts @@ -0,0 +1,24 @@ +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 { DiscoverySettingComponent } from './component/setting/setting.component'; +import { SettingResultComponent } from './component/setting-result/setting-result.component'; + +export const COMPONENTS = [ + DiscoverySettingComponent, + SettingResultComponent, +]; + +@NgModule({ + imports: [ + CommonModule, + MaterialModule, + FormsModule + ], + declarations: COMPONENTS, + exports: COMPONENTS, +}) +export class SensorModule { } diff --git a/src/app/packages/target/component/detail/detail.component.html b/src/packages/target/component/detail/detail.component.html similarity index 100% rename from src/app/packages/target/component/detail/detail.component.html rename to src/packages/target/component/detail/detail.component.html diff --git a/src/app/packages/target/component/detail/detail.component.scss b/src/packages/target/component/detail/detail.component.scss similarity index 100% rename from src/app/packages/target/component/detail/detail.component.scss rename to src/packages/target/component/detail/detail.component.scss diff --git a/src/app/packages/target/component/detail/detail.component.spec.ts b/src/packages/target/component/detail/detail.component.spec.ts similarity index 100% rename from src/app/packages/target/component/detail/detail.component.spec.ts rename to src/packages/target/component/detail/detail.component.spec.ts diff --git a/src/app/packages/target/component/detail/detail.component.ts b/src/packages/target/component/detail/detail.component.ts similarity index 100% rename from src/app/packages/target/component/detail/detail.component.ts rename to src/packages/target/component/detail/detail.component.ts diff --git a/src/app/packages/target/component/list/list.component.html b/src/packages/target/component/list/list.component.html similarity index 100% rename from src/app/packages/target/component/list/list.component.html rename to src/packages/target/component/list/list.component.html diff --git a/src/app/packages/target/component/list/list.component.scss b/src/packages/target/component/list/list.component.scss similarity index 100% rename from src/app/packages/target/component/list/list.component.scss rename to src/packages/target/component/list/list.component.scss diff --git a/src/app/packages/target/component/list/list.component.spec.ts b/src/packages/target/component/list/list.component.spec.ts similarity index 100% rename from src/app/packages/target/component/list/list.component.spec.ts rename to src/packages/target/component/list/list.component.spec.ts diff --git a/src/app/packages/target/component/list/list.component.ts b/src/packages/target/component/list/list.component.ts similarity index 100% rename from src/app/packages/target/component/list/list.component.ts rename to src/packages/target/component/list/list.component.ts diff --git a/src/app/packages/target/target.module.ts b/src/packages/target/target.module.ts similarity index 70% rename from src/app/packages/target/target.module.ts rename to src/packages/target/target.module.ts index 167469b..a32a102 100644 --- a/src/app/packages/target/target.module.ts +++ b/src/packages/target/target.module.ts @@ -1,20 +1,23 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ListComponent } from 'app/packages/target/component/list/list.component'; import { MaterialModule } from 'app/commons/ui/material/material.module'; -import { DetailComponent } from './component/detail/detail.component'; import { InfoTableModule } from 'app/commons/component/info-table/info-table.module'; +import { DetailComponent } from './component/detail/detail.component'; +import { ListComponent } from './component/list/list.component'; + +export const COMPONENTS = [ + ListComponent, + DetailComponent, +]; + @NgModule({ imports: [ CommonModule, MaterialModule, InfoTableModule ], - declarations: [ListComponent, DetailComponent], - exports: [ - ListComponent, - DetailComponent - ] + declarations: COMPONENTS, + exports: COMPONENTS, }) export class TargetModule { }