initial commit

- contains basic chat via websocket
- contains button to test websocket
- contains button to test rest api
This commit is contained in:
2020-07-19 22:16:23 +02:00
commit d90204d34c
51 changed files with 14772 additions and 0 deletions

View File

@@ -0,0 +1,11 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
const routes: Routes = [];
@NgModule({
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule]
})
export class AppRoutingModule { }

101
src/app/app.component.css Normal file
View File

@@ -0,0 +1,101 @@
:host {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-size: 14px;
color: #333;
box-sizing: border-box;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
svg.material-icons {
height: 24px;
width: auto;
}
svg.material-icons:not(:last-child) {
margin-right: 8px;
}
.card svg.material-icons path {
fill: #888;
}
.card-container {
display: flex;
flex-wrap: wrap;
justify-content: center;
/* margin-top: 16px; */
}
.card {
border-radius: 4px;
border: 1px solid #eee;
background-color: #fafafa;
height: 40px;
width: 200px;
margin: 0 8px 16px;
padding: 16px;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
transition: all 0.2s ease-in-out;
line-height: 24px;
}
.card-container .card:not(:last-child) {
margin-right: 0;
}
.card.card-small {
height: 16px;
width: 168px;
}
.card-container .card:not(.highlight-card) {
cursor: pointer;
}
.card-container .card:not(.highlight-card):hover {
transform: translateY(-3px);
box-shadow: 0 4px 17px rgba(0, 0, 0, 0.35);
}
.card-container .card:not(.highlight-card):hover .material-icons path {
fill: rgb(105, 103, 103);
}
.card.highlight-card {
background-color: #1976d2;
color: white;
font-weight: 600;
border: none;
width: auto;
min-width: 30%;
position: relative;
}
.card.card.highlight-card span {
margin-left: 60px;
}
/* Responsive Styles */
@media screen and (max-width: 767px) {
.card:not(.highlight-card) {
height: 16px;
margin: 8px 0;
}
.card.highlight-card span {
margin-left: 72px;
}
}
.chat {
float: right;
height: 100%;
width: 20%;
background-color: goldenrod;
}

View File

@@ -0,0 +1,20 @@
<div class="chat">
<app-chat></app-chat>
</div>
<div>
<div class="card-container">
<div class="card card-small" (click)="onClickSocket()" tabindex="0">
<svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
<span>Send test message</span>
</div>
<div class="card card-small" (click)="onClickApi()" tabindex="0">
<svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
<span>Call rest api</span>
</div>
</div>
</div>
<router-outlet></router-outlet>

View File

@@ -0,0 +1,35 @@
import { TestBed, async } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AppComponent } from './app.component';
describe('AppComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
RouterTestingModule
],
declarations: [
AppComponent
],
}).compileComponents();
}));
it('should create the app', () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.componentInstance;
expect(app).toBeTruthy();
});
it(`should have as title 'rona-frontend'`, () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.componentInstance;
expect(app.title).toEqual('rona-frontend');
});
it('should render title', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.nativeElement;
expect(compiled.querySelector('.content span').textContent).toContain('rona-frontend app is running!');
});
});

31
src/app/app.component.ts Normal file
View File

@@ -0,0 +1,31 @@
import { Component } from '@angular/core';
import { SocketService } from './socket/socket.service';
import { HttpClient } from '@angular/common/http';
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.css']
})
export class AppComponent {
title = 'rona-frontend';
onClickSocket() {
this.socketService.send('test', {'user': 'USERNAME', 'payload': 'PAYLOAD TEST'})
}
onClickApi() {
this.httpService.get('http://localhost:5005/').subscribe(response => {
console.log('REST API call returned: ', response);
});
}
/**
*
* @param socketService
* @param httpService
*/
constructor(private socketService: SocketService,
private httpService: HttpClient) { }
}

32
src/app/app.module.ts Normal file
View File

@@ -0,0 +1,32 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { HttpClientModule } from '@angular/common/http';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ChatComponent } from './chat/chat.component';
import { EntryComponent } from './chat/entry/entry.component';
import { InputComponent } from './chat/input/input.component';
import {MatCardModule} from '@angular/material/card';
import {MatInputModule} from '@angular/material/input';
@NgModule({
declarations: [
AppComponent,
ChatComponent,
EntryComponent,
InputComponent
],
imports: [
BrowserModule,
HttpClientModule,
AppRoutingModule,
BrowserAnimationsModule,
MatCardModule,
MatInputModule
],
providers: [],
bootstrap: [AppComponent]
})
export class AppModule { }

View File

@@ -0,0 +1,4 @@
#chat-log {
height: calc(99% - 34px);
overflow-y: scroll;
}

View File

@@ -0,0 +1,7 @@
<div id="chat-log">
<app-entry *ngFor="let entry of entries"
[entry]=entry>
</app-entry>
</div>
<app-input></app-input>

View File

@@ -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();
});
});

View File

