mirror of
https://github.com/akveo/ngx-admin.git
synced 2025-12-22 02:10:12 +01:00
feat(dependencies): update angular to 2.4.3. DLL Integration
This commit is contained in:
parent
4112676ae9
commit
ea7342008a
21 changed files with 175 additions and 135 deletions
|
|
@ -1,6 +1,6 @@
|
|||
import { Routes } from '@angular/router';
|
||||
import './app.loader.ts';
|
||||
import { Component, ViewEncapsulation, ViewContainerRef } from '@angular/core';
|
||||
|
||||
import { GlobalState } from './global.state';
|
||||
import { BaImageLoaderService, BaThemePreloader, BaThemeSpinner } from './theme/services';
|
||||
import { layoutPaths } from './theme/theme.constants';
|
||||
|
|
@ -9,7 +9,8 @@ import { BaMenuService } from './theme';
|
|||
|
||||
import { MENU } from './app.menu';
|
||||
|
||||
import 'style!./app.scss';
|
||||
import 'style-loader!./app.scss';
|
||||
import 'style-loader!./theme/initial.scss';
|
||||
|
||||
/*
|
||||
* App Component
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import {Component, ViewEncapsulation} from '@angular/core';
|
||||
|
||||
import {ChartistJsService} from './chartistJs.service';
|
||||
import 'style!./chartistJs.scss';
|
||||
import 'style-loader!./chartistJs.scss';
|
||||
|
||||
@Component({
|
||||
selector: 'chartist-js',
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import {Component, ViewEncapsulation} from '@angular/core';
|
||||
|
||||
import {CalendarService} from './calendar.service';
|
||||
import 'style!./calendar.scss';
|
||||
import 'style-loader!./calendar.scss';
|
||||
|
||||
@Component({
|
||||
selector: 'calendar',
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import {Component} from '@angular/core';
|
|||
|
||||
import {LineChartService} from './lineChart.service';
|
||||
|
||||
import 'style!./lineChart.scss';
|
||||
import 'style-loader!./lineChart.scss';
|
||||
|
||||
@Component({
|
||||
selector: 'line-chart',
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import {Component, ViewEncapsulation} from '@angular/core';
|
|||
import {PieChartService} from './pieChart.service';
|
||||
|
||||
import './pieChart.loader.ts';
|
||||
import 'style!./pieChart.scss';
|
||||
import 'style-loader!./pieChart.scss';
|
||||
|
||||
@Component({
|
||||
selector: 'pie-chart',
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import {Component} from '@angular/core';
|
||||
import 'style!./popularApp.scss';
|
||||
import 'style-loader!./popularApp.scss';
|
||||
|
||||
@Component({
|
||||
selector: 'popular-app',
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
import {UsersMapService} from './usersMap.service';
|
||||
import 'style!./usersMap.scss';
|
||||
import 'style-loader!./usersMap.scss';
|
||||
|
||||
@Component({
|
||||
selector: 'users-map',
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
import {BubbleMapsService} from './bubbleMaps.service';
|
||||
import 'style!./bubbleMaps.scss';
|
||||
import 'style-loader!./bubbleMaps.scss';
|
||||
|
||||
@Component({
|
||||
selector: 'bubble-maps',
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
import {LineMapsService} from './lineMaps.service';
|
||||
import 'style!./lineMaps.scss';
|
||||
import 'style-loader!./lineMaps.scss';
|
||||
|
||||
@Component({
|
||||
selector: 'line-maps',
|
||||
|
|
|
|||
|
|
@ -8,25 +8,24 @@ import { ModuleWithProviders } from '@angular/core';
|
|||
export const routes: Routes = [
|
||||
{
|
||||
path: 'login',
|
||||
loadChildren: './pages/login/login.module#LoginModule'
|
||||
loadChildren: 'app/pages/login/login.module#LoginModule'
|
||||
},
|
||||
{
|
||||
path: 'register',
|
||||
loadChildren: './pages/register/register.module#RegisterModule'
|
||||
loadChildren: 'app/pages/register/register.module#RegisterModule'
|
||||
},
|
||||
{
|
||||
path: 'pages',
|
||||
component: Pages,
|
||||
children: [
|
||||
{ path: '', redirectTo: 'dashboard', pathMatch: 'full' },
|
||||
{ path: 'dashboard', loadChildren: './pages/dashboard/dashboard.module#DashboardModule' },
|
||||
{ path: 'editors', loadChildren: './pages/editors/editors.module#EditorsModule' },
|
||||
// //{ path: 'components', loadChildren: './pages/components/components.module') }
|
||||
{ path: 'charts', loadChildren: './pages/charts/charts.module#ChartsModule' },
|
||||
{ path: 'ui', loadChildren: './pages/ui/ui.module#UiModule' },
|
||||
{ path: 'forms', loadChildren: './pages/forms/forms.module#FormsModule' },
|
||||
{ path: 'tables', loadChildren: './pages/tables/tables.module#TablesModule' },
|
||||
{ path: 'maps', loadChildren: './pages/maps/maps.module#MapsModule' }
|
||||
{ path: 'dashboard', loadChildren: 'app/pages/dashboard/dashboard.module#DashboardModule' },
|
||||
{ path: 'editors', loadChildren: 'app/pages/editors/editors.module#EditorsModule' },
|
||||
{ path: 'charts', loadChildren: 'app/pages/charts/charts.module#ChartsModule' },
|
||||
{ path: 'ui', loadChildren: 'app/pages/ui/ui.module#UiModule' },
|
||||
{ path: 'forms', loadChildren: 'app/pages/forms/forms.module#FormsModule' },
|
||||
{ path: 'tables', loadChildren: 'app/pages/tables/tables.module#TablesModule' },
|
||||
{ path: 'maps', loadChildren: 'app/pages/maps/maps.module#MapsModule' }
|
||||
]
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import {
|
|||
} from '@angular/core';
|
||||
|
||||
import * as Chartist from 'chartist';
|
||||
import 'style!./baChartistChart.scss';
|
||||
import 'style-loader!./baChartistChart.scss';
|
||||
|
||||
@Component({
|
||||
selector: 'ba-chartist-chart',
|
||||
|
|
@ -24,7 +24,7 @@ export class BaChartistChart {
|
|||
@Input() baChartistChartClass:string;
|
||||
@Output() onChartReady = new EventEmitter<any>();
|
||||
|
||||
@ViewChild('baChartistChart') public _selector:ElementRef;
|
||||
@ViewChild('baChartistChart') public _selector: ElementRef;
|
||||
|
||||
private chart;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import {Component, ElementRef, HostListener, ViewEncapsulation} from '@angular/c
|
|||
import {GlobalState} from '../../../global.state';
|
||||
import {layoutSizes} from '../../../theme';
|
||||
|
||||
import 'style!./baSidebar.scss';
|
||||
import 'style-loader!./baSidebar.scss';
|
||||
|
||||
@Component({
|
||||
selector: 'ba-sidebar',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue