Angular rc.1

Author: Vlado Tesanovic

.gitignore

@@ -1,7 +1,7 @@
 node_modules
-public/assets/js/app
 .idea
 typings
 server/**/*.js
 server/**/*.js.map
-npm-debug.log
+client/**/*.js
+client/**/*.js.map

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Vlado Tesanovic
+Copyright (c) 2016 Vlado Tesanovic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

client/components/app.component.ts

@@ -0,0 +1,23 @@
+import { Component, Type } from "@angular/core";
+import { ROUTER_DIRECTIVES, Routes, Router } from '@angular/router';
+import { HomeComponent } from "./home/home.component";
+
+@Component({
+    directives: [ROUTER_DIRECTIVES],
+    selector: "app",
+    template: `
+	<div class="center">
+		<img src='https://angular.io/resources/images/logos/standard/shield-large.png'>
+	</div>
+	<router-outlet></router-outlet>`
+})
+@Routes([
+    { component: <Type>HomeComponent, path: "/home" }
+])
+export class AppComponent {
+    constructor(private router: Router) {}
+
+    ngOnInit() {
+        this.router.navigate(['/home']);
+    }
+}

client/components/home.html renamed to client/components/home/home.component.html

@@ -1,13 +1,12 @@
-import { Component } from "angular2/core";
-import { SEMANTIC_COMPONENTS, SEMANTIC_DIRECTIVES } from "ng-semantic";
-import { Http, Headers, RequestOptions } from "angular2/http";
+import { Component } from "@angular/core";
+// import { SEMANTIC_COMPONENTS, SEMANTIC_DIRECTIVES } from "ng-semantic";
+import { Http, Headers, RequestOptions } from "@angular/http";
 import 'rxjs/add/operator/map'
-import { config } from "../config";
 
 @Component({
-	directives: [SEMANTIC_COMPONENTS, SEMANTIC_DIRECTIVES],
+	directives: [/* SEMANTIC_COMPONENTS, SEMANTIC_DIRECTIVES */],
 	selector: "home",
-	templateUrl: config.templateUrl +  `components/home.html`
+	templateUrl: `client/components/home/home.component.html`
 })
 export class HomeComponent {
 	response: any;
@@ -35,8 +34,8 @@ export class HomeComponent {
 	}
 	call() {
 
-		delete this.error;
-		delete this.data;
+		this.error = undefined;
+		this.data = undefined;
 
 		this.http.get("/api", new RequestOptions({
 			headers: new Headers({"Auth": localStorage.getItem("jwt"), "Content-Type": "application/json"})
@@ -58,12 +57,12 @@ export class HomeComponent {
 			.map((res: any) => res.json())
 			.subscribe(
 				(res: any) => {
-					delete this.error;
+					this.error = undefined;
 					this.data = {
 						text: "You can call protected api now",
 						title: "Login succesfull"
 					};
-
+			
 					localStorage.setItem("jwt", res.jwt);
 				},
 				(error: any) => {
@@ -73,7 +72,7 @@ export class HomeComponent {
 	}
 	remove() {
 		this.error = { message: "JWT removed" };
-		delete this.data;
+		this.data = undefined;
 		localStorage.removeItem("jwt");
 	}
 }

client/components/home.ts renamed to client/components/home/home.component.ts

@@ -1,28 +1,14 @@
 /// <reference path="../typings/browser.d.ts" />
-import { Component, provide } from "angular2/core";
-import { HTTP_PROVIDERS } from "angular2/http";
-import { bootstrap } from "angular2/platform/browser";
-import { ROUTER_PROVIDERS, RouterOutlet, LocationStrategy, RouteConfig, HashLocationStrategy } from "angular2/router";
+import { bootstrap } from '@angular/platform-browser-dynamic';
+import { provide, Type } from "@angular/core";
+import { HashLocationStrategy, LocationStrategy } from "@angular/common";
+import { HTTP_PROVIDERS } from "@angular/http";
+import { ROUTER_PROVIDERS } from '@angular/router';
 
-import { HomeComponent } from "./components/home";
+import { AppComponent } from "./components/app.component";
 
-@Component({
-	directives: [RouterOutlet],
-	selector: "app",
-	template: `
-	<div class="center">
-		<img src='https://angular.io/resources/images/logos/standard/shield-large.png'>
-	</div>
-	<router-outlet></router-outlet>`
-})
-@RouteConfig([
-	{ component: HomeComponent, path: "/" }
-])
-
-class AppComponent { }
-
-bootstrap(AppComponent, [
+bootstrap(<Type>AppComponent, [
 	ROUTER_PROVIDERS,
 	HTTP_PROVIDERS,
-	provide(LocationStrategy, { useClass: HashLocationStrategy })
+	provide(LocationStrategy, {useClass: <Type>HashLocationStrategy})
 ]);

client/config.ts

@@ -4,7 +4,6 @@
         "module": "system",
         "moduleResolution": "node",
         "sourceRoot": "./client",
-        "outDir": "../public/assets/js/app",
         "sourceMap": true,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,

client/main.ts

@@ -6,7 +6,9 @@
   "private": true,
   "scripts": {
     "develop": "concurrently \"tsc -w -p ./server\" \"tsc -w -p ./client\" \"nodemon ./server/bin/www\" ",
-    "typings": "typings install"
+    "typings": "typings install",
+    "bundle": "node tools/builder.js",
+    "bundle:prod": "node tools/builder.js --prod"
   },
   "engines": {
     "node": ">= 5.4.1 < 6"
@@ -23,19 +25,28 @@
     "serve-favicon": "~2.3.0"
   },
   "devDependencies": {
-    "angular2": "^2.0.0-beta.15",
+    "@angular/common": "2.0.0-rc.1",
+    "@angular/compiler": "2.0.0-rc.1",
+    "@angular/core": "2.0.0-rc.1",
+    "@angular/http": "2.0.0-rc.1",
+    "@angular/platform-browser": "2.0.0-rc.1",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.1",
+    "@angular/router": "2.0.0-rc.1",
+    "@angular/router-deprecated": "2.0.0-rc.1",
+    "@angular/upgrade": "2.0.0-rc.1",
+    "angular2-in-memory-web-api": "0.0.9",
     "angular2-jwt": "^0.1.9",
     "concurrently": "^2.0.0",
-    "es6-promise": "^3.0.2",
-    "es6-shim": "0.35.0",
+    "core-js": "^2.4.0",
     "ng-semantic": "^1.0.21",
     "nodemon": "^1.9.1",
-    "recursive-copy": "^2.0.3",
-    "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
-    "systemjs": "^0.19.26",
+    "reflect-metadata": "^0.1.3",
+    "rxjs": "5.0.0-beta.6",
+    "systemjs": "0.19.27",
+    "systemjs-builder": "^0.15.17",
     "typescript": "^1.8.10",
-    "typings": "^0.7.12",
-    "zone.js": "0.6.10"
+    "typings": "^0.8.1",
+    "yargs": "^4.7.1",
+    "zone.js": "^0.6.12"
   }
 }