From a4f38ee99c76c3cfcd20b83103eb0053cf2e95b9 Mon Sep 17 00:00:00 2001 From: insanity Date: Mon, 19 Mar 2018 15:08:15 +0900 Subject: [PATCH] test --- src/app/pages/infra/infra-page.component.html | 2 +- src/app/pages/infra/infra-page.module.ts | 8 +- .../sensor-setting-page.component.html | 18 +-- .../component/setting/setting.component.html | 133 ++++++++++-------- .../component/setting/setting.component.ts | 5 + 5 files changed, 89 insertions(+), 77 deletions(-) diff --git a/src/app/pages/infra/infra-page.component.html b/src/app/pages/infra/infra-page.component.html index 465d468..5727206 100644 --- a/src/app/pages/infra/infra-page.component.html +++ b/src/app/pages/infra/infra-page.component.html @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/app/pages/infra/infra-page.module.ts b/src/app/pages/infra/infra-page.module.ts index 23547f4..c6a568d 100644 --- a/src/app/pages/infra/infra-page.module.ts +++ b/src/app/pages/infra/infra-page.module.ts @@ -1,23 +1,25 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { InfraPageComponent } from './infra-page.component'; import { InfraPageRoutingModule } from './infra-page-routing.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'; +import { InfraPageComponent } from './infra-page.component'; +import { DiscoveryModule } from 'packages/discovery/discovery.module'; @NgModule({ imports: [ CommonModule, InfraPageRoutingModule, MaterialModule, - InfraModule + InfraModule, + DiscoveryModule ], declarations: [ - InfraPageComponent + InfraPageComponent, ], entryComponents: [ DiscoverySettingComponent diff --git a/src/app/pages/sensor-setting/sensor-setting-page.component.html b/src/app/pages/sensor-setting/sensor-setting-page.component.html index 1183133..c1a506a 100644 --- a/src/app/pages/sensor-setting/sensor-setting-page.component.html +++ b/src/app/pages/sensor-setting/sensor-setting-page.component.html @@ -1,17 +1 @@ -
-
- -
-
- -
-
- - -스텝 순서를 바꿨으니 나중에 바꾸잡 - - -
- - -
\ No newline at end of file + \ No newline at end of file diff --git a/src/packages/sensor/component/setting/setting.component.html b/src/packages/sensor/component/setting/setting.component.html index 8288821..61ef2ca 100644 --- a/src/packages/sensor/component/setting/setting.component.html +++ b/src/packages/sensor/component/setting/setting.component.html @@ -1,65 +1,86 @@
-
+
+ +
+
- - - Step 1 - Select Target - - - 여기에 타겟들 출력 - - + + + Step 1 + Select Target + + + 여기에 타겟들 출력 + + - - - Step 3 - Crawler Auth - - -
- - - + + + Step 3 + Crawler Auth + + + + + + - - - -
- -
- -
-
+ + + +
+ +
+ +
+
+ +
+ +
+ + + + Step 2 + Select Crawler + + + + + {{crawler}} + + +
Your select crawler is: {{selectCrawler}}
+
+
+ + + + Step 4 + Select Sensor Item + + + 트리로 센서 아이템 목록 출력 + + + +
+
+ + +
+
+ +
+
+ + + 스텝 순서를 바꿨으니 나중에 바꾸잡 +
-
- - - Step 2 - Select Crawler - - - - - {{crawler}} - - -
Your select crawler is: {{selectCrawler}}
-
-
+
- - - Step 4 - Select Sensor Item - - - 트리로 센서 아이템 목록 출력 - - - -
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/packages/sensor/component/setting/setting.component.ts b/src/packages/sensor/component/setting/setting.component.ts index 14d667c..1a1f611 100644 --- a/src/packages/sensor/component/setting/setting.component.ts +++ b/src/packages/sensor/component/setting/setting.component.ts @@ -9,6 +9,8 @@ import { AfterContentInit } from '@angular/core/src/metadata/lifecycle_hooks'; }) export class SettingComponent implements OnInit, AfterContentInit { + step = 1; + constructor() { } selectCrawler: String; @@ -28,4 +30,7 @@ export class SettingComponent implements OnInit, AfterContentInit { this.crawlerList.push('PostgreSQL Crawler'); } + onNext() { + this.step += 1; + } }