From 8d74edbbe6e14751d832616a2259d31e1b6c1e03 Mon Sep 17 00:00:00 2001 From: insanity Date: Wed, 31 Jan 2018 18:55:31 +0900 Subject: [PATCH] test --- .../commons/ui/material/material.module.ts | 3 + .../component/detail/detail.component.html | 62 ++++++++++++++++++- .../component/detail/detail.component.ts | 2 +- src/app/pages/pages.module.ts | 4 +- src/app/pages/probe/probe-page.module.ts | 2 +- 5 files changed, 65 insertions(+), 8 deletions(-) diff --git a/src/app/commons/ui/material/material.module.ts b/src/app/commons/ui/material/material.module.ts index dd9e39d..42c817b 100644 --- a/src/app/commons/ui/material/material.module.ts +++ b/src/app/commons/ui/material/material.module.ts @@ -9,6 +9,7 @@ import { MatAutocompleteModule, MatFormFieldModule, MatChipsModule, MatDialogModule, MatGridListModule, MatTableModule, MatPaginatorModule } from '@angular/material'; +import { FlexLayoutModule } from '@angular/flex-layout'; const MATERIAL_MODULES: any[] = [ MatButtonModule, MatCardModule, MatIconModule, @@ -23,9 +24,11 @@ const MATERIAL_MODULES: any[] = [ @NgModule({ imports: [ MATERIAL_MODULES, + FlexLayoutModule ], exports: [ MATERIAL_MODULES, + FlexLayoutModule ], }) export class MaterialModule { } diff --git a/src/app/packages/probe/component/detail/detail.component.html b/src/app/packages/probe/component/detail/detail.component.html index 9a92530..017d230 100644 --- a/src/app/packages/probe/component/detail/detail.component.html +++ b/src/app/packages/probe/component/detail/detail.component.html @@ -1,3 +1,59 @@ -

- {{probeId}} detail -

+
{{probeId}}
+ + +
+ + +
+ Shiba Inu + Dog Breed +
+ +

+ 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. +

+
+ + + + +
+ + + +
+ Shiba Inu + Dog Breed +
+ +

+ 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. +

+
+ + + + +
+ + + +
+ Shiba Inu + Dog Breed +
+ +

+ 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. +

+
+ + + + +
+ +
\ No newline at end of file diff --git a/src/app/packages/probe/component/detail/detail.component.ts b/src/app/packages/probe/component/detail/detail.component.ts index 3878294..77e36e7 100644 --- a/src/app/packages/probe/component/detail/detail.component.ts +++ b/src/app/packages/probe/component/detail/detail.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; @Component({ - selector: 'of-detail', + selector: 'of-probe-detail', templateUrl: './detail.component.html', styleUrls: ['./detail.component.scss'] }) diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 5d49bc1..eeafeec 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -8,7 +8,6 @@ import { MaterialModule } from 'app/commons/ui/material/material.module'; import { HeaderComponent } from 'app/commons/layouts/header/header.component'; import { FooterComponent } from 'app/commons/layouts/footer/footer.component'; import { MenuItemComponent } from 'app/commons/layouts/menu-item/menu-item.component'; -import { FlexLayoutModule } from '@angular/flex-layout'; import { PerfectScrollbarModule, PERFECT_SCROLLBAR_CONFIG, @@ -28,7 +27,6 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { CovalentModule, MaterialModule, PerfectScrollbarModule, - FlexLayoutModule, ], declarations: [ PagesComponent, @@ -43,6 +41,6 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { provide: PERFECT_SCROLLBAR_CONFIG, useValue: DEFAULT_PERFECT_SCROLLBAR_CONFIG } - ] + ], }) export class PagesModule { } diff --git a/src/app/pages/probe/probe-page.module.ts b/src/app/pages/probe/probe-page.module.ts index 090453f..4a7ea08 100644 --- a/src/app/pages/probe/probe-page.module.ts +++ b/src/app/pages/probe/probe-page.module.ts @@ -12,7 +12,7 @@ import { SubMenubarModule } from 'app/commons/layouts/sub-menubar/sub-menubar.mo ProbesPageRoutingModule, MaterialModule, ProbeModule, - SubMenubarModule + SubMenubarModule, ], declarations: [ ProbePageComponent,