Merge branch 'master' of https://github.com/akveo/ng2-admin

# Conflicts:
#	src/app/theme/components/baSidebar/baSidebar.service.ts

CHANGELOG.md

@@ -1,3 +1,21 @@
+<a name="0.3.0"></a>
+# 0.3.0 (2016-06-29)
+
+### Bug Fixes
+
+* Sidebar menu angle fixed
+* Sidebar menu selected item fixed
+
+### Features
+
+* Angular updated to rc.3
+* Dependencies updated accordingly
+
+### How to update
+
+* Remove `node_modules` and `typings` folders 
+* run `npm install`
+
 <a name="0.2.1"></a>
 # 0.2.1 (2016-06-21)
 
@@ -19,5 +37,4 @@
 ### How to update
 
 * Remove `node_modules` and `typings` folders 
-* run `npm install`
-
+* run `npm install`

package.json

@@ -1,19 +1,19 @@
 {
   "name": "ng2-admin",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Angular 2 and Bootstrap 4 Admin Template.",
   "author": "akveo",
   "homepage": "http://akveo.github.io/ng2-admin/",
   "license": "MIT",
   "dependencies": {
-    "@angular/common": "2.0.0-rc.2",
-    "@angular/compiler": "2.0.0-rc.2",
-    "@angular/core": "2.0.0-rc.2",
-    "@angular/http": "2.0.0-rc.2",
-    "@angular/platform-browser": "2.0.0-rc.2",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.2",
-    "@angular/platform-server": "2.0.0-rc.2",
-    "@angular/router": "2.0.0-rc.2",
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/platform-server": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.8",
     "@angular/router-deprecated": "2.0.0-rc.2",
     "amcharts3": "github:amcharts/amcharts3",
     "ammap3": "github:amcharts/ammap3",
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "angular2-hmr": "~0.7.0",
-    "awesome-typescript-loader": "^1.0.0",
+    "awesome-typescript-loader": "1.1.1",
     "codelyzer": "~0.0.19",
     "compression-webpack-plugin": "^0.3.1",
     "copy-webpack-plugin": "^3.0.1",
@@ -71,7 +71,7 @@
     "ts-node": "^0.9.0",
     "tslint": "^3.7.1",
     "tslint-loader": "^2.1.3",
-    "typedoc": "^0.4.2",
+    "typedoc": "^0.4.4",
     "typescript": "~1.8.9",
     "typings": "^1.0.5",
     "url-loader": "^0.5.7",

src/app/theme/components/baSidebar/baSidebar.html

@@ -14,7 +14,7 @@
       <a *ngIf="item.subMenu" (mouseenter)="hoverItem($event, item)" (click)="toggleSubMenu($event, item)"
          class="al-sidebar-list-link">
         <i class="{{ item.icon }}"></i><span>{{ item.title }}</span>
-        <b class="fa" [ngClass]="{'fa-angle-up': item.expanded, 'fa-angle-down': !item.expanded}"
+        <b class="fa fa-angle-down"
            *ngIf="item.subMenu"></b>
       </a>
 

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

@@ -16,7 +16,7 @@ export class BaSidebarService {
   }
 
   public selectMenuItem(items:Array<any>) {
-    let currentMenu = null;
+    let currentMenu;
 
     let assignCurrent = (menu) => (menu.selected ? currentMenu = menu : null);
 
@@ -50,13 +50,4 @@ export class BaSidebarService {
   private _generateRoute(instructions) {
     return instructions.filter(i => typeof i !== 'undefined').length > 0 ? this._router.generate(instructions) : null;
   }
-
-  private _resolvePath(instruction, collected) {
-    if (instruction !== null) {
-      collected += instruction.urlPath + '/';
-      return this._resolvePath(instruction.child, collected)
-    } else {
-      return collected.slice(0, -1);
-    }
-  }
 }

src/platform/environment.ts

@@ -1,25 +1,39 @@
 // Angular 2
-import {enableProdMode} from '@angular/core';
-
+// rc2 workaround
+import { enableDebugTools, disableDebugTools } from '@angular/platform-browser';
+import { enableProdMode } from '@angular/core';
 // Environment Providers
-let PROVIDERS = [];
+let PROVIDERS = [
+  // common env directives
+];
+
+// Angular debug tools in the dev console
+// https://github.com/angular/angular/blob/86405345b781a9dc2438c0fbe3e9409245647019/TOOLS_JS.md
+let _decorateComponentRef = function identity(value) { return value; };
 
 if ('production' === ENV) {
   // Production
+  disableDebugTools();
   enableProdMode();
 
   PROVIDERS = [
-    ...PROVIDERS
+    ...PROVIDERS,
+    // custom providers in production
   ];
 
 } else {
+
+  _decorateComponentRef = (cmpRef) => enableDebugTools(cmpRef);
+
   // Development
   PROVIDERS = [
-    ...PROVIDERS
+    ...PROVIDERS,
+    // custom providers in development
   ];
 
 }
 
+export const decorateComponentRef = _decorateComponentRef;
 
 export const ENV_PROVIDERS = [
   ...PROVIDERS

typings.json

@@ -1,14 +1,14 @@
 {
   "globalDependencies": {
     "angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",
-    "core-js": "registry:dt/core-js#0.0.0+20160317120654",
+    "core-js": "registry:dt/core-js#0.0.0+20160602141332",
     "hammerjs": "registry:dt/hammerjs#2.0.4+20160417130828",
-    "jasmine": "registry:dt/jasmine#2.2.0+20160505161446",
-    "node": "registry:dt/node#6.0.0+20160514165920",
+    "jasmine": "registry:dt/jasmine#2.2.0+20160621224255",
+    "node": "registry:dt/node#6.0.0+20160621231320",
     "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654",
     "source-map": "registry:dt/source-map#0.0.0+20160317120654",
     "uglify-js": "registry:dt/uglify-js#2.6.1+20160316155526",
-    "webpack": "registry:dt/webpack#1.12.9+20160321060707"
+    "webpack": "registry:dt/webpack#1.12.9+20160523035535"
   },
   "dependencies": {
     "lodash": "registry:npm/lodash#4.0.0+20160416211519"