Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-01-23 17:56:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(dependencies): update angular to 2.4.3. DLL Integration

Browse source
This commit is contained in:
Alexander Zhukov 2017-01-20 18:18:59 +03:00
parent 4112676ae9
commit ea7342008a
21 changed files with 175 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/pages/charts/components/chartistJs/chartistJs.component.ts
View file

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

2
src/app/pages/dashboard/calendar/calendar.component.ts
View file

@ -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
src/app/pages/dashboard/lineChart/lineChart.component.ts
View file

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

2
src/app/pages/dashboard/pieChart/pieChart.component.ts
View file

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

2
src/app/pages/dashboard/popularApp/popularApp.component.ts
View file

@ -1,5 +1,5 @@
import {Component} from '@angular/core';
import 'style!./popularApp.scss';
import 'style-loader!./popularApp.scss';
@Component({
selector: 'popular-app',

2
src/app/pages/dashboard/usersMap/usersMap.component.ts
View file

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

2
src/app/pages/maps/components/bubbleMaps/bubbleMaps.component.ts
View file

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

2
src/app/pages/maps/components/lineMaps/lineMaps.component.ts
View file

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

19
src/app/pages/pages.routing.ts
View file

@ -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' }
]
}
];