From 3b6532c6620c61ec73ad458830a3c3a3f62a00ea Mon Sep 17 00:00:00 2001 From: snoop Date: Tue, 30 Jan 2018 18:27:48 +0900 Subject: [PATCH] fixed infra page --- .../commons/ui/material/material.module.ts | 4 +- ...le.ts => discovery-page-routing.module.ts} | 7 +-- ...ent.html => discovery-page.component.html} | 2 +- ...ent.scss => discovery-page.component.scss} | 0 ...ec.ts => discovery-page.component.spec.ts} | 12 ++--- .../discovery/discovery-page.component.ts | 15 ++++++ .../pages/discovery/discovery-page.module.ts | 17 +++++++ .../pages/discovery/discovery.component.ts | 15 ------ src/app/pages/discovery/discovery.module.ts | 23 --------- src/app/pages/infra/infra-page.component.html | 50 ++++++++++++++++--- src/app/pages/pages-routing.module.ts | 2 +- 11 files changed, 88 insertions(+), 59 deletions(-) rename src/app/pages/discovery/{discovery-routing.module.ts => discovery-page-routing.module.ts} (60%) rename src/app/pages/discovery/{discovery.component.html => discovery-page.component.html} (59%) rename src/app/pages/discovery/{discovery.component.scss => discovery-page.component.scss} (100%) rename src/app/pages/discovery/{discovery.component.spec.ts => discovery-page.component.spec.ts} (52%) create mode 100644 src/app/pages/discovery/discovery-page.component.ts create mode 100644 src/app/pages/discovery/discovery-page.module.ts delete mode 100644 src/app/pages/discovery/discovery.component.ts delete mode 100644 src/app/pages/discovery/discovery.module.ts diff --git a/src/app/commons/ui/material/material.module.ts b/src/app/commons/ui/material/material.module.ts index 22f6bfd..1659aa0 100644 --- a/src/app/commons/ui/material/material.module.ts +++ b/src/app/commons/ui/material/material.module.ts @@ -7,7 +7,7 @@ import { MatToolbarModule, MatSnackBarModule, MatSidenavModule, MatTabsModule, MatSelectModule, MatRadioModule, MatAutocompleteModule, MatFormFieldModule, MatChipsModule, - MatDialogModule, + MatDialogModule, MatGridListModule } from '@angular/material'; const MATERIAL_MODULES: any[] = [ @@ -17,7 +17,7 @@ const MATERIAL_MODULES: any[] = [ MatToolbarModule, MatSnackBarModule, MatSidenavModule, MatTabsModule, MatSelectModule, MatRadioModule, MatAutocompleteModule, MatFormFieldModule, MatChipsModule, - MatDialogModule, + MatDialogModule, MatGridListModule ]; @NgModule({ diff --git a/src/app/pages/discovery/discovery-routing.module.ts b/src/app/pages/discovery/discovery-page-routing.module.ts similarity index 60% rename from src/app/pages/discovery/discovery-routing.module.ts rename to src/app/pages/discovery/discovery-page-routing.module.ts index 4d35ef3..06e62d9 100644 --- a/src/app/pages/discovery/discovery-routing.module.ts +++ b/src/app/pages/discovery/discovery-page-routing.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { DiscoveryComponent } from './discovery.component'; +import { DiscoveryPageComponent } from './discovery-page.component'; const routes: Routes = [ { path: '', - component: DiscoveryComponent, + component: DiscoveryPageComponent, } ]; @@ -13,4 +13,5 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class DiscoveryRoutingModule { } + +export class DiscoveryPageRoutingModule { } diff --git a/src/app/pages/discovery/discovery.component.html b/src/app/pages/discovery/discovery-page.component.html similarity index 59% rename from src/app/pages/discovery/discovery.component.html rename to src/app/pages/discovery/discovery-page.component.html index c340618..09d9684 100644 --- a/src/app/pages/discovery/discovery.component.html +++ b/src/app/pages/discovery/discovery-page.component.html @@ -1,5 +1,5 @@

- discovery works! + discovery-page works!

\ No newline at end of file diff --git a/src/app/pages/discovery/discovery.component.scss b/src/app/pages/discovery/discovery-page.component.scss similarity index 100% rename from src/app/pages/discovery/discovery.component.scss rename to src/app/pages/discovery/discovery-page.component.scss diff --git a/src/app/pages/discovery/discovery.component.spec.ts b/src/app/pages/discovery/discovery-page.component.spec.ts similarity index 52% rename from src/app/pages/discovery/discovery.component.spec.ts rename to src/app/pages/discovery/discovery-page.component.spec.ts index 7a7d088..b9bd349 100644 --- a/src/app/pages/discovery/discovery.component.spec.ts +++ b/src/app/pages/discovery/discovery-page.component.spec.ts @@ -1,20 +1,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { DiscoveryComponent } from './discovery.component'; +import { DiscoveryPageComponent } from './discovery-page.component'; -describe('DiscoveryComponent', () => { - let component: DiscoveryComponent; - let fixture: ComponentFixture; +describe('DiscoveryPageComponent', () => { + let component: DiscoveryPageComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ DiscoveryComponent ] + declarations: [ DiscoveryPageComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(DiscoveryComponent); + fixture = TestBed.createComponent(DiscoveryPageComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/pages/discovery/discovery-page.component.ts b/src/app/pages/discovery/discovery-page.component.ts new file mode 100644 index 0000000..fe82733 --- /dev/null +++ b/src/app/pages/discovery/discovery-page.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'of-discovery-page', + templateUrl: './discovery-page.component.html', + styleUrls: ['./discovery-page.component.scss'] +}) +export class DiscoveryPageComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/pages/discovery/discovery-page.module.ts b/src/app/pages/discovery/discovery-page.module.ts new file mode 100644 index 0000000..354d4ea --- /dev/null +++ b/src/app/pages/discovery/discovery-page.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +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'; + +@NgModule({ + imports: [ + CommonModule, + DiscoveryPageRoutingModule, + DiscoveryModule + ], + declarations: [DiscoveryPageComponent] +}) +export class DiscoveryPageModule { } diff --git a/src/app/pages/discovery/discovery.component.ts b/src/app/pages/discovery/discovery.component.ts deleted file mode 100644 index 3820d71..0000000 --- a/src/app/pages/discovery/discovery.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'of-discovery', - templateUrl: './discovery.component.html', - styleUrls: ['./discovery.component.scss'] -}) -export class DiscoveryComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/pages/discovery/discovery.module.ts b/src/app/pages/discovery/discovery.module.ts deleted file mode 100644 index 9c78a4b..0000000 --- a/src/app/pages/discovery/discovery.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { DiscoveryComponent } from './discovery.component'; -import { DiscoveryRoutingModule } from './discovery-routing.module'; - -import { DiscoveryModule as DisModule } from '../../packages/discovery/discovery.module'; - -// import { MaterialModule } from 'app/commons/ui/material/material.module'; - -@NgModule({ - imports: [ - CommonModule, - DiscoveryRoutingModule, - DisModule, - // MaterialModule - ], - exports: [ - // MaterialModule - ], - declarations: [DiscoveryComponent] -}) -export class DiscoveryModule { } diff --git a/src/app/pages/infra/infra-page.component.html b/src/app/pages/infra/infra-page.component.html index 2cbe0e6..62da216 100644 --- a/src/app/pages/infra/infra-page.component.html +++ b/src/app/pages/infra/infra-page.component.html @@ -7,17 +7,51 @@ -

- The Shiba Inu is the smallest of the six original and distinct spitz breeds of dog from Japan. - A small, agile dog that copes very well with mountainous terrain, the Shiba Inu was originally - bred for hunting. -

+ + Host + 192.168.1.162 + + + Service + FTP MySQL SMB + + + Sensor(2) + + MySQL SNMP + + + - + + + + + + + Host - 192.168.1.106 + MySQL + + + + + MySQL + Port : 3306 | TCP | TLS + + + Sensor + PostgreSQL + + + + + - Content 2 \ No newline at end of file diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts index 05bb1c9..88ec4fc 100644 --- a/src/app/pages/pages-routing.module.ts +++ b/src/app/pages/pages-routing.module.ts @@ -11,7 +11,7 @@ const routes: Routes = [ { path: 'home', loadChildren: './home/home-page.module#HomePageModule' }, { path: 'probes', loadChildren: './probes/probes-page.module#ProbesPageModule' }, - { path: 'discovery', loadChildren: './discovery/discovery.module#DiscoveryModule' }, + { path: 'discovery', loadChildren: './discovery/discovery-page.module#DiscoveryPageModule' }, { path: 'map', loadChildren: './infra/infra-page.module#InfraPageModule' }, ] }