From a4f7ac810d4e83276940bed4a4af6dd3f710d366 Mon Sep 17 00:00:00 2001 From: crusader Date: Tue, 11 Sep 2018 17:04:22 +0900 Subject: [PATCH] ing --- @overflow/commons/d3-force/component/index.ts | 2 + @overflow/commons/d3-force/d3-force.module.ts | 20 ++++++++++ @overflow/commons/d3-force/directive/index.ts | 2 + @overflow/model/discovery/Host.ts | 14 +++++-- @overflow/model/discovery/Port.ts | 8 ++-- @overflow/model/discovery/Service.ts | 9 +++-- @overflow/model/discovery/Zone.ts | 4 +- src/assets/image/icon/icon_nas.svg | 39 +++++++++++++++++++ src/assets/image/icon/icon_printer.svg | 31 +++++++++++++++ 9 files changed, 115 insertions(+), 14 deletions(-) create mode 100644 @overflow/commons/d3-force/component/index.ts create mode 100644 @overflow/commons/d3-force/d3-force.module.ts create mode 100644 @overflow/commons/d3-force/directive/index.ts create mode 100644 src/assets/image/icon/icon_nas.svg create mode 100644 src/assets/image/icon/icon_printer.svg diff --git a/@overflow/commons/d3-force/component/index.ts b/@overflow/commons/d3-force/component/index.ts new file mode 100644 index 0000000..a9debd2 --- /dev/null +++ b/@overflow/commons/d3-force/component/index.ts @@ -0,0 +1,2 @@ +export const COMPONENTS = [ +]; diff --git a/@overflow/commons/d3-force/d3-force.module.ts b/@overflow/commons/d3-force/d3-force.module.ts new file mode 100644 index 0000000..356bbaf --- /dev/null +++ b/@overflow/commons/d3-force/d3-force.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { COMPONENTS } from './component'; +import { DIRECTIVES } from './directive'; + +@NgModule({ + imports: [ + CommonModule, + ], + exports: [ + COMPONENTS, + DIRECTIVES, + ], + declarations: [ + COMPONENTS, + DIRECTIVES, + ], +}) +export class D3ForceModule { } diff --git a/@overflow/commons/d3-force/directive/index.ts b/@overflow/commons/d3-force/directive/index.ts new file mode 100644 index 0000000..df4e638 --- /dev/null +++ b/@overflow/commons/d3-force/directive/index.ts @@ -0,0 +1,2 @@ +export const DIRECTIVES = [ +]; diff --git a/@overflow/model/discovery/Host.ts b/@overflow/model/discovery/Host.ts index 4c934f8..42050ad 100644 --- a/@overflow/model/discovery/Host.ts +++ b/@overflow/model/discovery/Host.ts @@ -7,11 +7,17 @@ export interface Host { name?: string; address?: string; mac?: string; - meta?: Map; + + osType?: string; + + deviceType?: string; + deviceVendor?: string; + deviceModel?: string; + + meta?: Map>; + discoveredBy?: string[]; + discoveredDate?: Date; zone?: Zone; portList?: Port[]; - - discoveredBy?: string; - discoveredDate?: Date; } diff --git a/@overflow/model/discovery/Port.ts b/@overflow/model/discovery/Port.ts index 6e676cd..bf85313 100644 --- a/@overflow/model/discovery/Port.ts +++ b/@overflow/model/discovery/Port.ts @@ -5,11 +5,11 @@ import { MetaPortType } from '../meta'; export interface Port { metaPortType?: MetaPortType; portNumber?: number; - meta?: Map; + + meta?: Map>; + discoveredBy?: string[]; + discoveredDate?: Date; host?: Host; serviceList?: Service[]; - - discoveredBy?: string; - discoveredDate?: Date; } diff --git a/@overflow/model/discovery/Service.ts b/@overflow/model/discovery/Service.ts index d353c03..d638de7 100644 --- a/@overflow/model/discovery/Service.ts +++ b/@overflow/model/discovery/Service.ts @@ -4,11 +4,12 @@ import { MetaCryptoType } from '../meta'; export interface Service { metaCryptoType?: MetaCryptoType; key?: string; + name?: string; description?: string; - meta?: Map; + + meta?: Map>; + discoveredBy?: string[]; + discoveredDate?: Date; port?: Port; - - discoveredBy?: string; - discoveredDate?: Date; } diff --git a/@overflow/model/discovery/Zone.ts b/@overflow/model/discovery/Zone.ts index 6fa988e..2e15c1e 100644 --- a/@overflow/model/discovery/Zone.ts +++ b/@overflow/model/discovery/Zone.ts @@ -7,8 +7,8 @@ export interface Zone { metaIPType?: MetaIPType; address?: string; mac?: string; - meta?: Map; - discoveredBy?: string; + meta?: Map>; + discoveredBy?: string[]; discoveredDate?: Date; } diff --git a/src/assets/image/icon/icon_nas.svg b/src/assets/image/icon/icon_nas.svg new file mode 100644 index 0000000..8d8712f --- /dev/null +++ b/src/assets/image/icon/icon_nas.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/image/icon/icon_printer.svg b/src/assets/image/icon/icon_printer.svg new file mode 100644 index 0000000..78f5d01 --- /dev/null +++ b/src/assets/image/icon/icon_printer.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + +