fixed infra page

This commit is contained in:
snoop 2018-01-30 18:27:48 +09:00
parent ef3e6a2e27
commit 3b6532c662
11 changed files with 88 additions and 59 deletions

View File

@ -7,7 +7,7 @@ import {
MatToolbarModule, MatSnackBarModule, MatSidenavModule, MatToolbarModule, MatSnackBarModule, MatSidenavModule,
MatTabsModule, MatSelectModule, MatRadioModule, MatTabsModule, MatSelectModule, MatRadioModule,
MatAutocompleteModule, MatFormFieldModule, MatChipsModule, MatAutocompleteModule, MatFormFieldModule, MatChipsModule,
MatDialogModule, MatDialogModule, MatGridListModule
} from '@angular/material'; } from '@angular/material';
const MATERIAL_MODULES: any[] = [ const MATERIAL_MODULES: any[] = [
@ -17,7 +17,7 @@ const MATERIAL_MODULES: any[] = [
MatToolbarModule, MatSnackBarModule, MatSidenavModule, MatToolbarModule, MatSnackBarModule, MatSidenavModule,
MatTabsModule, MatSelectModule, MatRadioModule, MatTabsModule, MatSelectModule, MatRadioModule,
MatAutocompleteModule, MatFormFieldModule, MatChipsModule, MatAutocompleteModule, MatFormFieldModule, MatChipsModule,
MatDialogModule, MatDialogModule, MatGridListModule
]; ];
@NgModule({ @NgModule({

View File

@ -1,11 +1,11 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { DiscoveryComponent } from './discovery.component'; import { DiscoveryPageComponent } from './discovery-page.component';
const routes: Routes = [ const routes: Routes = [
{ {
path: '', path: '',
component: DiscoveryComponent, component: DiscoveryPageComponent,
} }
]; ];
@ -13,4 +13,5 @@ const routes: Routes = [
imports: [RouterModule.forChild(routes)], imports: [RouterModule.forChild(routes)],
exports: [RouterModule] exports: [RouterModule]
}) })
export class DiscoveryRoutingModule { }
export class DiscoveryPageRoutingModule { }

View File

@ -1,5 +1,5 @@
<p> <p>
discovery works! discovery-page works!
</p> </p>
<of-setting></of-setting> <of-setting></of-setting>

View File

@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { DiscoveryComponent } from './discovery.component'; import { DiscoveryPageComponent } from './discovery-page.component';
describe('DiscoveryComponent', () => { describe('DiscoveryPageComponent', () => {
let component: DiscoveryComponent; let component: DiscoveryPageComponent;
let fixture: ComponentFixture<DiscoveryComponent>; let fixture: ComponentFixture<DiscoveryPageComponent>;
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ DiscoveryComponent ] declarations: [ DiscoveryPageComponent ]
}) })
.compileComponents(); .compileComponents();
})); }));
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(DiscoveryComponent); fixture = TestBed.createComponent(DiscoveryPageComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });

View File

@ -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() {
}
}

View File

@ -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 { }

View File

@ -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() {
}
}

View File

@ -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 { }

View File

@ -7,17 +7,51 @@
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<p> <mat-grid-list cols="2" rowHeight="5:1">
The Shiba Inu is the smallest of the six original and distinct spitz breeds of dog from Japan. <mat-grid-tile>Host</mat-grid-tile>
A small, agile dog that copes very well with mountainous terrain, the Shiba Inu was originally <mat-grid-tile>192.168.1.162</mat-grid-tile>
bred for hunting. </mat-grid-list>
</p> <mat-grid-list cols="2" rowHeight="5:1">
<mat-grid-tile>Service</mat-grid-tile>
<mat-grid-tile>FTP MySQL SMB</mat-grid-tile>
</mat-grid-list>
<mat-grid-list cols="2" rowHeight="5:1">
<mat-grid-tile>Sensor(2)</mat-grid-tile>
<mat-grid-tile>
MySQL SNMP
<button mat-button>Add Sensor</button>
</mat-grid-tile>
</mat-grid-list>
</mat-card-content> </mat-card-content>
<mat-card-actions> <!-- <mat-card-actions>
<button mat-button>LIKE</button> <button mat-button>LIKE</button>
<button mat-button>SHARE</button> <button mat-button>SHARE</button>
</mat-card-actions> </mat-card-actions> -->
</mat-card>
</mat-tab>
<mat-tab label="Host">
<mat-card class="example-card">
<mat-card-header>
<mat-card-title>Host - 192.168.1.106</mat-card-title>
<mat-card-subtitle>MySQL</mat-card-subtitle>
</mat-card-header>
<mat-card-content>
<mat-grid-list cols="2" rowHeight="5:1">
<mat-grid-tile>MySQL</mat-grid-tile>
<mat-grid-tile>Port : 3306 | TCP | TLS</mat-grid-tile>
</mat-grid-list>
<mat-grid-list cols="2" rowHeight="5:1">
<mat-grid-tile>Sensor</mat-grid-tile>
<mat-grid-tile>PostgreSQL
<button mat-button>Add Sensor</button>
</mat-grid-tile>
</mat-grid-list>
</mat-card-content>
<!-- <mat-card-actions>
<button mat-button>LIKE</button>
<button mat-button>SHARE</button>
</mat-card-actions> -->
</mat-card> </mat-card>
</mat-tab> </mat-tab>
<mat-tab label="Host">Content 2</mat-tab>
</mat-tab-group> </mat-tab-group>

View File

@ -11,7 +11,7 @@ const routes: Routes = [
{ path: 'home', loadChildren: './home/home-page.module#HomePageModule' }, { path: 'home', loadChildren: './home/home-page.module#HomePageModule' },
{ path: 'probes', loadChildren: './probes/probes-page.module#ProbesPageModule' }, { 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' }, { path: 'map', loadChildren: './infra/infra-page.module#InfraPageModule' },
] ]
} }