start-angular
diff --git a/‎app/app.component.js renamed to ‎client/app.component.js
Lines changed: 2 additions & 1 deletion b/‎app/app.component.js renamed to ‎client/app.component.js
Lines changed: 2 additions & 1 deletion
diff --git a/‎app/app.component.ts renamed to ‎client/app.component.ts
Lines changed: 1 addition & 33 deletions b/‎app/app.component.ts renamed to ‎client/app.component.ts
Lines changed: 1 addition & 33 deletions
diff --git a/‎app/app.module.js renamed to ‎client/app.module.js b/‎app/app.module.js renamed to ‎client/app.module.js
diff --git a/‎app/app.module.ts renamed to ‎client/app.module.ts b/‎app/app.module.ts renamed to ‎client/app.module.ts
diff --git a/‎app/main.js renamed to ‎client/main.js b/‎app/main.js renamed to ‎client/main.js
diff --git a/‎app/main.ts renamed to ‎client/main.ts b/‎app/main.ts renamed to ‎client/main.ts
diff --git a/‎app/package.json renamed to ‎client/package.json b/‎app/package.json renamed to ‎client/package.json
diff --git a/‎index.js
Lines changed: 0 additions & 37 deletions b/‎index.js
Lines changed: 0 additions & 37 deletions
diff --git a/‎index.html renamed to ‎server/index.html
Lines changed: 2 additions & 6 deletions b/‎index.html renamed to ‎server/index.html
Lines changed: 2 additions & 6 deletions
diff --git a/‎server/index.js
Lines changed: 35 additions & 0 deletions b/‎server/index.js
Lines changed: 35 additions & 0 deletions
@@ -16,13 +16,14 @@ var AppComponent = (function () {
     AppComponent = __decorate([
         core_1.Component({
             selector: 'my-app',
-            template: "<h1>{{title}}</h1>\n  \t\t\t\n\n  \t\t\t"
+            template: "<h1>{{title}}</h1>"
         })
     ], AppComponent);
     return AppComponent;
 }());
 exports.AppComponent = AppComponent;
 var socket = io();
+//io.connect();
 $('form').submit(function () {
     socket.emit('chatMessageToSocketServer', $('#message-box').val());
     $('#message-box').val('');
 
@@ -7,10 +7,7 @@ import  "http://code.jquery.com/jquery-1.11.1.js";
 
 @Component({
   selector: 'my-app',
-  template: `<h1>{{title}}</h1>
-  			
-
-  			`
+  template: `<h1>{{title}}</h1>`
 })
 export class AppComponent { 
   title = 'Angular 2 Working!';
@@ -25,35 +22,6 @@ export class AppComponent {
   socket.on('broadcastToAll_chatMessage', function(msg){
     $('#messages').append($('<li>').text(msg));
   });
-  
-  //heroes: Hero[];
-  // heroes=HEROES;
-  // selectedHero: Hero;
-
-  //constructor(private heroService: HeroService) { }
-
-  
-  // getHeroes(): void {
-  //  this.heroService.getHeroes().then(heroes => this.heroes = heroes);
-  // }
-
-  // getHeroes(): void {
-  //   this.heroes = this.heroService.getHeroes();
-  // }
-
-  // ngOnInit(): void {
-  //  this.getHeroes();
-  // }
-
-
-  // onSelect(hero: Hero): void {
-  // this.selectedHero = hero;
-  // }
-
-  // hero: Hero = {
-  //  id: 1,
-  //  name: 'Windstorm'
-  // };
 }
 
 
@@ -1,9 +1,6 @@
 <html>
   <head>
     <title>Angular2_Node_chatApp</title>
-    <!-- <style>
-     /* * { margin: 0; padding: 0; box-sizing: border-box; }*/
-    </style> -->
 
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -17,12 +14,11 @@
 
     <!-- 2. Configure SystemJS -->
     <script src="systemjs.config.js"></script>
-    
     <script src="socket.io/socket.io.js"></script>
 
     <script>
-       System.import('app').catch(function(err){ console.error(err); });
-      //var socket = io();
+      //Client Code(Angular2)
+       System.import('client').catch(function(err){ console.error(err); });
     </script>
   </head>
   <!-- 3. Display the application -->
 
@@ -0,0 +1,35 @@
+"use strict";
+let express = require("express");
+var path = require('path');
+let chat_app = require('express')();
+let http = require('http').Server(chat_app);
+let io = require('socket.io')(http);
+
+
+chat_app.use(express.static(__dirname, '/'));
+
+chat_app.use(express.static(__dirname, '/server/'));
+chat_app.use(express.static(__dirname + "/..", '/client/'));
+chat_app.use(express.static(__dirname + '/node_modules'));
+
+chat_app.get('/', function(req, res){
+  res.sendFile(__dirname + '/index.html');
+});
+
+io.on('connection', function(socket){
+	console.log("user connected to socket : ",socket.id);
+  //console.log('a user connected');
+  
+socket.on('disconnect', function(){
+  console.log('user disconnected');
+});
+
+socket.on('chatMessageToSocketServer', function(msg){
+  console.log('user sent message : '+msg);
+  io.emit('broadcastToAll_chatMessage', msg);
+  });
+});
+
+http.listen(3000, function(){
+  console.log('listening on *:3000');
+});