Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-16 23:40:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(theme): move dependencies into demo

Browse source
This commit is contained in:
Dmitry Nehaychik 2017-06-13 20:40:08 +03:00
parent 2afb26810e
commit b71c1190bc
13 changed files with 61 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.angular-cli.json
View file

@ -52,6 +52,7 @@
},
"lint": [
{
"files": "src/**/*.ts",
"project": "src/tsconfig.app.json"
},
{

2
src/app/@theme/layouts/one-column/one-column.layout.scss
View file

@ -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() {

5
src/app/@theme/styles/themes.scss
View file

@ -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();

8
src/app/pages/charts/charts.module.ts
View file

@ -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,

2
src/app/pages/charts/echarts/echarts.component.scss
View file

@ -1,4 +1,4 @@
@import '~@nga/theme/styles_new/all';
@import '~@nga/theme/styles_new/component';
@include nga-install-component() {
display: block;

7
src/app/pages/components/components.module.ts
View file

@ -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,

3
src/app/pages/dashboard/dashboard.component.scss
View file

@ -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 {

2
src/app/pages/maps/gmaps/gmaps.component.scss
View file

@ -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 {

2
src/app/pages/maps/leaflet/leaflet.component.scss
View file

@ -1,4 +1,4 @@
@import '~@nga/theme/styles_new/all';
@import '~@nga/theme/styles_new/component';
@include nga-install-component() {
display: block;

4
src/app/pages/tables/tables.module.ts
View file

@ -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,

3
src/app/pages/ui-features/buttons/buttons.component.scss
View file

@ -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;

3
src/app/shared.module.ts
View file

@ -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 { }

35
src/tsconfig.app.json
View file

@ -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",