@@ -0,0 +1,40 @@
import { Component, OnInit } from '@angular/core';
import { Entry } from './entry/entry';
import { Message } from './message';
import {SocketService} from '../socket/socket.service';
@Component({
selector: 'app-chat',
templateUrl: './chat.component.html',
styleUrls: ['./chat.component.css']
})
export class ChatComponent implements OnInit {
entries = new Array<Entry>();
public addMessage(message: Message): void {
if ((this.entries.length > 0)
&& (this.entries[this.entries.length - 1].character == message.sender)) {
this.entries[this.entries.length - 1].messages.push(message.message);
} else {
this.entries.push(new Entry(message.sender, 'Aangular User', message.message));
}
window.setTimeout(ChatComponent.scrollToBottom, 5);
}
static scrollToBottom() {
const chatLog = document.getElementById('chat-log');
chatLog.scrollTop = chatLog.scrollHeight;
}
constructor(private socketService: SocketService) {
socketService.onTestMessage().subscribe((message: Message) => {
console.log(message);
this.addMessage(message);
});
}
ngOnInit(): void {
}
}

View File

@@ -0,0 +1,35 @@
.avatar {
background-image: url(src/assets/avatar.png);
background-size: cover;
}
.character {
font-size: 16px;
font-weight: bold;
}
.header {
margin-bottom: -8px;
width: 100%;
}
/* this class is wrapped around header text by angular */
/deep/ .mat-card-header-text {
width: 100%;
}
.messages {
/* margin-left: 4px; */
}
.timestamp {
color: #888888;
float: right;
font-weight: normal;
font-size: 14px;
}
.user {
font-size: 14px;
}

View File

@@ -0,0 +1,15 @@
<mat-card>
<mat-card-header class="header">
<div mat-card-avatar class="avatar"></div>
<mat-card-title class="character">
{{entry.character}}
<div class="timestamp">23:31</div>
</mat-card-title>
<mat-card-subtitle class="user">played by {{entry.user}}</mat-card-subtitle>
</mat-card-header>
<mat-card-content>
<div class="messages" *ngFor="let message of entry.messages">
{{message}}
</div>
</mat-card-content>
</mat-card>

View File

@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { EntryComponent } from './entry.component';
describe('EntryComponent', () => {
let component: EntryComponent;
let fixture: ComponentFixture<EntryComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ EntryComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(EntryComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,18 @@
import { Component, Input, OnInit } from '@angular/core';
import { Entry } from './entry';
@Component({
selector: 'app-entry',
templateUrl: './entry.component.html',
styleUrls: ['./entry.component.css']
})
export class EntryComponent implements OnInit {
@Input() entry: Entry;
constructor() { }
ngOnInit(): void {
}
}

View File

@@ -0,0 +1,7 @@
import { Entry } from './entry';
describe('Entry', () => {
it('should create an instance', () => {
expect(new Entry()).toBeTruthy();
});
});

View File

@@ -0,0 +1,10 @@
export class Entry {
public messages: Array<string> = new Array<string>();
constructor(public character: string,
public user: string,
message: string) {
this.messages.push(message);
}
}

View File

@@ -0,0 +1,6 @@
#chat-input {
box-sizing: border-box;
height: 34px;
width: 100%;
margin-top: 1%;
}

View File

@@ -0,0 +1,5 @@
<input id="chat-input"
matInput
placeholder="Type here."
#box
(keyup.Enter)="onEnter(box.value); box.value=''">

View File

@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { InputComponent } from './input.component';
describe('InputComponent', () => {
let component: InputComponent;
let fixture: ComponentFixture<InputComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ InputComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(InputComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,23 @@
import { Component, OnInit } from '@angular/core';
import {SocketService} from '../../socket/socket.service';
import {Message} from '../message';
import {Events} from '../../socket/events-enum';
@Component({
selector: 'app-input',
templateUrl: './input.component.html',
styleUrls: ['./input.component.css']
})
export class InputComponent implements OnInit {
onEnter(value: string): void {
const message = new Message('Aangular Frontend', value);
this.socketService.send(Events.publicMessage, message);
}
constructor(private socketService: SocketService) { }
ngOnInit(): void {
}
}

View File

@@ -0,0 +1,7 @@
import { Message } from './message';
describe('Message', () => {
it('should create an instance', () => {
expect(new Message()).toBeTruthy();
});
});

7
src/app/chat/message.ts Normal file
View File

@@ -0,0 +1,7 @@
export class Message {
constructor(public sender: string,
public message: string) {
}
}

View File

@@ -0,0 +1,3 @@
export enum Events {
publicMessage = 'public message'
}

View File

@@ -0,0 +1,16 @@
import { TestBed } from '@angular/core/testing';
import { SocketService } from './socket.service';
describe('WebsocketService', () => {
let service: SocketService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(SocketService);
});
it('should be created', () => {
expect(service).toBeTruthy();
});
});

View File

@@ -0,0 +1,40 @@
import { Injectable, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
import * as socketIo from 'socket.io-client';
import { Events } from './events-enum';
const SERVER_URL = 'http://localhost:5005'
@Injectable({
providedIn: 'root'
})
export class SocketService implements OnInit {
private socket;
public initSocket(): void {
this.socket = socketIo(SERVER_URL);
this.socket.on('connect_error', (error) => {
this.socket.close();
throw error;
});
}
public send(event: string, message: any): void {
this.socket.emit(event, message);
}
public onTestMessage(): Observable<any> {
return new Observable<any>(observer => {
this.socket.on(Events.publicMessage, (data) => observer.next(data));
});
}
constructor() {
this.initSocket();
}
ngOnInit(): void { }
}