From 44f2f562a99a954c3ae17df9f79097b7fc3686a4 Mon Sep 17 00:00:00 2001
From: Dmitry Nehaychik <4dmitr@gmail.com>
Date: Fri, 28 Apr 2017 14:59:24 +0300
Subject: [PATCH] refactor(app): make a bit more neat structure
---
src/app/@core/data/.gitkeep | 0
src/app/@core/data/README.md | 1 +
src/app/@core/utils/.gitkeep | 0
.../_base-footer.component.theme.scss | 0
.../base-footer/base-footer.component.scss | 0
.../base-footer/base-footer.component.ts | 0
.../_base-header.component.theme.scss | 0
.../base-header/base-header.component.scss | 0
.../base-header/base-header.component.ts | 0
src/app/@theme/components/index.ts | 3 +++
.../_search-input.component.theme.scss | 0
.../search-input/search-input.component.scss | 0
.../search-input/search-input.component.ts | 0
src/app/@theme/directives/.gitkeep | 0
src/app/@theme/layouts/index.ts | 3 +--
.../one-column.layout.ts} | 4 ++--
src/app/@theme/pipes/.gitkeep | 0
src/app/@theme/styles/_components.scss | 8 ++++----
src/app/@theme/theme.module.ts | 18 +++++++++++-------
src/app/pages/pages.component.ts | 4 ++--
20 files changed, 24 insertions(+), 17 deletions(-)
create mode 100644 src/app/@core/data/.gitkeep
create mode 100644 src/app/@core/data/README.md
create mode 100644 src/app/@core/utils/.gitkeep
rename src/app/@theme/{layouts => components}/base-footer/_base-footer.component.theme.scss (100%)
rename src/app/@theme/{layouts => components}/base-footer/base-footer.component.scss (100%)
rename src/app/@theme/{layouts => components}/base-footer/base-footer.component.ts (100%)
rename src/app/@theme/{layouts => components}/base-header/_base-header.component.theme.scss (100%)
rename src/app/@theme/{layouts => components}/base-header/base-header.component.scss (100%)
rename src/app/@theme/{layouts => components}/base-header/base-header.component.ts (100%)
create mode 100644 src/app/@theme/components/index.ts
rename src/app/@theme/{ => components}/search-input/_search-input.component.theme.scss (100%)
rename src/app/@theme/{ => components}/search-input/search-input.component.scss (100%)
rename src/app/@theme/{ => components}/search-input/search-input.component.ts (100%)
create mode 100644 src/app/@theme/directives/.gitkeep
rename src/app/@theme/layouts/{one-coll-layout/one-coll.layout.ts => one-column/one-column.layout.ts} (87%)
create mode 100644 src/app/@theme/pipes/.gitkeep
diff --git a/src/app/@core/data/.gitkeep b/src/app/@core/data/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/@core/data/README.md b/src/app/@core/data/README.md
new file mode 100644
index 00000000..af967800
--- /dev/null
+++ b/src/app/@core/data/README.md
@@ -0,0 +1 @@
+Application-wise data providers.
diff --git a/src/app/@core/utils/.gitkeep b/src/app/@core/utils/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/@theme/layouts/base-footer/_base-footer.component.theme.scss b/src/app/@theme/components/base-footer/_base-footer.component.theme.scss
similarity index 100%
rename from src/app/@theme/layouts/base-footer/_base-footer.component.theme.scss
rename to src/app/@theme/components/base-footer/_base-footer.component.theme.scss
diff --git a/src/app/@theme/layouts/base-footer/base-footer.component.scss b/src/app/@theme/components/base-footer/base-footer.component.scss
similarity index 100%
rename from src/app/@theme/layouts/base-footer/base-footer.component.scss
rename to src/app/@theme/components/base-footer/base-footer.component.scss
diff --git a/src/app/@theme/layouts/base-footer/base-footer.component.ts b/src/app/@theme/components/base-footer/base-footer.component.ts
similarity index 100%
rename from src/app/@theme/layouts/base-footer/base-footer.component.ts
rename to src/app/@theme/components/base-footer/base-footer.component.ts
diff --git a/src/app/@theme/layouts/base-header/_base-header.component.theme.scss b/src/app/@theme/components/base-header/_base-header.component.theme.scss
similarity index 100%
rename from src/app/@theme/layouts/base-header/_base-header.component.theme.scss
rename to src/app/@theme/components/base-header/_base-header.component.theme.scss
diff --git a/src/app/@theme/layouts/base-header/base-header.component.scss b/src/app/@theme/components/base-header/base-header.component.scss
similarity index 100%
rename from src/app/@theme/layouts/base-header/base-header.component.scss
rename to src/app/@theme/components/base-header/base-header.component.scss
diff --git a/src/app/@theme/layouts/base-header/base-header.component.ts b/src/app/@theme/components/base-header/base-header.component.ts
similarity index 100%
rename from src/app/@theme/layouts/base-header/base-header.component.ts
rename to src/app/@theme/components/base-header/base-header.component.ts
diff --git a/src/app/@theme/components/index.ts b/src/app/@theme/components/index.ts
new file mode 100644
index 00000000..a7196036
--- /dev/null
+++ b/src/app/@theme/components/index.ts
@@ -0,0 +1,3 @@
+export * from '../components/base-header/base-header.component';
+export * from '../components/base-footer/base-footer.component';
+export * from '../components/search-input/search-input.component';
diff --git a/src/app/@theme/search-input/_search-input.component.theme.scss b/src/app/@theme/components/search-input/_search-input.component.theme.scss
similarity index 100%
rename from src/app/@theme/search-input/_search-input.component.theme.scss
rename to src/app/@theme/components/search-input/_search-input.component.theme.scss
diff --git a/src/app/@theme/search-input/search-input.component.scss b/src/app/@theme/components/search-input/search-input.component.scss
similarity index 100%
rename from src/app/@theme/search-input/search-input.component.scss
rename to src/app/@theme/components/search-input/search-input.component.scss
diff --git a/src/app/@theme/search-input/search-input.component.ts b/src/app/@theme/components/search-input/search-input.component.ts
similarity index 100%
rename from src/app/@theme/search-input/search-input.component.ts
rename to src/app/@theme/components/search-input/search-input.component.ts
diff --git a/src/app/@theme/directives/.gitkeep b/src/app/@theme/directives/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/@theme/layouts/index.ts b/src/app/@theme/layouts/index.ts
index 01b158ea..fab07255 100644
--- a/src/app/@theme/layouts/index.ts
+++ b/src/app/@theme/layouts/index.ts
@@ -1,2 +1 @@
-export * from './base-header/base-header.component';
-export * from './one-coll-layout/one-coll.layout';
+export * from './one-column/one-column.layout';
diff --git a/src/app/@theme/layouts/one-coll-layout/one-coll.layout.ts b/src/app/@theme/layouts/one-column/one-column.layout.ts
similarity index 87%
rename from src/app/@theme/layouts/one-coll-layout/one-coll.layout.ts
rename to src/app/@theme/layouts/one-column/one-column.layout.ts
index c6b54794..72212731 100644
--- a/src/app/@theme/layouts/one-coll-layout/one-coll.layout.ts
+++ b/src/app/@theme/layouts/one-column/one-column.layout.ts
@@ -1,7 +1,7 @@
import { Component } from '@angular/core';
@Component({
- selector: 'one-coll-layout',
+ selector: 'one-column-layout',
template: `
@@ -22,5 +22,5 @@ import { Component } from '@angular/core';
`,
})
-export class OneCollLayoutComponent {
+export class OneColumnLayoutComponent {
}
diff --git a/src/app/@theme/pipes/.gitkeep b/src/app/@theme/pipes/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/@theme/styles/_components.scss b/src/app/@theme/styles/_components.scss
index a765e176..2b57350b 100644
--- a/src/app/@theme/styles/_components.scss
+++ b/src/app/@theme/styles/_components.scss
@@ -1,9 +1,9 @@
-@import '../layouts/base-header/base-header.component.theme';
-@import '../search-input/search-input.component.theme';
-@import '../layouts/base-footer/base-footer.component.theme';
+@import '../components/base-header/base-header.component.theme';
+@import '../components/search-input/search-input.component.theme';
+@import '../components/base-footer/base-footer.component.theme';
@mixin custom-components-theme() {
@include base-header-theme();
@include base-footer-theme();
@include search-input-theme();
-}
\ No newline at end of file
+}
diff --git a/src/app/@theme/theme.module.ts b/src/app/@theme/theme.module.ts
index 0a4d61e5..e7ee92ec 100644
--- a/src/app/@theme/theme.module.ts
+++ b/src/app/@theme/theme.module.ts
@@ -12,9 +12,8 @@ import {
NgaUserModule,
} from '@nga/theme';
-import { SearchInputComponent } from './search-input/search-input.component';
-import { OneCollLayoutComponent, BaseHeaderComponent } from './layouts';
-import { BaseFooterComponent } from './layouts/base-footer/base-footer.component';
+import { SearchInputComponent, BaseHeaderComponent, BaseFooterComponent } from './components';
+import { OneColumnLayoutComponent } from './layouts';
const BASE_MODULES = [
CommonModule,
@@ -31,8 +30,14 @@ const NGA_MODULES = [
NgaUserModule,
];
+const COMPONENTS = [
+ BaseHeaderComponent,
+ BaseFooterComponent,
+ SearchInputComponent,
+];
+
const LAYOUTS = [
- OneCollLayoutComponent,
+ OneColumnLayoutComponent,
BaseHeaderComponent,
BaseFooterComponent,
];
@@ -46,13 +51,12 @@ const LAYOUTS = [
exports: [
...BASE_MODULES,
...NGA_MODULES,
+ ...COMPONENTS,
...LAYOUTS,
- SearchInputComponent,
],
declarations: [
+ ...COMPONENTS,
...LAYOUTS,
- SearchInputComponent,
- BaseFooterComponent,
],
})
export class ThemeModule {
diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts
index f5058253..55b7afed 100644
--- a/src/app/pages/pages.component.ts
+++ b/src/app/pages/pages.component.ts
@@ -7,10 +7,10 @@ import { Component } from '@angular/core';
'../@theme/styles/pure/pure.theme.scss',
],
template: `
-
+
-
+
`,
})
export class PagesComponent {