From 0836cf68af7df814dbf2c1875cfbfefc9ef1087c Mon Sep 17 00:00:00 2001 From: insanity Date: Thu, 1 Feb 2018 12:15:39 +0900 Subject: [PATCH] folder has changed layout to component --- .../{layouts => component}/footer/footer.component.html | 0 .../{layouts => component}/footer/footer.component.scss | 0 .../footer/footer.component.spec.ts | 0 .../{layouts => component}/footer/footer.component.ts | 0 .../{layouts => component}/header/header.component.html | 0 .../{layouts => component}/header/header.component.scss | 0 .../header/header.component.spec.ts | 0 .../{layouts => component}/header/header.component.ts | 0 .../{layouts => component}/header/toolbar.helpers.ts | 0 src/app/commons/{layouts => component}/layouts.module.ts | 0 .../menu-item/menu-item.component.html | 0 .../menu-item/menu-item.component.scss | 0 .../menu-item/menu-item.component.spec.ts | 0 .../menu-item/menu-item.component.ts | 0 .../{layouts => component}/sidebar/menu-element.ts | 0 .../{layouts => component}/sidebar/sidebar.component.html | 0 .../{layouts => component}/sidebar/sidebar.component.scss | 0 .../sidebar/sidebar.component.spec.ts | 0 .../{layouts => component}/sidebar/sidebar.component.ts | 0 .../sub-menubar/sub-menubar.component.html | 0 .../sub-menubar/sub-menubar.component.scss | 0 .../sub-menubar/sub-menubar.component.spec.ts | 0 .../sub-menubar/sub-menubar.component.ts | 0 .../sub-menubar/sub-menubar.module.ts | 2 +- src/app/pages/pages.module.ts | 8 ++++---- src/app/pages/probe/probe-page.module.ts | 2 +- src/app/pages/probes/probes-page.module.ts | 2 +- src/theme/theme.scss | 4 ++-- 28 files changed, 9 insertions(+), 9 deletions(-) rename src/app/commons/{layouts => component}/footer/footer.component.html (100%) rename src/app/commons/{layouts => component}/footer/footer.component.scss (100%) rename src/app/commons/{layouts => component}/footer/footer.component.spec.ts (100%) rename src/app/commons/{layouts => component}/footer/footer.component.ts (100%) rename src/app/commons/{layouts => component}/header/header.component.html (100%) rename src/app/commons/{layouts => component}/header/header.component.scss (100%) rename src/app/commons/{layouts => component}/header/header.component.spec.ts (100%) rename src/app/commons/{layouts => component}/header/header.component.ts (100%) rename src/app/commons/{layouts => component}/header/toolbar.helpers.ts (100%) rename src/app/commons/{layouts => component}/layouts.module.ts (100%) rename src/app/commons/{layouts => component}/menu-item/menu-item.component.html (100%) rename src/app/commons/{layouts => component}/menu-item/menu-item.component.scss (100%) rename src/app/commons/{layouts => component}/menu-item/menu-item.component.spec.ts (100%) rename src/app/commons/{layouts => component}/menu-item/menu-item.component.ts (100%) rename src/app/commons/{layouts => component}/sidebar/menu-element.ts (100%) rename src/app/commons/{layouts => component}/sidebar/sidebar.component.html (100%) rename src/app/commons/{layouts => component}/sidebar/sidebar.component.scss (100%) rename src/app/commons/{layouts => component}/sidebar/sidebar.component.spec.ts (100%) rename src/app/commons/{layouts => component}/sidebar/sidebar.component.ts (100%) rename src/app/commons/{layouts => component}/sub-menubar/sub-menubar.component.html (100%) rename src/app/commons/{layouts => component}/sub-menubar/sub-menubar.component.scss (100%) rename src/app/commons/{layouts => component}/sub-menubar/sub-menubar.component.spec.ts (100%) rename src/app/commons/{layouts => component}/sub-menubar/sub-menubar.component.ts (100%) rename src/app/commons/{layouts => component}/sub-menubar/sub-menubar.module.ts (81%) diff --git a/src/app/commons/layouts/footer/footer.component.html b/src/app/commons/component/footer/footer.component.html similarity index 100% rename from src/app/commons/layouts/footer/footer.component.html rename to src/app/commons/component/footer/footer.component.html diff --git a/src/app/commons/layouts/footer/footer.component.scss b/src/app/commons/component/footer/footer.component.scss similarity index 100% rename from src/app/commons/layouts/footer/footer.component.scss rename to src/app/commons/component/footer/footer.component.scss diff --git a/src/app/commons/layouts/footer/footer.component.spec.ts b/src/app/commons/component/footer/footer.component.spec.ts similarity index 100% rename from src/app/commons/layouts/footer/footer.component.spec.ts rename to src/app/commons/component/footer/footer.component.spec.ts diff --git a/src/app/commons/layouts/footer/footer.component.ts b/src/app/commons/component/footer/footer.component.ts similarity index 100% rename from src/app/commons/layouts/footer/footer.component.ts rename to src/app/commons/component/footer/footer.component.ts diff --git a/src/app/commons/layouts/header/header.component.html b/src/app/commons/component/header/header.component.html similarity index 100% rename from src/app/commons/layouts/header/header.component.html rename to src/app/commons/component/header/header.component.html diff --git a/src/app/commons/layouts/header/header.component.scss b/src/app/commons/component/header/header.component.scss similarity index 100% rename from src/app/commons/layouts/header/header.component.scss rename to src/app/commons/component/header/header.component.scss diff --git a/src/app/commons/layouts/header/header.component.spec.ts b/src/app/commons/component/header/header.component.spec.ts similarity index 100% rename from src/app/commons/layouts/header/header.component.spec.ts rename to src/app/commons/component/header/header.component.spec.ts diff --git a/src/app/commons/layouts/header/header.component.ts b/src/app/commons/component/header/header.component.ts similarity index 100% rename from src/app/commons/layouts/header/header.component.ts rename to src/app/commons/component/header/header.component.ts diff --git a/src/app/commons/layouts/header/toolbar.helpers.ts b/src/app/commons/component/header/toolbar.helpers.ts similarity index 100% rename from src/app/commons/layouts/header/toolbar.helpers.ts rename to src/app/commons/component/header/toolbar.helpers.ts diff --git a/src/app/commons/layouts/layouts.module.ts b/src/app/commons/component/layouts.module.ts similarity index 100% rename from src/app/commons/layouts/layouts.module.ts rename to src/app/commons/component/layouts.module.ts diff --git a/src/app/commons/layouts/menu-item/menu-item.component.html b/src/app/commons/component/menu-item/menu-item.component.html similarity index 100% rename from src/app/commons/layouts/menu-item/menu-item.component.html rename to src/app/commons/component/menu-item/menu-item.component.html diff --git a/src/app/commons/layouts/menu-item/menu-item.component.scss b/src/app/commons/component/menu-item/menu-item.component.scss similarity index 100% rename from src/app/commons/layouts/menu-item/menu-item.component.scss rename to src/app/commons/component/menu-item/menu-item.component.scss diff --git a/src/app/commons/layouts/menu-item/menu-item.component.spec.ts b/src/app/commons/component/menu-item/menu-item.component.spec.ts similarity index 100% rename from src/app/commons/layouts/menu-item/menu-item.component.spec.ts rename to src/app/commons/component/menu-item/menu-item.component.spec.ts diff --git a/src/app/commons/layouts/menu-item/menu-item.component.ts b/src/app/commons/component/menu-item/menu-item.component.ts similarity index 100% rename from src/app/commons/layouts/menu-item/menu-item.component.ts rename to src/app/commons/component/menu-item/menu-item.component.ts diff --git a/src/app/commons/layouts/sidebar/menu-element.ts b/src/app/commons/component/sidebar/menu-element.ts similarity index 100% rename from src/app/commons/layouts/sidebar/menu-element.ts rename to src/app/commons/component/sidebar/menu-element.ts diff --git a/src/app/commons/layouts/sidebar/sidebar.component.html b/src/app/commons/component/sidebar/sidebar.component.html similarity index 100% rename from src/app/commons/layouts/sidebar/sidebar.component.html rename to src/app/commons/component/sidebar/sidebar.component.html diff --git a/src/app/commons/layouts/sidebar/sidebar.component.scss b/src/app/commons/component/sidebar/sidebar.component.scss similarity index 100% rename from src/app/commons/layouts/sidebar/sidebar.component.scss rename to src/app/commons/component/sidebar/sidebar.component.scss diff --git a/src/app/commons/layouts/sidebar/sidebar.component.spec.ts b/src/app/commons/component/sidebar/sidebar.component.spec.ts similarity index 100% rename from src/app/commons/layouts/sidebar/sidebar.component.spec.ts rename to src/app/commons/component/sidebar/sidebar.component.spec.ts diff --git a/src/app/commons/layouts/sidebar/sidebar.component.ts b/src/app/commons/component/sidebar/sidebar.component.ts similarity index 100% rename from src/app/commons/layouts/sidebar/sidebar.component.ts rename to src/app/commons/component/sidebar/sidebar.component.ts diff --git a/src/app/commons/layouts/sub-menubar/sub-menubar.component.html b/src/app/commons/component/sub-menubar/sub-menubar.component.html similarity index 100% rename from src/app/commons/layouts/sub-menubar/sub-menubar.component.html rename to src/app/commons/component/sub-menubar/sub-menubar.component.html diff --git a/src/app/commons/layouts/sub-menubar/sub-menubar.component.scss b/src/app/commons/component/sub-menubar/sub-menubar.component.scss similarity index 100% rename from src/app/commons/layouts/sub-menubar/sub-menubar.component.scss rename to src/app/commons/component/sub-menubar/sub-menubar.component.scss diff --git a/src/app/commons/layouts/sub-menubar/sub-menubar.component.spec.ts b/src/app/commons/component/sub-menubar/sub-menubar.component.spec.ts similarity index 100% rename from src/app/commons/layouts/sub-menubar/sub-menubar.component.spec.ts rename to src/app/commons/component/sub-menubar/sub-menubar.component.spec.ts diff --git a/src/app/commons/layouts/sub-menubar/sub-menubar.component.ts b/src/app/commons/component/sub-menubar/sub-menubar.component.ts similarity index 100% rename from src/app/commons/layouts/sub-menubar/sub-menubar.component.ts rename to src/app/commons/component/sub-menubar/sub-menubar.component.ts diff --git a/src/app/commons/layouts/sub-menubar/sub-menubar.module.ts b/src/app/commons/component/sub-menubar/sub-menubar.module.ts similarity index 81% rename from src/app/commons/layouts/sub-menubar/sub-menubar.module.ts rename to src/app/commons/component/sub-menubar/sub-menubar.module.ts index 53ebecb..f99c4bc 100644 --- a/src/app/commons/layouts/sub-menubar/sub-menubar.module.ts +++ b/src/app/commons/component/sub-menubar/sub-menubar.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { SubMenubarComponent } from 'app/commons/layouts/sub-menubar/sub-menubar.component'; +import { SubMenubarComponent } from 'app/commons/component/sub-menubar/sub-menubar.component'; import { MaterialModule } from 'app/commons/ui/material/material.module'; import { RouterModule } from '@angular/router'; diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index eeafeec..6a126a8 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -2,12 +2,12 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { PagesComponent } from './pages.component'; import { PagesRoutingModule } from './pages-routing.module'; -import { SidebarComponent } from 'app/commons/layouts/sidebar/sidebar.component'; +import { SidebarComponent } from 'app/commons/component/sidebar/sidebar.component'; import { CovalentModule } from 'app/commons/ui/covalent/covalent.module'; 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 { HeaderComponent } from 'app/commons/component/header/header.component'; +import { FooterComponent } from 'app/commons/component/footer/footer.component'; +import { MenuItemComponent } from 'app/commons/component/menu-item/menu-item.component'; import { PerfectScrollbarModule, PERFECT_SCROLLBAR_CONFIG, diff --git a/src/app/pages/probe/probe-page.module.ts b/src/app/pages/probe/probe-page.module.ts index 4a7ea08..70937fc 100644 --- a/src/app/pages/probe/probe-page.module.ts +++ b/src/app/pages/probe/probe-page.module.ts @@ -4,7 +4,7 @@ import { ProbePageComponent } from './probe-page.component'; import { ProbesPageRoutingModule } from './probe-page-routing.module'; import { MaterialModule } from 'app/commons/ui/material/material.module'; import { ProbeModule } from 'app/packages/probe/probe.module'; -import { SubMenubarModule } from 'app/commons/layouts/sub-menubar/sub-menubar.module'; +import { SubMenubarModule } from 'app/commons/component/sub-menubar/sub-menubar.module'; @NgModule({ imports: [ diff --git a/src/app/pages/probes/probes-page.module.ts b/src/app/pages/probes/probes-page.module.ts index db7879b..472a54d 100644 --- a/src/app/pages/probes/probes-page.module.ts +++ b/src/app/pages/probes/probes-page.module.ts @@ -5,7 +5,7 @@ import { ProbesPageRoutingModule } from './probes-page-routing.module'; import { MaterialModule } from 'app/commons/ui/material/material.module'; import { ProbeModule } from 'app/packages/probe/probe.module'; import { NoauthModule } from 'app/packages/noauth/noauth.module'; -import { SubMenubarModule } from 'app/commons/layouts/sub-menubar/sub-menubar.module'; +import { SubMenubarModule } from 'app/commons/component/sub-menubar/sub-menubar.module'; @NgModule({ imports: [ diff --git a/src/theme/theme.scss b/src/theme/theme.scss index 8c9b261..31d99c1 100644 --- a/src/theme/theme.scss +++ b/src/theme/theme.scss @@ -1,7 +1,7 @@ @import '~@angular/material/theming'; @import '~app/pages/pages.component.scss'; -@import '~app/commons/layouts/sidebar/sidebar.component.scss'; -@import '~app/commons/layouts/menu-item/menu-item.component.scss'; +@import '~app/commons/component/sidebar/sidebar.component.scss'; +@import '~app/commons/component/menu-item/menu-item.component.scss'; $mat-light-theme-background: ( status-bar: map_get($mat-grey, 300),