angular updated to rc1

src/app/app.component.ts

@@ -1,5 +1,5 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
-import {RouteConfig, Router} from 'angular2/router';
+import {Component, ViewEncapsulation} from '@angular/core';
+import {RouteConfig, Router} from '@angular/router-deprecated';
 import {Subscription} from 'rxjs/Subscription';
 
 import {Pages} from './pages';

src/app/pages/charts/charts.component.ts

@@ -1,7 +1,7 @@
-import {Component} from 'angular2/core';
-import {RouteConfig} from 'angular2/router';
+import {Component} from '@angular/core';
+import {RouteConfig} from '@angular/router-deprecated';
 
-import {ChartJs} from "./components/chartJs";
+// import {ChartJs} from "./components/chartJs";
 import {ChartistJs} from "./components/chartistJs/chartistJs.component";
 
 @Component({
@@ -12,17 +12,17 @@ import {ChartistJs} from "./components/chartistJs/chartistJs.component";
   template: `<router-outlet></router-outlet>`
 })
 @RouteConfig([
-  {
-    name: 'ChartJs',
-    component: ChartJs,
-    path: '/chart-js',
-    useAsDefault: true,
-  },
   {
     name: 'ChartistJs',
     component: ChartistJs,
     path: '/chartist-js',
-  }
+    useAsDefault: true,
+  },
+  // {
+  //   name: 'ChartJs',
+  //   component: ChartJs,
+  //   path: '/chart-js',
+  // },
 ])
 export class Charts {
 

src/app/pages/charts/components/chartJs/chartJs.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 import {BaCard} from '../../../../theme/components';
 
 import {ChartJsService} from "./chartJs.service";

src/app/pages/charts/components/chartJs/chartJs.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import {Injectable} from '@angular/core';
 
 @Injectable()
 export class ChartJsService {

src/app/pages/charts/components/chartistJs/chartistJs.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 import {BaCard} from '../../../../theme/components';
 
 import {ChartistJsService} from "./chartistJs.service";

src/app/pages/charts/components/chartistJs/chartistJs.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import {Injectable} from '@angular/core';
 
 @Injectable()
 export class ChartistJsService {

src/app/pages/dashboard/calendar/calendar.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 
 import './calendar.loader.ts';
 import {layoutColors} from "../../../theme/theme.constants";

src/app/pages/dashboard/dashboard.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 
 import {PopularApp} from './popularApp';
 import {PieChart} from './pieChart';

src/app/pages/dashboard/feed/feed.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 
 import {ProfilePicturePipe, AppPicturePipe} from '../../../theme/pipes';
 import {FeedService} from './feed.service';

src/app/pages/dashboard/feed/feed.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import {Injectable} from '@angular/core';
 
 @Injectable()
 export class FeedService {

src/app/pages/dashboard/lineChart/lineChart.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 
 import {LineChartService} from './lineChart.service';
 import {BaAmChart} from '../../../theme/components';

src/app/pages/dashboard/lineChart/lineChart.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import {Injectable} from '@angular/core';
 import {layoutColors, layoutPaths} from '../../../theme';
 
 @Injectable()

src/app/pages/dashboard/pieChart/pieChart.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 
 import {BaCard} from '../../../theme/components';
 import {PieChartService} from './pieChart.service';

src/app/pages/dashboard/pieChart/pieChart.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import {Injectable} from '@angular/core';
 
 @Injectable()
 export class PieChartService {

src/app/pages/dashboard/popularApp/popularApp.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 
 import {AppPicturePipe} from '../../../theme/pipes';
 

src/app/pages/dashboard/todo/todo.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 
 import {TodoService} from './todo.service';
 

src/app/pages/dashboard/todo/todo.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import {Injectable} from '@angular/core';
 
 @Injectable()
 export class TodoService {

src/app/pages/dashboard/trafficChart/trafficChart.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation, ElementRef} from 'angular2/core';
+import {Component, ViewEncapsulation, ElementRef} from '@angular/core';
 
 import './trafficChart.loader.ts';
 import {TrafficChartService} from './trafficChart.service';

src/app/pages/dashboard/trafficChart/trafficChart.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import {Injectable} from '@angular/core';
 import {layoutColors} from '../../../theme';
 
 @Injectable()

src/app/pages/dashboard/usersMap/usersMap.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 
 import {UsersMapService} from './usersMap.service';
 import {BaAmChart} from '../../../theme/components';

src/app/pages/dashboard/usersMap/usersMap.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import {Injectable} from '@angular/core';
 import {layoutColors, layoutPaths} from '../../../theme';
 
 @Injectable()

src/app/pages/maps/components/bubbleMaps/bubbleMaps.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 import {BaCard} from '../../../../theme/components';
 
 import {layoutPaths} from "../../../../theme/theme.constants";

src/app/pages/maps/components/bubbleMaps/bubbleMaps.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import {Injectable} from '@angular/core';
 import {layoutColors} from "../../../../theme/theme.constants";
 
 @Injectable()

src/app/pages/maps/components/googleMaps/googleMaps.component.ts

@@ -1,6 +1,5 @@
-import {Component, ViewEncapsulation, ElementRef} from 'angular2/core';
+import {Component, ViewEncapsulation, ElementRef} from '@angular/core';
 import {BaCard} from '../../../../theme/components';
-import {DOM} from "angular2/src/platform/dom/dom_adapter";
 
 @Component({
   selector: 'google-maps',
@@ -16,7 +15,7 @@ export class GoogleMaps {
   }
 
   ngAfterViewInit() {
-    let el = DOM.querySelector(this._elementRef.nativeElement, '.google-maps');
+    let el = this._elementRef.nativeElement.querySelector('.google-maps');
 
     // TODO: do not load this each time as we already have the library after first attempt
     GoogleMapsLoader.load((google) => {

src/app/pages/maps/components/leafletMaps/leafletMaps.component.ts

@@ -1,6 +1,5 @@
-import {Component, ViewEncapsulation, ElementRef} from 'angular2/core';
+import {Component, ViewEncapsulation, ElementRef} from '@angular/core';
 import {BaCard} from '../../../../theme/components';
-import {DOM} from "angular2/src/platform/dom/dom_adapter";
 
 @Component({
   selector: 'leaflet-maps',
@@ -18,7 +17,7 @@ export class LeafletMaps {
   }
 
   ngAfterViewInit() {
-    let el = DOM.querySelector(this._elementRef.nativeElement, '.leaflet-maps');
+    let el = this._elementRef.nativeElement.querySelector('.leaflet-maps');
 
     L.Icon.Default.imagePath = 'assets/img/theme/vendor/leaflet';
     var map = L.map(el).setView([51.505, -0.09], 13);

src/app/pages/maps/components/lineMaps/lineMaps.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 import {BaCard} from '../../../../theme/components';
 
 import {layoutColors, layoutPaths} from "../../../../theme/theme.constants";

src/app/pages/maps/components/lineMaps/lineMaps.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import {Injectable} from '@angular/core';
 import {layoutColors} from "../../../../theme/theme.constants";
 
 @Injectable()

src/app/pages/maps/maps.component.ts

@@ -1,5 +1,5 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
-import {RouteConfig} from 'angular2/router';
+import {Component, ViewEncapsulation} from '@angular/core';
+import {RouteConfig} from '@angular/router-deprecated';
 
 import {GoogleMaps} from './components/googleMaps';
 import {LeafletMaps} from "./components/leafletMaps";

src/app/pages/pages.component.ts

@@ -1,5 +1,5 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
-import {RouteConfig} from 'angular2/router';
+import {Component, ViewEncapsulation} from '@angular/core';
+import {RouteConfig} from '@angular/router-deprecated';
 
 import {PageTop, ContentTop, Sidebar} from '../theme/components';
 

src/app/pages/ui/components/typography/typography.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 
 @Component({
   selector: 'typography',

src/app/pages/ui/ui.component.ts

@@ -1,5 +1,5 @@
-import {Component, ViewEncapsulation} from 'angular2/core';
-import {RouteConfig} from 'angular2/router';
+import {Component, ViewEncapsulation} from '@angular/core';
+import {RouteConfig} from '@angular/router-deprecated';
 
 import {Typography} from './components/typography';
 

src/app/theme/components/baAmChart/baAmChart.component.ts

@@ -1,7 +1,6 @@
-import {Component, ViewEncapsulation, Input, Output, ElementRef, EventEmitter} from 'angular2/core';
+import {Component, ViewEncapsulation, Input, Output, ElementRef, EventEmitter} from '@angular/core';
 
 import './baAmChart.loader.ts';
-import {DOM} from "angular2/src/platform/dom/dom_adapter";
 import {BaAmChartThemeService} from './baAmChartTheme.service';
 
 @Component({
@@ -25,7 +24,7 @@ export class BaAmChart {
   }
 
   ngAfterViewInit() {
-    let el = DOM.querySelector(this._elementRef.nativeElement, '.ba-am-chart');
+    let el = this._elementRef.nativeElement.querySelector('.ba-am-chart');
 
     let chart = AmCharts.makeChart(el, this.baAmChartConfiguration);
     this.onChartReady.emit(chart);

src/app/theme/components/baAmChart/baAmChartTheme.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import {Injectable} from '@angular/core';
 
 import {layoutColors} from '../../../theme/theme.constants';
 

src/app/theme/components/baCard/baCard.component.ts

@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation, Input} from 'angular2/core';
+import {Component, ViewEncapsulation, Input} from '@angular/core';
 
 import {BaCardBlur} from './baCardBlur.directive';
 

src/app/theme/components/baCard/baCardBlur.directive.ts

@@ -1,4 +1,4 @@
-import {Directive, ElementRef, HostListener} from 'angular2/core';
+import {Directive, ElementRef, HostListener} from '@angular/core';
 import {BaCardBlurHelper} from './baCardBlurHelper.service';
 
 import {BgMetrics} from './bgMetrics';

src/app/theme/components/baCard/baCardBlurHelper.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core'
+import {Injectable} from '@angular/core'
 import {BgMetrics} from './bgMetrics';
 import {Subject} from 'rxjs/Subject';
 

src/app/theme/components/contentTop/contentTop.component.ts

@@ -1,4 +1,4 @@
-import {Component} from 'angular2/core';
+import {Component} from '@angular/core';
 import {Subscription} from "rxjs/Subscription";
 
 import {ThemeGlobal} from "../../../theme";

src/app/theme/components/msgCenter/msgCenter.component.ts

@@ -1,4 +1,4 @@
-import {Component} from 'angular2/core';
+import {Component} from '@angular/core';
 
 import {ProfilePicturePipe} from '../../pipes';
 

src/app/theme/components/pageTop/pageTop.component.ts

@@ -1,4 +1,4 @@
-import {Component} from 'angular2/core';
+import {Component} from '@angular/core';
 
 import {ThemeGlobal} from '../../../theme';
 import {ProfilePicturePipe} from '../../pipes';

src/app/theme/components/sidebar/sidebar.component.ts

@@ -1,5 +1,5 @@
-import {Component, ElementRef, HostListener, ViewEncapsulation} from 'angular2/core';
-import {Router} from 'angular2/router';
+import {Component, ElementRef, HostListener, ViewEncapsulation} from '@angular/core';
+import {Router} from '@angular/router-deprecated';
 
 import {ThemeGlobal, layoutSizes} from '../../../theme';
 import {SidebarService} from './sidebar.service';

src/app/theme/components/sidebar/sidebar.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import {Injectable} from '@angular/core';
 
 @Injectable()
 export class SidebarService {
@@ -60,10 +60,10 @@ export class SidebarService {
       expanded: false,
       order: 400,
       subMenu: [
-        {
-          title: 'Chart Js',
-          name: 'ChartJs',
-        },
+        // {
+        //   title: 'Chart Js',
+        //   name: 'ChartJs',
+        // },
         {
           title: 'ChartistJs',
           name: 'ChartistJs',

src/app/theme/directives/scrollPosition/scrollPosition.directive.ts

@@ -1,4 +1,4 @@
-import {Directive, Input, Output, EventEmitter, HostListener} from 'angular2/core';
+import {Directive, Input, Output, EventEmitter, HostListener} from '@angular/core';
 
 @Directive({
   selector: '[scrollPosition]'

src/app/theme/pipes/appPicture/appPicture.pipe.ts

@@ -1,4 +1,4 @@
-import {Pipe, PipeTransform} from 'angular2/core';
+import {Pipe, PipeTransform} from '@angular/core';
 import {layoutPaths} from '../../../theme';
 
 @Pipe({name: 'appPicture'})

src/app/theme/pipes/profilePicture/profilePicture.pipe.ts

@@ -1,4 +1,4 @@
-import {Pipe, PipeTransform} from 'angular2/core';
+import {Pipe, PipeTransform} from '@angular/core';
 import {layoutPaths} from '../../../theme';
 
 @Pipe({name: 'profilePicture'})

src/app/theme/theme.global.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core'
+import {Injectable} from '@angular/core'
 import {Subject}    from 'rxjs/Subject';
 
 @Injectable()