diff --git a/.gitignore b/.gitignore
index 00cbbdf..48a1cb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,11 @@
 # Logs
 logs
 *.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
 
 # Runtime data
 pids
 *.pid
 *.seed
-*.pid.lock
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
@@ -17,43 +13,33 @@ lib-cov
 # Coverage directory used by tools like istanbul
 coverage
 
-# nyc test coverage
-.nyc_output
-
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
 # Compiled binary addons (http://nodejs.org/api/addons.html)
 build/Release
 
-# Dependency directories
+# Dependency directory
+# Commenting this out is preferred by some people, see
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
 node_modules/
-jspm_packages/
-
-# Typescript v1 declaration files
 typings/
 
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
+# Users Environment Variables
+.lock-wscript
+.tsdrc
 
-# Output of 'npm pack'
-*.tgz
+#IDE configuration files
+.idea
+.vscode
 
-# Yarn Integrity file
-.yarn-integrity
 
-# dotenv environment variables file
-.env
+.DS_Store
 
+dist
+dev
+docs
+lib
+test
+tools/typings/tsd
+tmp
diff --git a/angular-chat-client/.angular-cli.json b/angular-chat-client/.angular-cli.json
new file mode 100644
index 0000000..5a1cf08
--- /dev/null
+++ b/angular-chat-client/.angular-cli.json
@@ -0,0 +1,60 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "project": {
+    "name": "angular-chat-client"
+  },
+  "apps": [
+    {
+      "root": "src",
+      "outDir": "dist",
+      "assets": [
+        "assets",
+        "favicon.ico"
+      ],
+      "index": "index.html",
+      "main": "main.ts",
+      "polyfills": "polyfills.ts",
+      "test": "test.ts",
+      "tsconfig": "tsconfig.app.json",
+      "testTsconfig": "tsconfig.spec.json",
+      "prefix": "app",
+      "styles": [
+        "styles.css"
+      ],
+      "scripts": [],
+      "environmentSource": "environments/environment.ts",
+      "environments": {
+        "dev": "environments/environment.ts",
+        "prod": "environments/environment.prod.ts"
+      }
+    }
+  ],
+  "e2e": {
+    "protractor": {
+      "config": "./protractor.conf.js"
+    }
+  },
+  "lint": [
+    {
+      "project": "src/tsconfig.app.json",
+      "exclude": "**/node_modules/**"
+    },
+    {
+      "project": "src/tsconfig.spec.json",
+      "exclude": "**/node_modules/**"
+    },
+    {
+      "project": "e2e/tsconfig.e2e.json",
+      "exclude": "**/node_modules/**"
+    }
+  ],
+  "test": {
+    "karma": {
+      "config": "./karma.conf.js"
+    }
+  },
+  "defaults": {
+    "styleExt": "css",
+    "component": {}
+  }
+}
diff --git a/angular-chat-client/.editorconfig b/angular-chat-client/.editorconfig
new file mode 100644
index 0000000..6e87a00
--- /dev/null
+++ b/angular-chat-client/.editorconfig
@@ -0,0 +1,13 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
diff --git a/angular-chat-client/.gitignore b/angular-chat-client/.gitignore
new file mode 100644
index 0000000..54bfd20
--- /dev/null
+++ b/angular-chat-client/.gitignore
@@ -0,0 +1,42 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+# System Files
+.DS_Store
+Thumbs.db
diff --git a/angular-chat-client/README.md b/angular-chat-client/README.md
new file mode 100644
index 0000000..82e5c97
--- /dev/null
+++ b/angular-chat-client/README.md
@@ -0,0 +1,27 @@
+# AngularChatClient
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.5.0.
+
+## Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
diff --git a/angular-chat-client/e2e/app.e2e-spec.ts b/angular-chat-client/e2e/app.e2e-spec.ts
new file mode 100644
index 0000000..81b5854
--- /dev/null
+++ b/angular-chat-client/e2e/app.e2e-spec.ts
@@ -0,0 +1,14 @@
+import { AppPage } from './app.po';
+
+describe('angular-chat-client App', () => {
+  let page: AppPage;
+
+  beforeEach(() => {
+    page = new AppPage();
+  });
+
+  it('should display welcome message', () => {
+    page.navigateTo();
+    expect(page.getParagraphText()).toEqual('Welcome to app!');
+  });
+});
diff --git a/angular-chat-client/e2e/app.po.ts b/angular-chat-client/e2e/app.po.ts
new file mode 100644
index 0000000..82ea75b
--- /dev/null
+++ b/angular-chat-client/e2e/app.po.ts
@@ -0,0 +1,11 @@
+import { browser, by, element } from 'protractor';
+
+export class AppPage {
+  navigateTo() {
+    return browser.get('/');
+  }
+
+  getParagraphText() {
+    return element(by.css('app-root h1')).getText();
+  }
+}
diff --git a/angular-chat-client/e2e/tsconfig.e2e.json b/angular-chat-client/e2e/tsconfig.e2e.json
new file mode 100644
index 0000000..1d9e5ed
--- /dev/null
+++ b/angular-chat-client/e2e/tsconfig.e2e.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/e2e",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "target": "es5",
+    "types": [
+      "jasmine",
+      "jasminewd2",
+      "node"
+    ]
+  }
+}
diff --git a/angular-chat-client/karma.conf.js b/angular-chat-client/karma.conf.js
new file mode 100644
index 0000000..af139fa
--- /dev/null
+++ b/angular-chat-client/karma.conf.js
@@ -0,0 +1,33 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular/cli'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular/cli/plugins/karma')
+    ],
+    client:{
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    coverageIstanbulReporter: {
+      reports: [ 'html', 'lcovonly' ],
+      fixWebpackSourcePaths: true
+    },
+    angularCli: {
+      environment: 'dev'
+    },
+    reporters: ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false
+  });
+};
diff --git a/angular-chat-client/package.json b/angular-chat-client/package.json
new file mode 100644
index 0000000..4f02ab7
--- /dev/null
+++ b/angular-chat-client/package.json
@@ -0,0 +1,52 @@
+{
+  "name": "angular-chat-client",
+  "version": "0.0.0",
+  "license": "MIT",
+  "scripts": {
+    "ng": "ng",
+    "start": "ng serve",
+    "build": "ng build",
+    "test": "ng test",
+    "lint": "ng lint",
+    "e2e": "ng e2e"
+  },
+  "private": true,
+  "dependencies": {
+    "@angular/animations": "^5.0.0",
+    "@angular/common": "^5.0.0",
+    "@angular/compiler": "^5.0.0",
+    "@angular/core": "^5.0.0",
+    "@angular/forms": "^5.0.0",
+    "@angular/http": "^5.0.0",
+    "@angular/platform-browser": "^5.0.0",
+    "@angular/platform-browser-dynamic": "^5.0.0",
+    "@angular/router": "^5.0.0",
+    "@types/node": "^6.0.90",
+    "core-js": "^2.4.1",
+    "rxjs": "^5.5.2",
+    "socket.io": "^2.0.4",
+    "socket.io-client": "^2.0.4",
+    "zone.js": "^0.8.14"
+  },
+  "devDependencies": {
+    "@angular/cli": "1.5.0",
+    "@angular/compiler-cli": "^5.0.0",
+    "@angular/language-service": "^5.0.0",
+    "@types/jasmine": "~2.5.53",
+    "@types/jasminewd2": "~2.0.2",
+    "@types/node": "~6.0.60",
+    "codelyzer": "~3.2.0",
+    "jasmine-core": "~2.6.2",
+    "jasmine-spec-reporter": "~4.1.0",
+    "karma": "~1.7.0",
+    "karma-chrome-launcher": "~2.1.1",
+    "karma-cli": "~1.0.1",
+    "karma-coverage-istanbul-reporter": "^1.2.1",
+    "karma-jasmine": "~1.1.0",
+    "karma-jasmine-html-reporter": "^0.2.2",
+    "protractor": "~5.1.2",
+    "ts-node": "~3.2.0",
+    "tslint": "~5.7.0",
+    "typescript": "~2.4.2"
+  }
+}
diff --git a/angular-chat-client/protractor.conf.js b/angular-chat-client/protractor.conf.js
new file mode 100644
index 0000000..7ee3b5e
--- /dev/null
+++ b/angular-chat-client/protractor.conf.js
@@ -0,0 +1,28 @@
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const { SpecReporter } = require('jasmine-spec-reporter');
+
+exports.config = {
+  allScriptsTimeout: 11000,
+  specs: [
+    './e2e/**/*.e2e-spec.ts'
+  ],
+  capabilities: {
+    'browserName': 'chrome'
+  },
+  directConnect: true,
+  baseUrl: 'http://localhost:4200/',
+  framework: 'jasmine',
+  jasmineNodeOpts: {
+    showColors: true,
+    defaultTimeoutInterval: 30000,
+    print: function() {}
+  },
+  onPrepare() {
+    require('ts-node').register({
+      project: 'e2e/tsconfig.e2e.json'
+    });
+    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+  }
+};
diff --git a/angular-chat-client/server/package.json b/angular-chat-client/server/package.json
new file mode 100644
index 0000000..8cd344f
--- /dev/null
+++ b/angular-chat-client/server/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "chat",
+  "version": "1.0.0",
+  "main": "server.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "node server.js"
+  },
+  "author": "",
+  "license": "ISC",
+  "description": "",
+  "dependencies": {
+    "express": "^4.16.2",
+    "jquery": "^3.2.1",
+    "path": "^0.12.7",
+    "socket.io": "^2.0.4"
+  }
+}
diff --git a/angular-chat-client/server/server.js b/angular-chat-client/server/server.js
new file mode 100644
index 0000000..5907bfc
--- /dev/null
+++ b/angular-chat-client/server/server.js
@@ -0,0 +1,27 @@
+var express = require('express');
+var app = express();
+var http = require('http').Server(app);
+var io = require('socket.io')(http);
+var path = require('path');
+
+app.use(express.static(path.join(__dirname, 'public')));
+
+io.on('connection', function (socket) {
+  socket.on('leaveRoom', function (data) {
+    socket.to(data.roomName).emit('chatUpdate', {'userName':'','text':data.userName+' has left the room'});
+    socket.leave(data.roomName);
+  });
+  socket.on('joinRoom', function (data) {
+    socket.join(data.roomName);
+    socket.to(data.roomName).emit('chatUpdate',
+      {'userName':'','text':data.userName+' has joined the room'});
+  });
+  socket.on('newMessage',function (data) {
+    var dataWithoutRoom = {'userName':data.userName,'text':data.text, 'msgDate':data.msgDate}
+    io.in(data.roomName).emit('chatUpdate',dataWithoutRoom);
+  });
+});
+
+http.listen(3000, function(){
+	console.log('listening on *:3000');
+});
diff --git a/angular-chat-client/src/app/app-routing.module.ts b/angular-chat-client/src/app/app-routing.module.ts
new file mode 100644
index 0000000..71a7f2e
--- /dev/null
+++ b/angular-chat-client/src/app/app-routing.module.ts
@@ -0,0 +1,18 @@
+import { NgModule }             from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { ChatComponent } from './chat/chat.component';
+import { UserRegistrationComponent } from './user-registration/user-registration.component';
+import { RoomsComponent } from './room/room.component';
+
+const routes: Routes = [
+  { path: '', redirectTo: '/registration', pathMatch: 'full' },
+  { path: 'chat', component: ChatComponent },
+  { path: 'registration', component: UserRegistrationComponent },
+  { path: 'rooms', component: RoomsComponent}
+];
+
+@NgModule({
+  imports: [ RouterModule.forRoot(routes) ],
+  exports: [ RouterModule ]
+})
+export class AppRoutingModule {}
diff --git a/angular-chat-client/src/app/app.component.css b/angular-chat-client/src/app/app.component.css
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/angular-chat-client/src/app/app.component.css
@@ -0,0 +1 @@
+
diff --git a/angular-chat-client/src/app/app.component.html b/angular-chat-client/src/app/app.component.html
new file mode 100644
index 0000000..1d8f5b1
--- /dev/null
+++ b/angular-chat-client/src/app/app.component.html
@@ -0,0 +1,3 @@
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
+<router-outlet></router-outlet>
diff --git a/angular-chat-client/src/app/app.component.spec.ts b/angular-chat-client/src/app/app.component.spec.ts
new file mode 100644
index 0000000..bcbdf36
--- /dev/null
+++ b/angular-chat-client/src/app/app.component.spec.ts
@@ -0,0 +1,27 @@
+import { TestBed, async } from '@angular/core/testing';
+import { AppComponent } from './app.component';
+describe('AppComponent', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        AppComponent
+      ],
+    }).compileComponents();
+  }));
+  it('should create the app', async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app).toBeTruthy();
+  }));
+  it(`should have as title 'app'`, async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app.title).toEqual('app');
+  }));
+  it('should render title in a h1 tag', async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
+    const compiled = fixture.debugElement.nativeElement;
+    expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!');
+  }));
+});
diff --git a/angular-chat-client/src/app/app.component.ts b/angular-chat-client/src/app/app.component.ts
new file mode 100644
index 0000000..7b0f672
--- /dev/null
+++ b/angular-chat-client/src/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.css']
+})
+export class AppComponent {
+  title = 'app';
+}
diff --git a/angular-chat-client/src/app/app.module.ts b/angular-chat-client/src/app/app.module.ts
new file mode 100644
index 0000000..2f979e7
--- /dev/null
+++ b/angular-chat-client/src/app/app.module.ts
@@ -0,0 +1,29 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+
+
+import { AppComponent } from './app.component';
+import { UserRegistrationComponent } from './user-registration/user-registration.component';
+import { ChatComponent } from './chat/chat.component';
+import { AppRoutingModule } from './/app-routing.module';
+import { FormsModule } from '@angular/forms';
+import { RoomsComponent } from './room/room.component';
+import { SocketsService } from './sockets.service';
+
+
+@NgModule({
+  declarations: [
+    AppComponent,
+    UserRegistrationComponent,
+    ChatComponent,
+    RoomsComponent
+  ],
+  imports: [
+    BrowserModule,
+    AppRoutingModule,
+    FormsModule
+  ],
+  providers: [SocketsService],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }
diff --git a/angular-chat-client/src/app/chat/chat.component.css b/angular-chat-client/src/app/chat/chat.component.css
new file mode 100644
index 0000000..d641c2d
--- /dev/null
+++ b/angular-chat-client/src/app/chat/chat.component.css
@@ -0,0 +1,7 @@
+.userLabel{font-weight:bold;color:#26A69A;margin-right:10px}
+.chatContainer{height:85%;padding:15px;overflow-y:auto }
+.heading{
+  width: 40%;}
+.msgDate{
+  color: blue;
+}
diff --git a/angular-chat-client/src/app/chat/chat.component.html b/angular-chat-client/src/app/chat/chat.component.html
new file mode 100644
index 0000000..d1d97d2
--- /dev/null
+++ b/angular-chat-client/src/app/chat/chat.component.html
@@ -0,0 +1,42 @@
+<div class="row">
+  <div class="col s4 offset-s4 card-panel grey lighten-2">
+    <h3 class="center-align">{{roomName}}</h3>
+  </div>
+</div>
+<div class="row">
+  <div class="col s10 chatContainer offset-s1">
+    <ul style="margin:0">
+      <li  *ngFor="let msg of conversation">
+        <div *ngIf="!isNewUserAlert(msg)">
+          <div *ngIf="!isMineMessage(msg)">
+            <span  class="userLabel" >{{msg.userName}}:</span>
+            <span>{{msg.text}}</span>
+            <span class="msgDate">{{msg.msgDate}}</span>
+          </div>
+          <div *ngIf="isMineMessage(msg)">
+            <span style="font-weight:bold">{{msg.text}}</span>
+            <span class="msgDate">{{msg.msgDate}}</span>
+          </div>
+        </div>
+        <div *ngIf="isNewUserAlert(msg)">
+          <blockquote>{{msg.text}}</blockquote>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div class="row">
+    <div class="col s9 offset-s1">
+      <input id="country" type="text"
+             [(ngModel)]="message"
+             (keypress)="keypressHandler($event)">
+    </div>
+    <button (click)="send()"  type="submit"
+            class="btn waves-effect waves-light col s1"  name="action" >Send</button>
+  </div>
+  <div class="row">
+    <div class="col offset-s1">
+      <button (click)="navToRooms()"  type="submit"
+              class="btn waves-effect waves-light s2"  name="action" >Room list</button>
+    </div>
+  </div>
+</div>
diff --git a/angular-chat-client/src/app/chat/chat.component.spec.ts b/angular-chat-client/src/app/chat/chat.component.spec.ts
new file mode 100644
index 0000000..1f642f2
--- /dev/null
+++ b/angular-chat-client/src/app/chat/chat.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ChatComponent } from './chat.component';
+
+describe('ChatComponent', () => {
+  let component: ChatComponent;
+  let fixture: ComponentFixture<ChatComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ChatComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ChatComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/angular-chat-client/src/app/chat/chat.component.ts b/angular-chat-client/src/app/chat/chat.component.ts
new file mode 100644
index 0000000..da13d6b
--- /dev/null
+++ b/angular-chat-client/src/app/chat/chat.component.ts
@@ -0,0 +1,61 @@
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { Router } from '@angular/router';
+import { SocketsService } from '../sockets.service';
+
+@Component({
+  selector: 'app-chat',
+  templateUrl: './chat.component.html',
+  styleUrls: ['./chat.component.css'],
+  encapsulation: ViewEncapsulation.None
+})
+export class ChatComponent implements OnInit {
+  message = '';
+  conversation = [];
+  roomName = null;
+  constructor(private _router: Router, private _sockets:SocketsService){}
+
+  ngOnInit() {
+    if (sessionStorage.getItem("userName") === null){
+      this._router.navigate(['registration']);
+    }
+    this._sockets.socket.on('chatUpdate', function(data) {
+
+      if (data.text[0] === '@'){
+        var name = data.text.substr(1, data.text.indexOf(" "));
+
+        if (sessionStorage.getItem("userName") === name){
+          //Materialize.toast('I am a toast!', 3000, 'rounded');
+        }
+      }
+
+      this.conversation.push(data);
+    }.bind(this));
+
+    this.roomName = sessionStorage.getItem("roomName");
+  }
+
+  send() {
+    this._sockets.newMessage(sessionStorage.getItem("userName"),
+                             sessionStorage.getItem("roomName"),
+                             this.message)
+    this.message = '';
+  }
+
+  keypressHandler(event) {
+    if (event.keyCode === 13){
+      this.send();
+    }
+  }
+
+  isMineMessage(data){
+    return data.userName === sessionStorage.getItem("userName");
+  }
+
+  isNewUserAlert(data){
+    return data.userName === '';
+  }
+
+  navToRooms() {
+    this._router.navigate(['rooms']);
+  }
+}
diff --git a/angular-chat-client/src/app/room/room.component.css b/angular-chat-client/src/app/room/room.component.css
new file mode 100644
index 0000000..9f9f9a8
--- /dev/null
+++ b/angular-chat-client/src/app/room/room.component.css
@@ -0,0 +1,4 @@
+.room-list{
+  width: 50%;
+  margin-top: 10%;
+}
diff --git a/angular-chat-client/src/app/room/room.component.html b/angular-chat-client/src/app/room/room.component.html
new file mode 100644
index 0000000..cdf1113
--- /dev/null
+++ b/angular-chat-client/src/app/room/room.component.html
@@ -0,0 +1,14 @@
+<div class="row room-list">
+    <ul class="collection">
+      <li class="collection-item row valign-wrapper" *ngFor="let room of rooms">
+        <div class="col s4">
+          <button (click)="chooseRoom(room)"  type="submit" class="btn waves-effect waves-light s2"  name="action" >choose</button>
+        </div>
+        <div class="col s8">
+          <h5>{{ room.name }}</h5>
+        </div>
+      </li>
+    </ul>
+</div>
+
+
diff --git a/angular-chat-client/src/app/room/room.component.spec.ts b/angular-chat-client/src/app/room/room.component.spec.ts
new file mode 100644
index 0000000..3f233c3
--- /dev/null
+++ b/angular-chat-client/src/app/room/room.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RoomsComponent } from './room.component';
+
+describe('RoomsComponent', () => {
+  let component: RoomsComponent;
+  let fixture: ComponentFixture<RoomsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ RoomsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RoomsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/angular-chat-client/src/app/room/room.component.ts b/angular-chat-client/src/app/room/room.component.ts
new file mode 100644
index 0000000..2ddacca
--- /dev/null
+++ b/angular-chat-client/src/app/room/room.component.ts
@@ -0,0 +1,37 @@
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { Router } from '@angular/router';
+import { SocketsService } from '../sockets.service';
+
+@Component({
+  selector: 'app-rooms',
+  templateUrl: './room.component.html',
+  styleUrls: ['./room.component.css'],
+  encapsulation: ViewEncapsulation.None
+})
+export class RoomsComponent implements OnInit {
+  socket = null;
+  private rooms = [
+    { name:'Cool guys room'},
+    { name:'Room of the kings'},
+    { name:'Some lame room'}
+  ];
+
+  constructor(private _router: Router, private _sockets: SocketsService) { }
+
+  ngOnInit() {
+    if (sessionStorage.getItem("userName") === null){
+      this._router.navigate(['registration']);
+    }
+  }
+
+  chooseRoom(room){
+    let oldRoomName = sessionStorage.getItem("roomName");
+    if (oldRoomName){
+      this._sockets.leaveRoom(oldRoomName, sessionStorage.getItem("userName"));
+    }
+
+    this._sockets.joinRoom(room.name, sessionStorage.getItem("userName"));
+    sessionStorage.setItem("roomName", room.name);
+    this._router.navigate(['chat']);
+  }
+}
diff --git a/angular-chat-client/src/app/sockets.service.spec.ts b/angular-chat-client/src/app/sockets.service.spec.ts
new file mode 100644
index 0000000..e082413
--- /dev/null
+++ b/angular-chat-client/src/app/sockets.service.spec.ts
@@ -0,0 +1,15 @@
+import { TestBed, inject } from '@angular/core/testing';
+
+import { SocketsService } from './sockets.service';
+
+describe('SocketsService', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [SocketsService]
+    });
+  });
+
+  it('should be created', inject([SocketsService], (service: SocketsService) => {
+    expect(service).toBeTruthy();
+  }));
+});
diff --git a/angular-chat-client/src/app/sockets.service.ts b/angular-chat-client/src/app/sockets.service.ts
new file mode 100644
index 0000000..f445836
--- /dev/null
+++ b/angular-chat-client/src/app/sockets.service.ts
@@ -0,0 +1,42 @@
+import { Injectable } from '@angular/core';
+import * as io  from 'socket.io-client';
+
+@Injectable()
+export class SocketsService {
+  socket = null;
+
+  constructor() {
+    this.socket = io('http://localhost:3000');
+  }
+
+  public joinRoom(roomName, userName){
+    this.socket.emit('joinRoom', { roomName:roomName, userName:userName});
+  }
+
+  public leaveRoom(roomName, userName){
+    this.socket.emit('leaveRoom', { roomName:roomName, userName:userName});
+  }
+
+  public newMessage(userName, roomName, message){
+    var currentdate = new Date();
+    var datetime = currentdate.getDate() + "/"
+      + (currentdate.getMonth()+1)  + "/"
+      + currentdate.getFullYear() + " @ "
+      + currentdate.getHours() + ":"
+      + currentdate.getMinutes() + ":"
+      + currentdate.getSeconds();
+
+
+    this.socket.emit('newMessage', {
+      'userName': userName,
+      'text': message,
+      'roomName': roomName,
+      'msgDate' : datetime
+    });
+  }
+
+  public newUser(userName){
+    this.socket.emit('newUser', userName);
+  }
+
+}
diff --git a/angular-chat-client/src/app/user-registration/user-registration.component.css b/angular-chat-client/src/app/user-registration/user-registration.component.css
new file mode 100644
index 0000000..b354686
--- /dev/null
+++ b/angular-chat-client/src/app/user-registration/user-registration.component.css
@@ -0,0 +1,2 @@
+.registrationContainer{margin-top:20%;padding:15px;box-shadow: 3px 2px 7px -1px}
+.registrationContainer button{float: right;}
diff --git a/angular-chat-client/src/app/user-registration/user-registration.component.html b/angular-chat-client/src/app/user-registration/user-registration.component.html
new file mode 100644
index 0000000..c989127
--- /dev/null
+++ b/angular-chat-client/src/app/user-registration/user-registration.component.html
@@ -0,0 +1,15 @@
+<div class="container">
+  <div class="col s11 registrationContainer">
+    <div class="row">
+      <div class="input-field col s6">
+        <input [(ngModel)]="userName" id="userName"
+               type="text" (keypress)="keypressHandler($event)" class="validate"
+               placeholder="Enter your name here">
+      </div>
+    </div>
+    <button (click)="login()" type="submit"
+            class="btn waves-effect waves-light col s3"
+            name="action" >Login</button>
+    <div style="clear:both;"></div>
+  </div>
+</div>
diff --git a/angular-chat-client/src/app/user-registration/user-registration.component.spec.ts b/angular-chat-client/src/app/user-registration/user-registration.component.spec.ts
new file mode 100644
index 0000000..39b3cb3
--- /dev/null
+++ b/angular-chat-client/src/app/user-registration/user-registration.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserRegistrationComponent } from './user-registration.component';
+
+describe('UserRegistrationComponent', () => {
+  let component: UserRegistrationComponent;
+  let fixture: ComponentFixture<UserRegistrationComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ UserRegistrationComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UserRegistrationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/angular-chat-client/src/app/user-registration/user-registration.component.ts b/angular-chat-client/src/app/user-registration/user-registration.component.ts
new file mode 100644
index 0000000..9035c1c
--- /dev/null
+++ b/angular-chat-client/src/app/user-registration/user-registration.component.ts
@@ -0,0 +1,35 @@
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { Router } from '@angular/router';
+//import * as io  from 'socket.io-client';
+
+@Component({
+  selector: 'app-user-registration',
+  templateUrl: './user-registration.component.html',
+  styleUrls: ['./user-registration.component.css'],
+  encapsulation: ViewEncapsulation.None
+})
+export class UserRegistrationComponent implements OnInit {
+
+  constructor(private _router: Router) { }
+
+  ngOnInit() {
+    //this.socket = io('http://localhost:3000');
+  }
+
+  userName = '';
+  socket = null;
+
+  login() {
+    if (this.userName !== null){
+      sessionStorage.setItem("userName", this.userName);
+      this._router.navigate(['rooms']);
+    }
+  }
+
+  keypressHandler(event) {
+    if (event.keyCode  === 13){
+      this.login();
+    }
+  }
+
+}
diff --git a/angular-chat-client/src/assets/.gitkeep b/angular-chat-client/src/assets/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/angular-chat-client/src/environments/environment.prod.ts b/angular-chat-client/src/environments/environment.prod.ts
new file mode 100644
index 0000000..3612073
--- /dev/null
+++ b/angular-chat-client/src/environments/environment.prod.ts
@@ -0,0 +1,3 @@
+export const environment = {
+  production: true
+};
diff --git a/angular-chat-client/src/environments/environment.ts b/angular-chat-client/src/environments/environment.ts
new file mode 100644
index 0000000..b7f639a
--- /dev/null
+++ b/angular-chat-client/src/environments/environment.ts
@@ -0,0 +1,8 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `.angular-cli.json`.
+
+export const environment = {
+  production: false
+};
diff --git a/angular-chat-client/src/favicon.ico b/angular-chat-client/src/favicon.ico
new file mode 100644
index 0000000..8081c7c
Binary files /dev/null and b/angular-chat-client/src/favicon.ico differ
diff --git a/angular-chat-client/src/index.html b/angular-chat-client/src/index.html
new file mode 100644
index 0000000..7c10844
--- /dev/null
+++ b/angular-chat-client/src/index.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>AngularChatClient</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body>
+  <app-root></app-root>
+</body>
+</html>
diff --git a/angular-chat-client/src/main.ts b/angular-chat-client/src/main.ts
new file mode 100644
index 0000000..91ec6da
--- /dev/null
+++ b/angular-chat-client/src/main.ts
@@ -0,0 +1,12 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+
+if (environment.production) {
+  enableProdMode();
+}
+
+platformBrowserDynamic().bootstrapModule(AppModule)
+  .catch(err => console.log(err));
diff --git a/angular-chat-client/src/polyfills.ts b/angular-chat-client/src/polyfills.ts
new file mode 100644
index 0000000..20d4075
--- /dev/null
+++ b/angular-chat-client/src/polyfills.ts
@@ -0,0 +1,76 @@
+/**
+ * This file includes polyfills needed by Angular and is loaded before the app.
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ *      file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+ * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ */
+
+/***************************************************************************************************
+ * BROWSER POLYFILLS
+ */
+
+/** IE9, IE10 and IE11 requires all of the following polyfills. **/
+// import 'core-js/es6/symbol';
+// import 'core-js/es6/object';
+// import 'core-js/es6/function';
+// import 'core-js/es6/parse-int';
+// import 'core-js/es6/parse-float';
+// import 'core-js/es6/number';
+// import 'core-js/es6/math';
+// import 'core-js/es6/string';
+// import 'core-js/es6/date';
+// import 'core-js/es6/array';
+// import 'core-js/es6/regexp';
+// import 'core-js/es6/map';
+// import 'core-js/es6/weak-map';
+// import 'core-js/es6/set';
+
+/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+// import 'classlist.js';  // Run `npm install --save classlist.js`.
+
+/** IE10 and IE11 requires the following for the Reflect API. */
+// import 'core-js/es6/reflect';
+
+
+/** Evergreen browsers require these. **/
+// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
+import 'core-js/es7/reflect';
+
+
+/**
+ * Required to support Web Animations `@angular/platform-browser/animations`.
+ * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
+ **/
+// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+
+
+
+/***************************************************************************************************
+ * Zone JS is required by Angular itself.
+ */
+import 'zone.js/dist/zone';  // Included with Angular CLI.
+
+
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */
+
+/**
+ * Date, currency, decimal and percent pipes.
+ * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
+ */
+// import 'intl';  // Run `npm install --save intl`.
+/**
+ * Need to import at least one locale-data with intl.
+ */
+// import 'intl/locale-data/jsonp/en';
diff --git a/angular-chat-client/src/styles.css b/angular-chat-client/src/styles.css
new file mode 100644
index 0000000..90d4ee0
--- /dev/null
+++ b/angular-chat-client/src/styles.css
@@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */
diff --git a/angular-chat-client/src/test.ts b/angular-chat-client/src/test.ts
new file mode 100644
index 0000000..cd612ee
--- /dev/null
+++ b/angular-chat-client/src/test.ts
@@ -0,0 +1,32 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/long-stack-trace-zone';
+import 'zone.js/dist/proxy.js';
+import 'zone.js/dist/sync-test';
+import 'zone.js/dist/jasmine-patch';
+import 'zone.js/dist/async-test';
+import 'zone.js/dist/fake-async-test';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
+declare const __karma__: any;
+declare const require: any;
+
+// Prevent Karma from running prematurely.
+__karma__.loaded = function () {};
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
+// Finally, start Karma to run the tests.
+__karma__.start();
diff --git a/angular-chat-client/src/tsconfig.app.json b/angular-chat-client/src/tsconfig.app.json
new file mode 100644
index 0000000..f57a1b1
--- /dev/null
+++ b/angular-chat-client/src/tsconfig.app.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/app",
+    "baseUrl": "./",
+    "module": "es2015",
+    "experimentalDecorators": true,
+    "types": []
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ]
+}
diff --git a/angular-chat-client/src/tsconfig.spec.json b/angular-chat-client/src/tsconfig.spec.json
new file mode 100644
index 0000000..63d89ff
--- /dev/null
+++ b/angular-chat-client/src/tsconfig.spec.json
@@ -0,0 +1,20 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/spec",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "target": "es5",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}
diff --git a/angular-chat-client/src/typings.d.ts b/angular-chat-client/src/typings.d.ts
new file mode 100644
index 0000000..ef5c7bd
--- /dev/null
+++ b/angular-chat-client/src/typings.d.ts
@@ -0,0 +1,5 @@
+/* SystemJS module definition */
+declare var module: NodeModule;
+interface NodeModule {
+  id: string;
+}
diff --git a/angular-chat-client/tsconfig.json b/angular-chat-client/tsconfig.json
new file mode 100644
index 0000000..a6c016b
--- /dev/null
+++ b/angular-chat-client/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es5",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
+    ]
+  }
+}
diff --git a/angular-chat-client/tslint.json b/angular-chat-client/tslint.json
new file mode 100644
index 0000000..c24dc29
--- /dev/null
+++ b/angular-chat-client/tslint.json
@@ -0,0 +1,141 @@
+{
+  "rulesDirectory": [
+    "node_modules/codelyzer"
+  ],
+  "rules": {
+    "arrow-return-shorthand": true,
+    "callable-types": true,
+    "class-name": true,
+    "comment-format": [
+      true,
+      "check-space"
+    ],
+    "curly": true,
+    "eofline": true,
+    "forin": true,
+    "import-blacklist": [
+      true,
+      "rxjs",
+      "rxjs/Rx"
+    ],
+    "import-spacing": true,
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "interface-over-type-literal": true,
+    "label-position": true,
+    "max-line-length": [
+      true,
+      140
+    ],
+    "member-access": false,
+    "member-ordering": [
+      true,
+      {
+        "order": [
+          "static-field",
+          "instance-field",
+          "static-method",
+          "instance-method"
+        ]
+      }
+    ],
+    "no-arg": true,
+    "no-bitwise": true,
+    "no-console": [
+      true,
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-construct": true,
+    "no-debugger": true,
+    "no-duplicate-super": true,
+    "no-empty": false,
+    "no-empty-interface": true,
+    "no-eval": true,
+    "no-inferrable-types": [
+      true,
+      "ignore-params"
+    ],
+    "no-misused-new": true,
+    "no-non-null-assertion": true,
+    "no-shadowed-variable": true,
+    "no-string-literal": false,
+    "no-string-throw": true,
+    "no-switch-case-fall-through": true,
+    "no-trailing-whitespace": true,
+    "no-unnecessary-initializer": true,
+    "no-unused-expression": true,
+    "no-use-before-declare": true,
+    "no-var-keyword": true,
+    "object-literal-sort-keys": false,
+    "one-line": [
+      true,
+      "check-open-brace",
+      "check-catch",
+      "check-else",
+      "check-whitespace"
+    ],
+    "prefer-const": true,
+    "quotemark": [
+      true,
+      "single"
+    ],
+    "radix": true,
+    "semicolon": [
+      true,
+      "always"
+    ],
+    "triple-equals": [
+      true,
+      "allow-null-check"
+    ],
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
+    "typeof-compare": true,
+    "unified-signatures": true,
+    "variable-name": false,
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-type"
+    ],
+    "directive-selector": [
+      true,
+      "attribute",
+      "app",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "app",
+      "kebab-case"
+    ],
+    "use-input-property-decorator": true,
+    "use-output-property-decorator": true,
+    "use-host-property-decorator": true,
+    "no-input-rename": true,
+    "no-output-rename": true,
+    "use-life-cycle-interface": true,
+    "use-pipe-transform-interface": true,
+    "component-class-suffix": true,
+    "directive-class-suffix": true,
+    "invoke-injectable": true
+  }
+}