From b71c1190bc0acf3157cffff6b5e716fc6c2a723c Mon Sep 17 00:00:00 2001 From: Dmitry Nehaychik <4dmitr@gmail.com> Date: Tue, 13 Jun 2017 20:40:08 +0300 Subject: [PATCH] refactor(theme): move dependencies into demo --- .angular-cli.json | 1 + .../layouts/one-column/one-column.layout.scss | 2 +- src/app/@theme/styles/themes.scss | 5 ++- src/app/pages/charts/charts.module.ts | 8 +++-- .../charts/echarts/echarts.component.scss | 2 +- src/app/pages/components/components.module.ts | 7 ++-- .../pages/dashboard/dashboard.component.scss | 3 +- src/app/pages/maps/gmaps/gmaps.component.scss | 2 +- .../pages/maps/leaflet/leaflet.component.scss | 2 +- src/app/pages/tables/tables.module.ts | 4 +-- .../buttons/buttons.component.scss | 3 +- src/app/shared.module.ts | 3 +- src/tsconfig.app.json | 35 ++++++++++++++++++- 13 files changed, 61 insertions(+), 16 deletions(-) diff --git a/.angular-cli.json b/.angular-cli.json index 6f87df54..2de55300 100644 --- a/.angular-cli.json +++ b/.angular-cli.json @@ -52,6 +52,7 @@ }, "lint": [ { + "files": "src/**/*.ts", "project": "src/tsconfig.app.json" }, { diff --git a/src/app/@theme/layouts/one-column/one-column.layout.scss b/src/app/@theme/layouts/one-column/one-column.layout.scss index 6b11230b..e9a70e62 100644 --- a/src/app/@theme/layouts/one-column/one-column.layout.scss +++ b/src/app/@theme/layouts/one-column/one-column.layout.scss @@ -1,4 +1,4 @@ -@import '~@nga/theme/styles_new/all'; +@import '~@nga/theme/styles_new/component'; // TODO move colors to theme @include nga-install-component() { diff --git a/src/app/@theme/styles/themes.scss b/src/app/@theme/styles/themes.scss index 3ebb25d4..ed827b81 100644 --- a/src/app/@theme/styles/themes.scss +++ b/src/app/@theme/styles/themes.scss @@ -1,2 +1,5 @@ @import '~@nga/theme/styles_new/all'; -@include nga-install(); +@include nga-themes-install(); + +@import '~@nga/auth/styles_new/all'; +@include nga-auth-install(); diff --git a/src/app/pages/charts/charts.module.ts b/src/app/pages/charts/charts.module.ts index c5e48c5d..7d242455 100644 --- a/src/app/pages/charts/charts.module.ts +++ b/src/app/pages/charts/charts.module.ts @@ -1,5 +1,4 @@ import { NgModule } from '@angular/core'; -import { NgaChartsModule } from '@nga/theme'; import { SharedModule } from '../../shared.module'; @@ -13,6 +12,9 @@ import { D3PieComponent } from './d3/pie/pie.component'; import { EchartsLineComponent } from './echarts/line/line.component'; import { EchartsPieComponent } from './echarts/pie/pie.component'; import { EchartsBarComponent } from './echarts/bar/bar.component'; +import { AngularEchartsModule } from 'angular2-echarts'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; +import { ChartsModule as Ng2Charts } from 'ng2-charts/ng2-charts'; const components = [ ChartJsBarComponent, @@ -29,8 +31,10 @@ const components = [ @NgModule({ imports: [ SharedModule, - NgaChartsModule, ChartsRoutingModule, + AngularEchartsModule, + NgxChartsModule, + Ng2Charts, ], declarations: [ ...routedComponents, diff --git a/src/app/pages/charts/echarts/echarts.component.scss b/src/app/pages/charts/echarts/echarts.component.scss index f0da80a8..93f843ee 100644 --- a/src/app/pages/charts/echarts/echarts.component.scss +++ b/src/app/pages/charts/echarts/echarts.component.scss @@ -1,4 +1,4 @@ -@import '~@nga/theme/styles_new/all'; +@import '~@nga/theme/styles_new/component'; @include nga-install-component() { display: block; diff --git a/src/app/pages/components/components.module.ts b/src/app/pages/components/components.module.ts index af1d36e2..b126781e 100644 --- a/src/app/pages/components/components.module.ts +++ b/src/app/pages/components/components.module.ts @@ -1,5 +1,7 @@ import { NgModule } from '@angular/core'; -import { NgaComponentsModule } from '@nga/theme'; + +import { TreeModule } from 'ng2-tree'; +import { ToasterModule } from 'angular2-toaster'; import { SharedModule } from '../../shared.module'; @@ -8,8 +10,9 @@ import { ComponentsRoutingModule, routedComponents } from './components-routing. @NgModule({ imports: [ SharedModule, - NgaComponentsModule, ComponentsRoutingModule, + TreeModule, + ToasterModule, ], declarations: [ ...routedComponents, diff --git a/src/app/pages/dashboard/dashboard.component.scss b/src/app/pages/dashboard/dashboard.component.scss index f8e7094a..a292bf4b 100644 --- a/src/app/pages/dashboard/dashboard.component.scss +++ b/src/app/pages/dashboard/dashboard.component.scss @@ -1,4 +1,5 @@ -@import '~@nga/theme/styles_new/all'; +@import '~@nga/theme/styles_new/component'; +@import '~@nga/theme/styles_new/global/bootstrap/hero-buttons'; @include nga-install-component() { .status-cards { diff --git a/src/app/pages/maps/gmaps/gmaps.component.scss b/src/app/pages/maps/gmaps/gmaps.component.scss index f2f53210..0f72fb0c 100644 --- a/src/app/pages/maps/gmaps/gmaps.component.scss +++ b/src/app/pages/maps/gmaps/gmaps.component.scss @@ -1,4 +1,4 @@ -@import '~@nga/theme/styles_new/all'; +@import '~@nga/theme/styles_new/component'; @include nga-install-component() { /deep/ agm-map .agm-map-container-inner { diff --git a/src/app/pages/maps/leaflet/leaflet.component.scss b/src/app/pages/maps/leaflet/leaflet.component.scss index 54030c0f..76f0fd6c 100644 --- a/src/app/pages/maps/leaflet/leaflet.component.scss +++ b/src/app/pages/maps/leaflet/leaflet.component.scss @@ -1,4 +1,4 @@ -@import '~@nga/theme/styles_new/all'; +@import '~@nga/theme/styles_new/component'; @include nga-install-component() { display: block; diff --git a/src/app/pages/tables/tables.module.ts b/src/app/pages/tables/tables.module.ts index 6181051d..0416322e 100644 --- a/src/app/pages/tables/tables.module.ts +++ b/src/app/pages/tables/tables.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { NgaTablesModule } from '@nga/theme'; +import { Ng2SmartTableModule } from 'ng2-smart-table'; import { SharedModule } from '../../shared.module'; @@ -10,7 +10,7 @@ import { SmartTableService } from './smart-table/smart-table.service'; imports: [ SharedModule, TablesRoutingModule, - NgaTablesModule, + Ng2SmartTableModule, ], declarations: [ ...routedComponents, diff --git a/src/app/pages/ui-features/buttons/buttons.component.scss b/src/app/pages/ui-features/buttons/buttons.component.scss index 502253d5..a22f9c94 100644 --- a/src/app/pages/ui-features/buttons/buttons.component.scss +++ b/src/app/pages/ui-features/buttons/buttons.component.scss @@ -1,4 +1,5 @@ -@import '~@nga/theme/styles_new/all'; +@import '~@nga/theme/styles_new/component'; +@import '~@nga/theme/styles_new/global/bootstrap/buttons'; @mixin btn-bg($background) { background-color: $background; diff --git a/src/app/shared.module.ts b/src/app/shared.module.ts index b0816453..dab7f193 100644 --- a/src/app/shared.module.ts +++ b/src/app/shared.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { NgaCardModule, NgaBootstrapModule } from '@nga/theme'; +import { NgaCardModule } from '@nga/theme'; @NgModule({ exports: [ @@ -11,7 +11,6 @@ import { NgaCardModule, NgaBootstrapModule } from '@nga/theme'; ReactiveFormsModule, RouterModule, NgaCardModule, - NgaBootstrapModule, ], }) export class SharedModule { } diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json index 5e2507db..48d252a8 100644 --- a/src/tsconfig.app.json +++ b/src/tsconfig.app.json @@ -4,7 +4,40 @@ "outDir": "../out-tsc/app", "module": "es2015", "baseUrl": "", - "types": [] + "types": [], + "paths": { + "@angular/*": [ + "../node_modules/@angular/*" + ], + "@nga/*": [ + "../node_modules/@nga/*" + ], + "@ng-bootstrap/*": [ + "../node_modules/@ng-bootstrap/*" + ], + "bootstrap/*": [ + "../node_modules/bootstrap/*" + ], + "font-awesome/*": [ + "../node_modules/font-awesome/*" + ], + "immutable/*": [ + "../node_modules/immutable/*" + ], + "ionicons/*": [ + "../node_modules/ionicons/*" + ], + "normalize.css/*": [ + "../node_modules/normalize.css/*" + ], + "segoe-fonts/*": [ + "../node_modules/segoe-fonts/*" + ], + "typeface-exo/*": [ + "../node_modules/typeface-exo/*" + ] + + } }, "exclude": [ "test.ts",