diff --git a/Server/app.js b/Server/app.js new file mode 100644 index 0000000..4bbe97f --- /dev/null +++ b/Server/app.js @@ -0,0 +1,46 @@ +const express = require('express'); +const app = express(); +var http = require('http').Server(app); +var io = require('socket.io')(http); +var path = require('path'); + +var session = require('express-session'); +var router = require('./router'); +var bodyParser = require('body-parser'); +var cors = require('cors'); + +app.use(session({secret : 'userSession'})); +app.use('/static', express.static(path.join(__dirname, '../public/src/app'))); +// app.get('/', function (req, res) { +// res.sendFile(__dirname + '/html/Chat.html'); +// }); + +app.use('/', router); + +// var corsOptions = { +// origin: 'http://localhost:4200', +// "methods": "GET,HEAD,PUT,PATCH,POST,DELETE" +// }; + +//app.use('*',cors(corsOptions)); + + +var userSession; +var allUsers = [{"username": "Orel"}]; + +io.on('connection', function(socket){ + socket.on('chat message', function(user, msg, color){ + console.log(user + ': ' + msg); + io.emit('chat message', user, msg, color); + }); +}); + +http.listen(3000, function(){ + console.log('app is running on *:3000'); +}); + +module.exports.app = app; +// module.exports.cors = cors; +// module.exports.corsOptions = corsOptions; +module.exports.allUsers = allUsers; +module.exports.userSession = userSession; \ No newline at end of file diff --git a/Server/login.js b/Server/login.js new file mode 100644 index 0000000..3fd6f50 --- /dev/null +++ b/Server/login.js @@ -0,0 +1,31 @@ + +var fs = require('fs'); +var app = require('./app'); + +exports.login = function(username, password, session){ + + var loggedIn = false; + + var usersList = JSON.parse(fs.readFileSync('users.json', 'utf8')); + + for (var index = 0; index < (usersList.length) && (!loggedIn); index++){ + + // If the username and password are correct + if ((usersList[index].username === username) && + (usersList[index].password === password)){ + loggedIn = true; + } + } + + if (loggedIn){ + // TODO: Create session + + app.userSession = session; + app.userSession.username = username; + + app.allUsers.push({"username" : username}); + + } + + return (loggedIn); +}; \ No newline at end of file diff --git a/Server/router.js b/Server/router.js new file mode 100644 index 0000000..176a2a2 --- /dev/null +++ b/Server/router.js @@ -0,0 +1,59 @@ +var express = require('express'); +var router = express.Router(); +var path = require('path'); + +var signIn = require('./signin'); +var login = require('./login'); + +var app = require('./app'); + + + +router.get('/login', loginRouter); +router.get('/', Authentication, homePage); +router.post('/signup', Authentication, signUpRouter); + + +function Authentication(req, res, next){ + + if (app.userSession == undefined){ + res.redirect('/login'); + } + else { + next(); + } +} + +function homePage(req, res){ + //res.sendFile(path.join(__dirname + '/portal-client/dist/index.html')); + res.send('Home page'); +} + +function loginRouter(req, res){ + + var username = req.query.username; + var password = req.query.password; + + + //res.sendFile(path.join(__dirname , '../public/src/app/' + 'app.component.html')); + + var result = login.login(username, password, req.session); + + res.send(result); +} + +function signUpRouter(req, res){ + + var username = req.body.username; + var password = req.body.password; + + if (signIn.signIn(username, password)){ + res.send('Signed in'); + } + // Username already exist + else { + res.send('Username already exist'); + } +} + +module.exports = router; diff --git a/Server/signin.js b/Server/signin.js new file mode 100644 index 0000000..084824f --- /dev/null +++ b/Server/signin.js @@ -0,0 +1,27 @@ + +var fs = require('fs'); +var usersJsonFile = 'users.json'; + +exports.signIn = function(username, password){ + + var userNameExist = false; + + var usersList = JSON.parse(fs.readFileSync(usersJsonFile, 'utf8')); + + for (var index = 0; index < (usersList.length) && (!userNameExist); index++){ + + if (usersList[index].username === username){ + userNameExist = true; + } + } + + if (userNameExist){ + return false; + } + else{ + // Add the user + fs.appendFile(usersJsonFile, JSON.stringify({"username" : username, "password" : password})); + + return true; + } +}; \ No newline at end of file diff --git a/Server/users.json b/Server/users.json new file mode 100644 index 0000000..954e864 --- /dev/null +++ b/Server/users.json @@ -0,0 +1,22 @@ +[ + { + "username" : "Orel", + "password" : "123456" + }, + { + "username" : "Assaf", + "password" : "123456" + }, + { + "username" : "Omer", + "password" : "123456" + }, + { + "username" : "Saar", + "password" : "123456" + }, + { + "username" : "Aviv", + "password" : "123456" + } +] \ No newline at end of file diff --git a/public/.angular-cli.json b/public/.angular-cli.json new file mode 100644 index 0000000..3478833 --- /dev/null +++ b/public/.angular-cli.json @@ -0,0 +1,60 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "project": { + "name": "team-chat" + }, + "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/public/.editorconfig b/public/.editorconfig new file mode 100644 index 0000000..6e87a00 --- /dev/null +++ b/public/.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/public/.gitignore b/public/.gitignore new file mode 100644 index 0000000..be1b550 --- /dev/null +++ b/public/.gitignore @@ -0,0 +1,44 @@ +# 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 + +.idea diff --git a/public/README.md b/public/README.md new file mode 100644 index 0000000..f2bd138 --- /dev/null +++ b/public/README.md @@ -0,0 +1,27 @@ +# TeamChat + +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/public/e2e/app.e2e-spec.ts b/public/e2e/app.e2e-spec.ts new file mode 100644 index 0000000..98b7c57 --- /dev/null +++ b/public/e2e/app.e2e-spec.ts @@ -0,0 +1,14 @@ +import { AppPage } from './app.po'; + +describe('team-chat 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/public/e2e/app.po.ts b/public/e2e/app.po.ts new file mode 100644 index 0000000..82ea75b --- /dev/null +++ b/public/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/public/e2e/tsconfig.e2e.json b/public/e2e/tsconfig.e2e.json new file mode 100644 index 0000000..1d9e5ed --- /dev/null +++ b/public/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/public/karma.conf.js b/public/karma.conf.js new file mode 100644 index 0000000..af139fa --- /dev/null +++ b/public/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/public/package.json b/public/package.json new file mode 100644 index 0000000..51d3250 --- /dev/null +++ b/public/package.json @@ -0,0 +1,51 @@ +{ + "name": "team-chat", + "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", + "angular-in-memory-web-api": "^0.5.1", + "core-js": "^2.4.1", + "ngx-cookie-service": "^1.0.9", + "rxjs": "^5.5.2", + "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/public/protractor.conf.js b/public/protractor.conf.js new file mode 100644 index 0000000..7ee3b5e --- /dev/null +++ b/public/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/public/src/app/app-routing.module.ts b/public/src/app/app-routing.module.ts new file mode 100644 index 0000000..9b8fde8 --- /dev/null +++ b/public/src/app/app-routing.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; + +import { DashboardComponent } from './dashboard/dashboard.component'; +import { LoginFormComponent } from './login-form/login-form.component'; +import { ChatPageComponent } from './chat-page/chat-page.component'; + +const routes: Routes = [ + { path: 'chat-page', component: ChatPageComponent }, + { path: 'login-form', component: LoginFormComponent }, + { path: 'dashboard', component: DashboardComponent } + + +]; + +@NgModule({ + imports: [ RouterModule.forRoot(routes) ], + exports: [ RouterModule ] +}) +export class AppRoutingModule {} diff --git a/public/src/app/app.component.css b/public/src/app/app.component.css new file mode 100644 index 0000000..e69de29 diff --git a/public/src/app/app.component.html b/public/src/app/app.component.html new file mode 100644 index 0000000..34806cf --- /dev/null +++ b/public/src/app/app.component.html @@ -0,0 +1,5 @@ +
+ + + +
diff --git a/public/src/app/app.component.spec.ts b/public/src/app/app.component.spec.ts new file mode 100644 index 0000000..bcbdf36 --- /dev/null +++ b/public/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/public/src/app/app.component.ts b/public/src/app/app.component.ts new file mode 100644 index 0000000..8f7811a --- /dev/null +++ b/public/src/app/app.component.ts @@ -0,0 +1,21 @@ +import { Component } from '@angular/core'; +import { CookieService } from 'ngx-cookie-service'; + + +@Component({ + selector: 'app-root', + templateUrl: './app.component.html', + styleUrls: ['./app.component.css'] +}) + +export class AppComponent { + title = 'app'; + + constructor( private cookieService: CookieService ) { } + + ngOnInit(): void { + //this.cookieService.set( 'username', 'Orel' ); + //this.cookieValue = this.cookieService.get('username'); + } + +} diff --git a/public/src/app/app.module.ts b/public/src/app/app.module.ts new file mode 100644 index 0000000..b19450c --- /dev/null +++ b/public/src/app/app.module.ts @@ -0,0 +1,40 @@ +import { BrowserModule } from '@angular/platform-browser'; +import { Injectable, NgModule } from '@angular/core'; + +import { AppComponent } from './app.component'; +import { AppRoutingModule } from './/app-routing.module'; +import { HeaderComponent } from './header/header.component'; +import { LoginFormComponent } from './login-form/login-form.component'; +import { FooterComponent } from './footer/footer.component'; +import { FormsModule } from '@angular/forms'; +import { DashboardComponent } from './dashboard/dashboard.component'; +import { UserService } from './user.service'; +import { ProtectedDirective } from './protected.directive'; +import { HttpClientModule } from '@angular/common/http'; +import { ServerAuthenticationService } from './server-authentication.service'; +import { ChatPageComponent } from './chat-page/chat-page.component'; +import { CookieService } from 'ngx-cookie-service'; + +@NgModule({ + declarations: [ + AppComponent, + HeaderComponent, + LoginFormComponent, + FooterComponent, + DashboardComponent, + ProtectedDirective, + ChatPageComponent + ], + imports: [ + BrowserModule, + AppRoutingModule, + FormsModule, + HttpClientModule + ], + providers: [UserService, ServerAuthenticationService, CookieService], + bootstrap: [AppComponent] +}) + +export class AppModule { + +} diff --git a/public/src/app/chat-page/chat-page.component.css b/public/src/app/chat-page/chat-page.component.css new file mode 100644 index 0000000..e69de29 diff --git a/public/src/app/chat-page/chat-page.component.html b/public/src/app/chat-page/chat-page.component.html new file mode 100644 index 0000000..36beeb1 --- /dev/null +++ b/public/src/app/chat-page/chat-page.component.html @@ -0,0 +1,4 @@ +

+ chat-page works! + {{username}} +

diff --git a/public/src/app/chat-page/chat-page.component.spec.ts b/public/src/app/chat-page/chat-page.component.spec.ts new file mode 100644 index 0000000..3b3c099 --- /dev/null +++ b/public/src/app/chat-page/chat-page.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ChatPageComponent } from './chat-page.component'; + +describe('ChatPageComponent', () => { + let component: ChatPageComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ChatPageComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ChatPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/public/src/app/chat-page/chat-page.component.ts b/public/src/app/chat-page/chat-page.component.ts new file mode 100644 index 0000000..e57ec7f --- /dev/null +++ b/public/src/app/chat-page/chat-page.component.ts @@ -0,0 +1,22 @@ +import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Globals } from '../globals'; + +@Component({ + selector: 'app-chat-page', + templateUrl: './chat-page.component.html', + styleUrls: ['./chat-page.component.css'], + encapsulation: ViewEncapsulation.None, + providers: [Globals] +}) +export class ChatPageComponent implements OnInit { + + username: string = ""; + + constructor(globals: Globals) { + username = globals.username; + } + + ngOnInit() { + } + +} diff --git a/public/src/app/dashboard/dashboard.component.css b/public/src/app/dashboard/dashboard.component.css new file mode 100644 index 0000000..e69de29 diff --git a/public/src/app/dashboard/dashboard.component.html b/public/src/app/dashboard/dashboard.component.html new file mode 100644 index 0000000..107d75b --- /dev/null +++ b/public/src/app/dashboard/dashboard.component.html @@ -0,0 +1,3 @@ +

+ dashboard works! +

diff --git a/public/src/app/dashboard/dashboard.component.spec.ts b/public/src/app/dashboard/dashboard.component.spec.ts new file mode 100644 index 0000000..9c996c3 --- /dev/null +++ b/public/src/app/dashboard/dashboard.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DashboardComponent } from './dashboard.component'; + +describe('DashboardComponent', () => { + let component: DashboardComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DashboardComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DashboardComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/public/src/app/dashboard/dashboard.component.ts b/public/src/app/dashboard/dashboard.component.ts new file mode 100644 index 0000000..b0836de --- /dev/null +++ b/public/src/app/dashboard/dashboard.component.ts @@ -0,0 +1,16 @@ +import { Component, OnInit, ViewEncapsulation } from '@angular/core'; + +@Component({ + selector: 'app-dashboard', + templateUrl: './dashboard.component.html', + styleUrls: ['./dashboard.component.css'], + encapsulation: ViewEncapsulation.None +}) +export class DashboardComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/public/src/app/footer/footer.component.css b/public/src/app/footer/footer.component.css new file mode 100644 index 0000000..e69de29 diff --git a/public/src/app/footer/footer.component.html b/public/src/app/footer/footer.component.html new file mode 100644 index 0000000..2168fbe --- /dev/null +++ b/public/src/app/footer/footer.component.html @@ -0,0 +1,3 @@ +

+ Copyright © assaf +

diff --git a/public/src/app/footer/footer.component.spec.ts b/public/src/app/footer/footer.component.spec.ts new file mode 100644 index 0000000..2ca6c45 --- /dev/null +++ b/public/src/app/footer/footer.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FooterComponent } from './footer.component'; + +describe('FooterComponent', () => { + let component: FooterComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ FooterComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(FooterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/public/src/app/footer/footer.component.ts b/public/src/app/footer/footer.component.ts new file mode 100644 index 0000000..3d8f7e9 --- /dev/null +++ b/public/src/app/footer/footer.component.ts @@ -0,0 +1,16 @@ +import { Component, OnInit, ViewEncapsulation } from '@angular/core'; + +@Component({ + selector: 'app-footer', + templateUrl: './footer.component.html', + styleUrls: ['./footer.component.css'], + encapsulation: ViewEncapsulation.None +}) +export class FooterComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/public/src/app/header/header.component.css b/public/src/app/header/header.component.css new file mode 100644 index 0000000..dd31c07 --- /dev/null +++ b/public/src/app/header/header.component.css @@ -0,0 +1,6 @@ +header { + text-align: center; + padding: 20px 0; + font-size: 30px; + border-bottom: 2px solid #eee; +} diff --git a/public/src/app/header/header.component.html b/public/src/app/header/header.component.html new file mode 100644 index 0000000..6d067b2 --- /dev/null +++ b/public/src/app/header/header.component.html @@ -0,0 +1 @@ +
Header
diff --git a/public/src/app/header/header.component.spec.ts b/public/src/app/header/header.component.spec.ts new file mode 100644 index 0000000..2d0479d --- /dev/null +++ b/public/src/app/header/header.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HeaderComponent } from './header.component'; + +describe('HeaderComponent', () => { + let component: HeaderComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ HeaderComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(HeaderComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/public/src/app/header/header.component.ts b/public/src/app/header/header.component.ts new file mode 100644 index 0000000..5d1e556 --- /dev/null +++ b/public/src/app/header/header.component.ts @@ -0,0 +1,16 @@ +import { Component, OnInit, ViewEncapsulation } from '@angular/core'; + +@Component({ + selector: 'app-header', + templateUrl: './header.component.html', + styleUrls: ['./header.component.css'], + encapsulation: ViewEncapsulation.None +}) +export class HeaderComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/public/src/app/login-form/login-form.component.css b/public/src/app/login-form/login-form.component.css new file mode 100644 index 0000000..1a0815b --- /dev/null +++ b/public/src/app/login-form/login-form.component.css @@ -0,0 +1,29 @@ +:host { + flex-grow: 1; + display: flex; + justify-content: center; + align-items: center; +} + +div.input { + position: relative; +} + +div.input label { + position: absolute; + top: 0; + transform: translateY(-50%); + left: 10px; + background: white; + padding: 5px 2px; +} + +div.input input { + padding: 10px 20px; + font-size: 25px; + outline: 0; +} + +div.input { + margin-top: 20px; +} diff --git a/public/src/app/login-form/login-form.component.html b/public/src/app/login-form/login-form.component.html new file mode 100644 index 0000000..36dd2db --- /dev/null +++ b/public/src/app/login-form/login-form.component.html @@ -0,0 +1,13 @@ +
+
+ + +
+
+ + +
+
+ +
+
diff --git a/public/src/app/login-form/login-form.component.spec.ts b/public/src/app/login-form/login-form.component.spec.ts new file mode 100644 index 0000000..c5f08d4 --- /dev/null +++ b/public/src/app/login-form/login-form.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LoginFormComponent } from './login-form.component'; + +describe('LoginFormComponent', () => { + let component: LoginFormComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ LoginFormComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(LoginFormComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/public/src/app/login-form/login-form.component.ts b/public/src/app/login-form/login-form.component.ts new file mode 100644 index 0000000..7c47a02 --- /dev/null +++ b/public/src/app/login-form/login-form.component.ts @@ -0,0 +1,50 @@ +import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { User } from '../user'; +import { Router } from '@angular/router'; +import { UserService } from '../user.service'; +import { ServerAuthenticationService } from '../server-authentication.service'; +import { AppModule } from '../app.module'; +import { Globals } from '../globals'; + +@Component({ + selector: 'app-login-form', + templateUrl: './login-form.component.html', + styleUrls: ['./login-form.component.css'], + encapsulation: ViewEncapsulation.None, + providers: [Globals] +}) +export class LoginFormComponent implements OnInit { + user: User = { + name: '', + password: '' + }; + + private globals: Globals; + + constructor(private router: Router, private userService: UserService, private serverAuth: ServerAuthenticationService) { + } + + ngOnInit() { + } + + loginUser(): void + { + this.userService.LogIn(this.user); + this.serverAuth.Authenticate().subscribe(res=>{ + + if (res === true) { + + //cookieService.set( 'username', this.user.name ); + globals.username = this.user.username; + this.router.navigate(['chat-page']); + + } else { + + alert("Username or password is invalid"); + this.router.navigate(['login-form']); + } + }) + + } + +} diff --git a/public/src/app/protected.directive.ts b/public/src/app/protected.directive.ts new file mode 100644 index 0000000..fa7684e --- /dev/null +++ b/public/src/app/protected.directive.ts @@ -0,0 +1,14 @@ +import { Directive, Input } from '@angular/core'; +import { UserService } from './user.service'; +import { Router } from '@angular/router'; + +@Directive({ selector: '[protected]' }) + +export class ProtectedDirective { + constructor(private userService: UserService, private router: Router) { + if(!userService.IsLoggedIn()){ + this.router.navigate(['login-form']); + } + } + +} diff --git a/public/src/app/server-authentication.service.spec.ts b/public/src/app/server-authentication.service.spec.ts new file mode 100644 index 0000000..4b91caf --- /dev/null +++ b/public/src/app/server-authentication.service.spec.ts @@ -0,0 +1,15 @@ +import { TestBed, inject } from '@angular/core/testing'; + +import { ServerAuthenticationService } from './server-authentication.service'; + +describe('ServerAuthenticationService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ServerAuthenticationService] + }); + }); + + it('should be created', inject([ServerAuthenticationService], (service: ServerAuthenticationService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/public/src/app/server-authentication.service.ts b/public/src/app/server-authentication.service.ts new file mode 100644 index 0000000..f45d4e6 --- /dev/null +++ b/public/src/app/server-authentication.service.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; +import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; +import { UserService } from './user.service'; +import { Observable } from 'rxjs/Observable'; + +const authUrl: string = 'http://localhost:3000/login'; + +@Injectable() +export class ServerAuthenticationService { + + constructor( private http: HttpClient, private userService: UserService) { } + Authenticate(): Observable { + + let params = new HttpParams().set('username', this.userService.user.name) + .set('password', this.userService.user.password); + + return this.http.get(authUrl, {params: params}); + } +} diff --git a/public/src/app/user.service.spec.ts b/public/src/app/user.service.spec.ts new file mode 100644 index 0000000..b26195c --- /dev/null +++ b/public/src/app/user.service.spec.ts @@ -0,0 +1,15 @@ +import { TestBed, inject } from '@angular/core/testing'; + +import { UserService } from './user.service'; + +describe('UserService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [UserService] + }); + }); + + it('should be created', inject([UserService], (service: UserService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/public/src/app/user.service.ts b/public/src/app/user.service.ts new file mode 100644 index 0000000..05f23e6 --- /dev/null +++ b/public/src/app/user.service.ts @@ -0,0 +1,22 @@ +import { Injectable } from '@angular/core'; +import { User } from './user'; +import { CookieService } from 'ngx-cookie-service'; + +@Injectable() +export class UserService { + + public user: User; + private isLoggedIn: boolean; + + constructor() { + } + + LogIn(user: User): void { + this.isLoggedIn = true; + this.user = user; + } + + IsLoggedIn(){ + return this.isLoggedIn; + } +} diff --git a/public/src/app/user.ts b/public/src/app/user.ts new file mode 100644 index 0000000..dd1793a --- /dev/null +++ b/public/src/app/user.ts @@ -0,0 +1,4 @@ +export class User{ + name: string; + password: string; +} diff --git a/public/src/assets/.gitkeep b/public/src/assets/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/public/src/environments/environment.prod.ts b/public/src/environments/environment.prod.ts new file mode 100644 index 0000000..3612073 --- /dev/null +++ b/public/src/environments/environment.prod.ts @@ -0,0 +1,3 @@ +export const environment = { + production: true +}; diff --git a/public/src/environments/environment.ts b/public/src/environments/environment.ts new file mode 100644 index 0000000..b7f639a --- /dev/null +++ b/public/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/public/src/favicon.ico b/public/src/favicon.ico new file mode 100644 index 0000000..8081c7c Binary files /dev/null and b/public/src/favicon.ico differ diff --git a/public/src/index.html b/public/src/index.html new file mode 100644 index 0000000..31a8581 --- /dev/null +++ b/public/src/index.html @@ -0,0 +1,14 @@ + + + + + TeamChat + + + + + + + + + diff --git a/public/src/main.ts b/public/src/main.ts new file mode 100644 index 0000000..91ec6da --- /dev/null +++ b/public/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/public/src/polyfills.ts b/public/src/polyfills.ts new file mode 100644 index 0000000..20d4075 --- /dev/null +++ b/public/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/public/src/styles.css b/public/src/styles.css new file mode 100644 index 0000000..653ca9f --- /dev/null +++ b/public/src/styles.css @@ -0,0 +1,10 @@ + +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +body { + font-family: calibri; +} diff --git a/public/src/test.ts b/public/src/test.ts new file mode 100644 index 0000000..cd612ee --- /dev/null +++ b/public/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/public/src/tsconfig.app.json b/public/src/tsconfig.app.json new file mode 100644 index 0000000..39ba8db --- /dev/null +++ b/public/src/tsconfig.app.json @@ -0,0 +1,13 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/app", + "baseUrl": "./", + "module": "es2015", + "types": [] + }, + "exclude": [ + "test.ts", + "**/*.spec.ts" + ] +} diff --git a/public/src/tsconfig.spec.json b/public/src/tsconfig.spec.json new file mode 100644 index 0000000..63d89ff --- /dev/null +++ b/public/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/public/src/typings.d.ts b/public/src/typings.d.ts new file mode 100644 index 0000000..ef5c7bd --- /dev/null +++ b/public/src/typings.d.ts @@ -0,0 +1,5 @@ +/* SystemJS module definition */ +declare var module: NodeModule; +interface NodeModule { + id: string; +} diff --git a/public/tsconfig.json b/public/tsconfig.json new file mode 100644 index 0000000..a6c016b --- /dev/null +++ b/public/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/public/tslint.json b/public/tslint.json new file mode 100644 index 0000000..c24dc29 --- /dev/null +++ b/public/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 + } +}