From 1c10938efed7e3fe6566a0984f28ea4c060b0923 Mon Sep 17 00:00:00 2001 From: Alexander Zhukov Date: Sat, 21 Jan 2017 17:22:19 +0300 Subject: [PATCH] feat(loader): remove loaders --- docs/contents/articles/012-project-structure/index.md | 1 - src/app/app.loader.ts | 2 -- src/app/pages/dashboard/pieChart/pieChart.component.ts | 2 +- src/app/pages/dashboard/pieChart/pieChart.loader.ts | 1 - .../dashboard/trafficChart/trafficChart.component.ts | 1 - .../pages/dashboard/trafficChart/trafficChart.loader.ts | 3 --- .../maps/components/googleMaps/googleMaps.loader.ts | 1 - .../maps/components/leafletMaps/leafletMaps.component.ts | 2 +- .../maps/components/leafletMaps/leafletMaps.loader.ts | 1 - .../theme/components/baAmChart/baAmChart.component.ts | 9 ++++++++- src/app/theme/components/baAmChart/baAmChart.loader.ts | 6 ------ .../baFullCalendar/baFullCalendar.component.ts | 2 +- .../components/baFullCalendar/baFullCalendar.loader.ts | 1 - .../directives/baSlimScroll/baSlimScroll.directive.ts | 2 +- .../theme/directives/baSlimScroll/baSlimScroll.loader.ts | 1 - 15 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 src/app/app.loader.ts delete mode 100644 src/app/pages/dashboard/pieChart/pieChart.loader.ts delete mode 100644 src/app/pages/dashboard/trafficChart/trafficChart.loader.ts delete mode 100644 src/app/pages/maps/components/googleMaps/googleMaps.loader.ts delete mode 100644 src/app/pages/maps/components/leafletMaps/leafletMaps.loader.ts delete mode 100644 src/app/theme/components/baAmChart/baAmChart.loader.ts delete mode 100644 src/app/theme/components/baFullCalendar/baFullCalendar.loader.ts delete mode 100644 src/app/theme/directives/baSlimScroll/baSlimScroll.loader.ts diff --git a/docs/contents/articles/012-project-structure/index.md b/docs/contents/articles/012-project-structure/index.md index 78cac03c..7ccd85ad 100644 --- a/docs/contents/articles/012-project-structure/index.md +++ b/docs/contents/articles/012-project-structure/index.md @@ -46,7 +46,6 @@ ng2-admin/ │ │ │ │ │ ├──app.component.ts * main application component │ │ │ - │ │ ├──app.loader.ts * requires initial css styles (most important for application loading stage) │ │ │ │ │ ├──app.menu.ts * menu pages routes │ │ │ diff --git a/src/app/app.loader.ts b/src/app/app.loader.ts deleted file mode 100644 index c1ff14f7..00000000 --- a/src/app/app.loader.ts +++ /dev/null @@ -1,2 +0,0 @@ -// this css loaded separately as a standalone file to speed up the initial styles loading -import './theme/initial.scss'; diff --git a/src/app/pages/dashboard/pieChart/pieChart.component.ts b/src/app/pages/dashboard/pieChart/pieChart.component.ts index 5c165d36..e009f4d3 100644 --- a/src/app/pages/dashboard/pieChart/pieChart.component.ts +++ b/src/app/pages/dashboard/pieChart/pieChart.component.ts @@ -2,7 +2,7 @@ import {Component, ViewEncapsulation} from '@angular/core'; import {PieChartService} from './pieChart.service'; -import './pieChart.loader.ts'; +import 'easy-pie-chart/dist/jquery.easypiechart.js'; import 'style-loader!./pieChart.scss'; @Component({ diff --git a/src/app/pages/dashboard/pieChart/pieChart.loader.ts b/src/app/pages/dashboard/pieChart/pieChart.loader.ts deleted file mode 100644 index 3470558f..00000000 --- a/src/app/pages/dashboard/pieChart/pieChart.loader.ts +++ /dev/null @@ -1 +0,0 @@ -import 'easy-pie-chart/dist/jquery.easypiechart.js'; diff --git a/src/app/pages/dashboard/trafficChart/trafficChart.component.ts b/src/app/pages/dashboard/trafficChart/trafficChart.component.ts index dce1916e..80d653c9 100644 --- a/src/app/pages/dashboard/trafficChart/trafficChart.component.ts +++ b/src/app/pages/dashboard/trafficChart/trafficChart.component.ts @@ -1,6 +1,5 @@ import {Component} from '@angular/core'; -import './trafficChart.loader.ts'; import {TrafficChartService} from './trafficChart.service'; import * as Chart from 'chart.js'; diff --git a/src/app/pages/dashboard/trafficChart/trafficChart.loader.ts b/src/app/pages/dashboard/trafficChart/trafficChart.loader.ts deleted file mode 100644 index b28b04f6..00000000 --- a/src/app/pages/dashboard/trafficChart/trafficChart.loader.ts +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/app/pages/maps/components/googleMaps/googleMaps.loader.ts b/src/app/pages/maps/components/googleMaps/googleMaps.loader.ts deleted file mode 100644 index 816e69b5..00000000 --- a/src/app/pages/maps/components/googleMaps/googleMaps.loader.ts +++ /dev/null @@ -1 +0,0 @@ -import * as GoogleMapsLoader from 'google-maps'; diff --git a/src/app/pages/maps/components/leafletMaps/leafletMaps.component.ts b/src/app/pages/maps/components/leafletMaps/leafletMaps.component.ts index 6e5f410f..f6d07349 100644 --- a/src/app/pages/maps/components/leafletMaps/leafletMaps.component.ts +++ b/src/app/pages/maps/components/leafletMaps/leafletMaps.component.ts @@ -1,6 +1,6 @@ import {Component, ElementRef} from '@angular/core'; -import './leafletMaps.loader'; +import 'leaflet-map'; @Component({ selector: 'leaflet-maps', diff --git a/src/app/pages/maps/components/leafletMaps/leafletMaps.loader.ts b/src/app/pages/maps/components/leafletMaps/leafletMaps.loader.ts deleted file mode 100644 index ae5ee456..00000000 --- a/src/app/pages/maps/components/leafletMaps/leafletMaps.loader.ts +++ /dev/null @@ -1 +0,0 @@ -import 'leaflet-map'; diff --git a/src/app/theme/components/baAmChart/baAmChart.component.ts b/src/app/theme/components/baAmChart/baAmChart.component.ts index 6f9594c1..b653a5e6 100644 --- a/src/app/theme/components/baAmChart/baAmChart.component.ts +++ b/src/app/theme/components/baAmChart/baAmChart.component.ts @@ -2,7 +2,14 @@ import {Component, ViewChild, Input, Output, ElementRef, EventEmitter} from '@an import {BaThemePreloader} from '../../../theme/services'; -import './baAmChart.loader.ts'; +import 'amcharts3'; +import 'amcharts3/amcharts/plugins/responsive/responsive.js'; +import 'amcharts3/amcharts/serial.js'; + +import 'ammap3'; +import 'ammap3/ammap/maps/js/worldLow'; + + import {BaAmChartThemeService} from './baAmChartTheme.service'; import 'style-loader!./baAmChart.scss'; diff --git a/src/app/theme/components/baAmChart/baAmChart.loader.ts b/src/app/theme/components/baAmChart/baAmChart.loader.ts deleted file mode 100644 index 47f4dfe1..00000000 --- a/src/app/theme/components/baAmChart/baAmChart.loader.ts +++ /dev/null @@ -1,6 +0,0 @@ -import 'amcharts3'; -import 'amcharts3/amcharts/plugins/responsive/responsive.js'; -import 'amcharts3/amcharts/serial.js'; - -import 'ammap3'; -import 'ammap3/ammap/maps/js/worldLow'; diff --git a/src/app/theme/components/baFullCalendar/baFullCalendar.component.ts b/src/app/theme/components/baFullCalendar/baFullCalendar.component.ts index f548026e..3f113dd7 100644 --- a/src/app/theme/components/baFullCalendar/baFullCalendar.component.ts +++ b/src/app/theme/components/baFullCalendar/baFullCalendar.component.ts @@ -1,6 +1,6 @@ import {Component, ViewChild, Input, Output, ElementRef, EventEmitter} from '@angular/core'; -import './baFullCalendar.loader.ts'; +import 'fullcalendar/dist/fullcalendar.js'; import 'style-loader!./baFullCalendar.scss'; diff --git a/src/app/theme/components/baFullCalendar/baFullCalendar.loader.ts b/src/app/theme/components/baFullCalendar/baFullCalendar.loader.ts deleted file mode 100644 index 1ff83d37..00000000 --- a/src/app/theme/components/baFullCalendar/baFullCalendar.loader.ts +++ /dev/null @@ -1 +0,0 @@ -import 'fullcalendar/dist/fullcalendar.js'; diff --git a/src/app/theme/directives/baSlimScroll/baSlimScroll.directive.ts b/src/app/theme/directives/baSlimScroll/baSlimScroll.directive.ts index 2b5a2c83..f01860b7 100644 --- a/src/app/theme/directives/baSlimScroll/baSlimScroll.directive.ts +++ b/src/app/theme/directives/baSlimScroll/baSlimScroll.directive.ts @@ -1,6 +1,6 @@ import {Directive, Input, Output, ElementRef, EventEmitter} from '@angular/core'; -import './baSlimScroll.loader.ts'; +import 'jquery-slimscroll'; @Directive({ selector: '[baSlimScroll]' diff --git a/src/app/theme/directives/baSlimScroll/baSlimScroll.loader.ts b/src/app/theme/directives/baSlimScroll/baSlimScroll.loader.ts deleted file mode 100644 index 3103aa5c..00000000 --- a/src/app/theme/directives/baSlimScroll/baSlimScroll.loader.ts +++ /dev/null @@ -1 +0,0 @@ -import 'jquery-slimscroll';