From 596c98d83c6eb6a6ea64edcb67f49882aee950af Mon Sep 17 00:00:00 2001 From: Eraldo Hasanaj Date: Mon, 21 Jan 2019 16:30:14 +0100 Subject: [PATCH] Refacrored layouts to components --- src/app/app-routing.module.ts | 4 +-- src/app/app.module.ts | 8 ++--- .../article-search.component.html | 0 .../article-search.component.scss | 0 .../article-search.component.spec.ts | 0 .../article-search.component.ts | 0 .../content/content.component.html | 0 .../content/content.component.scss | 0 .../content/content.component.spec.ts | 0 .../content/content.component.ts | 0 .../dashboard/dashboard.component.html | 0 .../dashboard/dashboard.component.scss | 0 .../dashboard/dashboard.component.spec.ts | 0 .../dashboard/dashboard.component.ts | 0 .../header/header.component.html | 0 .../header/header.component.scss | 0 .../header/header.component.spec.ts | 0 .../header/header.component.ts | 0 .../menu/menu.component.html | 0 .../menu/menu.component.scss | 0 .../menu/menu.component.spec.ts | 0 .../menu/menu.component.ts | 0 .../process-header.component.html | 0 .../process-header.component.scss | 0 .../process-header.component.spec.ts | 0 .../process-header.component.ts | 0 .../process-tab/process-tab.component.html | 0 .../process-tab/process-tab.component.scss | 0 .../process-tab/process-tab.component.spec.ts | 0 .../process-tab/process-tab.component.ts | 0 src/app/modules/components.module.ts | 36 +++++++++++++++++++ src/app/modules/layouts/layouts.module.ts | 33 ----------------- 32 files changed, 41 insertions(+), 40 deletions(-) rename src/app/{layouts => components}/article-search/article-search.component.html (100%) rename src/app/{layouts => components}/article-search/article-search.component.scss (100%) rename src/app/{layouts => components}/article-search/article-search.component.spec.ts (100%) rename src/app/{layouts => components}/article-search/article-search.component.ts (100%) rename src/app/{layouts => components}/content/content.component.html (100%) rename src/app/{layouts => components}/content/content.component.scss (100%) rename src/app/{layouts => components}/content/content.component.spec.ts (100%) rename src/app/{layouts => components}/content/content.component.ts (100%) rename src/app/{layouts => components}/dashboard/dashboard.component.html (100%) rename src/app/{layouts => components}/dashboard/dashboard.component.scss (100%) rename src/app/{layouts => components}/dashboard/dashboard.component.spec.ts (100%) rename src/app/{layouts => components}/dashboard/dashboard.component.ts (100%) rename src/app/{layouts => components}/header/header.component.html (100%) rename src/app/{layouts => components}/header/header.component.scss (100%) rename src/app/{layouts => components}/header/header.component.spec.ts (100%) rename src/app/{layouts => components}/header/header.component.ts (100%) rename src/app/{layouts => components}/menu/menu.component.html (100%) rename src/app/{layouts => components}/menu/menu.component.scss (100%) rename src/app/{layouts => components}/menu/menu.component.spec.ts (100%) rename src/app/{layouts => components}/menu/menu.component.ts (100%) rename src/app/{layouts => components}/process-header/process-header.component.html (100%) rename src/app/{layouts => components}/process-header/process-header.component.scss (100%) rename src/app/{layouts => components}/process-header/process-header.component.spec.ts (100%) rename src/app/{layouts => components}/process-header/process-header.component.ts (100%) rename src/app/{layouts => components}/process-tab/process-tab.component.html (100%) rename src/app/{layouts => components}/process-tab/process-tab.component.scss (100%) rename src/app/{layouts => components}/process-tab/process-tab.component.spec.ts (100%) rename src/app/{layouts => components}/process-tab/process-tab.component.ts (100%) create mode 100644 src/app/modules/components.module.ts delete mode 100644 src/app/modules/layouts/layouts.module.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index b3c00e5f1..a536dda40 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { DashboardComponent } from './layouts/dashboard/dashboard.component'; -import { ArticleSearchComponent } from './layouts/article-search/article-search.component'; +import { DashboardComponent } from './components/dashboard/dashboard.component'; +import { ArticleSearchComponent } from './components/article-search/article-search.component'; const routes: Routes = [ {path: '', redirectTo: '/dashboard', pathMatch: 'full'}, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 53b2a30d9..e0c498003 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,8 +3,7 @@ import { NgModule } from '@angular/core'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { LayoutsModule } from './modules/layouts/layouts.module'; -import { MenuComponent } from './layouts/menu/menu.component'; +import { ComponentsModule } from './modules/components.module'; import { processReducer } from './core/reducers/process.reducer'; import { StoreModule } from '@ngrx/store'; @@ -14,13 +13,12 @@ const rootReducer = { @NgModule({ declarations: [ - AppComponent, - MenuComponent + AppComponent ], imports: [ BrowserModule, AppRoutingModule, - LayoutsModule, + ComponentsModule, StoreModule.forRoot(rootReducer) ], providers: [], diff --git a/src/app/layouts/article-search/article-search.component.html b/src/app/components/article-search/article-search.component.html similarity index 100% rename from src/app/layouts/article-search/article-search.component.html rename to src/app/components/article-search/article-search.component.html diff --git a/src/app/layouts/article-search/article-search.component.scss b/src/app/components/article-search/article-search.component.scss similarity index 100% rename from src/app/layouts/article-search/article-search.component.scss rename to src/app/components/article-search/article-search.component.scss diff --git a/src/app/layouts/article-search/article-search.component.spec.ts b/src/app/components/article-search/article-search.component.spec.ts similarity index 100% rename from src/app/layouts/article-search/article-search.component.spec.ts rename to src/app/components/article-search/article-search.component.spec.ts diff --git a/src/app/layouts/article-search/article-search.component.ts b/src/app/components/article-search/article-search.component.ts similarity index 100% rename from src/app/layouts/article-search/article-search.component.ts rename to src/app/components/article-search/article-search.component.ts diff --git a/src/app/layouts/content/content.component.html b/src/app/components/content/content.component.html similarity index 100% rename from src/app/layouts/content/content.component.html rename to src/app/components/content/content.component.html diff --git a/src/app/layouts/content/content.component.scss b/src/app/components/content/content.component.scss similarity index 100% rename from src/app/layouts/content/content.component.scss rename to src/app/components/content/content.component.scss diff --git a/src/app/layouts/content/content.component.spec.ts b/src/app/components/content/content.component.spec.ts similarity index 100% rename from src/app/layouts/content/content.component.spec.ts rename to src/app/components/content/content.component.spec.ts diff --git a/src/app/layouts/content/content.component.ts b/src/app/components/content/content.component.ts similarity index 100% rename from src/app/layouts/content/content.component.ts rename to src/app/components/content/content.component.ts diff --git a/src/app/layouts/dashboard/dashboard.component.html b/src/app/components/dashboard/dashboard.component.html similarity index 100% rename from src/app/layouts/dashboard/dashboard.component.html rename to src/app/components/dashboard/dashboard.component.html diff --git a/src/app/layouts/dashboard/dashboard.component.scss b/src/app/components/dashboard/dashboard.component.scss similarity index 100% rename from src/app/layouts/dashboard/dashboard.component.scss rename to src/app/components/dashboard/dashboard.component.scss diff --git a/src/app/layouts/dashboard/dashboard.component.spec.ts b/src/app/components/dashboard/dashboard.component.spec.ts similarity index 100% rename from src/app/layouts/dashboard/dashboard.component.spec.ts rename to src/app/components/dashboard/dashboard.component.spec.ts diff --git a/src/app/layouts/dashboard/dashboard.component.ts b/src/app/components/dashboard/dashboard.component.ts similarity index 100% rename from src/app/layouts/dashboard/dashboard.component.ts rename to src/app/components/dashboard/dashboard.component.ts diff --git a/src/app/layouts/header/header.component.html b/src/app/components/header/header.component.html similarity index 100% rename from src/app/layouts/header/header.component.html rename to src/app/components/header/header.component.html diff --git a/src/app/layouts/header/header.component.scss b/src/app/components/header/header.component.scss similarity index 100% rename from src/app/layouts/header/header.component.scss rename to src/app/components/header/header.component.scss diff --git a/src/app/layouts/header/header.component.spec.ts b/src/app/components/header/header.component.spec.ts similarity index 100% rename from src/app/layouts/header/header.component.spec.ts rename to src/app/components/header/header.component.spec.ts diff --git a/src/app/layouts/header/header.component.ts b/src/app/components/header/header.component.ts similarity index 100% rename from src/app/layouts/header/header.component.ts rename to src/app/components/header/header.component.ts diff --git a/src/app/layouts/menu/menu.component.html b/src/app/components/menu/menu.component.html similarity index 100% rename from src/app/layouts/menu/menu.component.html rename to src/app/components/menu/menu.component.html diff --git a/src/app/layouts/menu/menu.component.scss b/src/app/components/menu/menu.component.scss similarity index 100% rename from src/app/layouts/menu/menu.component.scss rename to src/app/components/menu/menu.component.scss diff --git a/src/app/layouts/menu/menu.component.spec.ts b/src/app/components/menu/menu.component.spec.ts similarity index 100% rename from src/app/layouts/menu/menu.component.spec.ts rename to src/app/components/menu/menu.component.spec.ts diff --git a/src/app/layouts/menu/menu.component.ts b/src/app/components/menu/menu.component.ts similarity index 100% rename from src/app/layouts/menu/menu.component.ts rename to src/app/components/menu/menu.component.ts diff --git a/src/app/layouts/process-header/process-header.component.html b/src/app/components/process-header/process-header.component.html similarity index 100% rename from src/app/layouts/process-header/process-header.component.html rename to src/app/components/process-header/process-header.component.html diff --git a/src/app/layouts/process-header/process-header.component.scss b/src/app/components/process-header/process-header.component.scss similarity index 100% rename from src/app/layouts/process-header/process-header.component.scss rename to src/app/components/process-header/process-header.component.scss diff --git a/src/app/layouts/process-header/process-header.component.spec.ts b/src/app/components/process-header/process-header.component.spec.ts similarity index 100% rename from src/app/layouts/process-header/process-header.component.spec.ts rename to src/app/components/process-header/process-header.component.spec.ts diff --git a/src/app/layouts/process-header/process-header.component.ts b/src/app/components/process-header/process-header.component.ts similarity index 100% rename from src/app/layouts/process-header/process-header.component.ts rename to src/app/components/process-header/process-header.component.ts diff --git a/src/app/layouts/process-tab/process-tab.component.html b/src/app/components/process-tab/process-tab.component.html similarity index 100% rename from src/app/layouts/process-tab/process-tab.component.html rename to src/app/components/process-tab/process-tab.component.html diff --git a/src/app/layouts/process-tab/process-tab.component.scss b/src/app/components/process-tab/process-tab.component.scss similarity index 100% rename from src/app/layouts/process-tab/process-tab.component.scss rename to src/app/components/process-tab/process-tab.component.scss diff --git a/src/app/layouts/process-tab/process-tab.component.spec.ts b/src/app/components/process-tab/process-tab.component.spec.ts similarity index 100% rename from src/app/layouts/process-tab/process-tab.component.spec.ts rename to src/app/components/process-tab/process-tab.component.spec.ts diff --git a/src/app/layouts/process-tab/process-tab.component.ts b/src/app/components/process-tab/process-tab.component.ts similarity index 100% rename from src/app/layouts/process-tab/process-tab.component.ts rename to src/app/components/process-tab/process-tab.component.ts diff --git a/src/app/modules/components.module.ts b/src/app/modules/components.module.ts new file mode 100644 index 000000000..3a5d847ae --- /dev/null +++ b/src/app/modules/components.module.ts @@ -0,0 +1,36 @@ +import { NgModule } from '@angular/core'; +import { HeaderComponent } from 'src/app/components/header/header.component'; +import { ProcessHeaderComponent } from 'src/app/components/process-header/process-header.component'; +import { ProcessTabComponent } from 'src/app/components/process-tab/process-tab.component'; +import { CommonModule } from '@angular/common'; +import { ContentComponent } from 'src/app/components/content/content.component'; +import { ArticleSearchComponent } from 'src/app/components/article-search/article-search.component'; +import { DashboardComponent } from 'src/app/components/dashboard/dashboard.component'; +import { AppRoutingModule } from 'src/app/app-routing.module'; +import { MenuComponent } from '../components/menu/menu.component'; + +@NgModule({ + declarations: [ + HeaderComponent, + ProcessHeaderComponent, + ProcessTabComponent, + ContentComponent, + ArticleSearchComponent, + DashboardComponent, + MenuComponent + ], + imports: [ + CommonModule, + AppRoutingModule + ], + exports: [ + HeaderComponent, + ProcessHeaderComponent, + ProcessTabComponent, + ContentComponent, + ArticleSearchComponent, + DashboardComponent, + MenuComponent + ] +}) +export class ComponentsModule { } diff --git a/src/app/modules/layouts/layouts.module.ts b/src/app/modules/layouts/layouts.module.ts deleted file mode 100644 index d9829137f..000000000 --- a/src/app/modules/layouts/layouts.module.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { NgModule } from '@angular/core'; -import { HeaderComponent } from 'src/app/layouts/header/header.component'; -import { ProcessHeaderComponent } from 'src/app/layouts/process-header/process-header.component'; -import { ProcessTabComponent } from 'src/app/layouts/process-tab/process-tab.component'; -import { CommonModule } from '@angular/common'; -import { ContentComponent } from 'src/app/layouts/content/content.component'; -import { ArticleSearchComponent } from 'src/app/layouts/article-search/article-search.component'; -import { DashboardComponent } from 'src/app/layouts/dashboard/dashboard.component'; -import { AppRoutingModule } from 'src/app/app-routing.module'; - -@NgModule({ - declarations: [ - HeaderComponent, - ProcessHeaderComponent, - ProcessTabComponent, - ContentComponent, - ArticleSearchComponent, - DashboardComponent - ], - imports: [ - CommonModule, - AppRoutingModule - ], - exports: [ - HeaderComponent, - ProcessHeaderComponent, - ProcessTabComponent, - ContentComponent, - ArticleSearchComponent, - DashboardComponent - ] -}) -export class LayoutsModule { }