From 1dcf975c97a504040b365a78353ec82efef7c515 Mon Sep 17 00:00:00 2001 From: wilfried Date: Sat, 29 May 2021 23:04:28 +0200 Subject: [PATCH 01/92] rr --- .../src/app/general/general.component.html | 76 +++++++++++++------ frontend/src/app/login/login.component.html | 3 +- .../src/app/services/auth/auth.service.ts | 2 + .../app/services/message/message.service.ts | 1 + frontend/src/styles.scss | 10 ++- 5 files changed, 66 insertions(+), 26 deletions(-) diff --git a/frontend/src/app/general/general.component.html b/frontend/src/app/general/general.component.html index 21f47dc..9453b2c 100644 --- a/frontend/src/app/general/general.component.html +++ b/frontend/src/app/general/general.component.html @@ -1,25 +1,55 @@ - - - - Socket.IO chat - - - - -
- -
- - +
+
+ + + +

{{user?.login}}

+ +
+
+ + +
+ +
+ +
+

{{username}}

+
+ +
+
+ {{item.user}} : {{item.message}} +
+
    +
+
+ + +
+
+
+ + diff --git a/frontend/src/app/login/login.component.html b/frontend/src/app/login/login.component.html index 28e356d..814a887 100644 --- a/frontend/src/app/login/login.component.html +++ b/frontend/src/app/login/login.component.html @@ -24,5 +24,6 @@ - +
+ diff --git a/frontend/src/app/services/auth/auth.service.ts b/frontend/src/app/services/auth/auth.service.ts index 2b070eb..7d16dad 100644 --- a/frontend/src/app/services/auth/auth.service.ts +++ b/frontend/src/app/services/auth/auth.service.ts @@ -11,6 +11,8 @@ export class AuthService { // @ts-ignore islog: boolean; + // @ts-ignore + public currentUser; constructor(private messageService: MessageService) { } diff --git a/frontend/src/app/services/message/message.service.ts b/frontend/src/app/services/message/message.service.ts index 13b1560..ed7273a 100644 --- a/frontend/src/app/services/message/message.service.ts +++ b/frontend/src/app/services/message/message.service.ts @@ -25,3 +25,4 @@ export class MessageService { } } + diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 5e6c778..7ab98a2 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -5,6 +5,7 @@ body { .container-fluid { padding: 50px 200px; overflow: hidden; + background-color: #87CEEB; } .user-list-card { @@ -54,9 +55,10 @@ body { align-items: center; .username { - font-size: 14px; + font-size: 20px; font-weight: 500; margin-bottom: 0; + margin-left: 20px; display: flex; justify-content: center; align-items: center; @@ -64,7 +66,7 @@ body { } .chat-body { - background-image: url(./assets/image/user.png); + background-image: url(./assets/image/fond.png); background-repeat: no-repeat; background-size: cover; background-position: center center; @@ -107,3 +109,7 @@ body { } } } + +.modal-footer { + display: block; +} From 362a1f236ba2b005ed6fa2f8cc2c7fd318a064c5 Mon Sep 17 00:00:00 2001 From: wilfried Date: Sun, 30 May 2021 10:40:48 +0200 Subject: [PATCH 02/92] try frontend... --- .../src/app/general/general.component.html | 43 +++++---- frontend/src/app/general/general.component.ts | 2 +- frontend/src/styles.scss | 87 +++++++------------ 3 files changed, 52 insertions(+), 80 deletions(-) diff --git a/frontend/src/app/general/general.component.html b/frontend/src/app/general/general.component.html index 9453b2c..d909a79 100644 --- a/frontend/src/app/general/general.component.html +++ b/frontend/src/app/general/general.component.html @@ -5,50 +5,47 @@
-

{{user?.login}}

+

{{username}}

+
-
- + +
-

{{username}}

+

General Chat

-
- {{item.user}} : {{item.message}} -
+
- diff --git a/frontend/src/app/general/general.component.ts b/frontend/src/app/general/general.component.ts index 096d68b..383ffcc 100644 --- a/frontend/src/app/general/general.component.ts +++ b/frontend/src/app/general/general.component.ts @@ -11,7 +11,7 @@ import {MessageService} from "../services/message/message.service"; }) export class GeneralComponent implements OnInit { - private username = sessionStorage.getItem('login'); + public username = sessionStorage.getItem('login'); private room = 'general'; public msg = ''; diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 7ab98a2..0bbb80a 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -47,67 +47,42 @@ body { position: relative; overflow: hidden; - .chat-header { - height: 70px; - background-color: #E5E5E5; + +} + +.chat-header { + height: 70px; + border-radius: 10px; + background-color: #E5E5E5; + display: flex; + justify-content: flex-start; + align-items: center; + + .username { + font-size: 20px; + font-weight: 500; + margin-bottom: 0; + margin-left: 20px; display: flex; - justify-content: flex-start; + justify-content: center; align-items: center; - - .username { - font-size: 20px; - font-weight: 500; - margin-bottom: 0; - margin-left: 20px; - display: flex; - justify-content: center; - align-items: center; - } } +} - .chat-body { - background-image: url(./assets/image/fond.png); - background-repeat: no-repeat; - background-size: cover; - background-position: center center; - height: calc(100vh - 125px); - overflow-y: auto; +.chat-body { + background-color: white; + border-radius: 10px; + height: calc(89.5vh - 89.5px); + overflow-y: auto; +} - .message-container { - background-color: white; - padding: 7px; - border-radius: 5px; - width: fit-content; - max-width: 90%; - margin-bottom: 15px; - } - - .same-user { - display: flex; - justify-content: flex-end; - - .message-container { - background-color: lightskyblue; - } - } - } - - .chat-footer { - position: absolute; - bottom: 0; - left: 0; - right: 0; - background-color: #EDEDED; - padding: 10px 20px; - - .form-control { - background-color: white; - border: 1px solid #D8DDEC; - box-sizing: border-box; - font-size: 1rem; - color: black; - } - } +.chat-footer { + border-radius: 10px; + bottom: 0; + left: 0; + right: 0; + background-color: #EDEDED; + padding: 10px 20px; } .modal-footer { From c14c46a44442cc638fac984729684767c11cdcf4 Mon Sep 17 00:00:00 2001 From: NyxiumYuuki Date: Sun, 30 May 2021 11:24:52 +0200 Subject: [PATCH 03/92] change type input --- frontend/src/app/login/login.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/login/login.component.html b/frontend/src/app/login/login.component.html index 28e356d..7b5009d 100644 --- a/frontend/src/app/login/login.component.html +++ b/frontend/src/app/login/login.component.html @@ -11,7 +11,7 @@ placeholder="Entrez votre login" class="form-control" [(ngModel)]="login"> - From 8547ebf403a64738035c78587e474b54401ecc08 Mon Sep 17 00:00:00 2001 From: NyxiumYuuki Date: Sun, 30 May 2021 11:25:10 +0200 Subject: [PATCH 04/92] add left chat --- backend/service-message/server.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backend/service-message/server.js b/backend/service-message/server.js index 9798225..c436ca9 100644 --- a/backend/service-message/server.js +++ b/backend/service-message/server.js @@ -82,6 +82,13 @@ io.on('connection',socket => { socket.on("disconnect", function() { console.log(`${getUsername} left the chat.`); + socket.broadcast.emit('general',[{ + username: 'Server', + date: new Date(), + channel: 'general', + message: `${getUsername} left the chat.` + }]); + }); } }); From def91588a3ede93abb8400ae9c8197952eada0d3 Mon Sep 17 00:00:00 2001 From: NyxiumYuuki Date: Sun, 30 May 2021 18:11:44 +0200 Subject: [PATCH 05/92] Debug chat display --- frontend/src/styles.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 5e6c778..057c44d 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -12,7 +12,8 @@ body { border-radius: 10px; box-shadow: 0 10px 30px rgba(0, 0, 0, 0.05); height: calc(100vh - 100px); - padding: 10px; + padding: 0; + overflow-y: auto; .user-card { display: flex; @@ -28,6 +29,7 @@ body { font-weight: 500; margin-bottom: 0; display: flex; + margin-left: 5px; justify-content: center; align-items: center; } @@ -64,11 +66,11 @@ body { } .chat-body { - background-image: url(./assets/image/user.png); + background-color: white; background-repeat: no-repeat; background-size: cover; background-position: center center; - height: calc(100vh - 125px); + height: calc(89vh - 125px); overflow-y: auto; .message-container { From 5027493910d6abf66b074b68fedf7db459e215da Mon Sep 17 00:00:00 2001 From: NyxiumYuuki Date: Sun, 30 May 2021 18:12:18 +0200 Subject: [PATCH 06/92] Add leaveRoom (socket disconnect) --- frontend/src/app/services/chat/chat.service.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/src/app/services/chat/chat.service.ts b/frontend/src/app/services/chat/chat.service.ts index aee3fcb..7245b07 100644 --- a/frontend/src/app/services/chat/chat.service.ts +++ b/frontend/src/app/services/chat/chat.service.ts @@ -49,6 +49,11 @@ export class ChatService { }); } + leaveRoom(): void { + // @ts-ignore + this.socket?.disconnect(); + } + onNewMessage(room: string): Observable { return new Observable(observer => { // @ts-ignore From 0034b663912b30df7a826a02ee719f7a85e16da6 Mon Sep 17 00:00:00 2001 From: NyxiumYuuki Date: Sun, 30 May 2021 18:25:55 +0200 Subject: [PATCH 07/92] General renamed to message component --- .../src/app/general/general.component.html | 25 -------- .../src/app/general/general.component.scss | 0 .../src/app/general/general.component.spec.ts | 25 -------- frontend/src/app/general/general.component.ts | 61 ------------------- 4 files changed, 111 deletions(-) delete mode 100644 frontend/src/app/general/general.component.html delete mode 100644 frontend/src/app/general/general.component.scss delete mode 100644 frontend/src/app/general/general.component.spec.ts delete mode 100644 frontend/src/app/general/general.component.ts diff --git a/frontend/src/app/general/general.component.html b/frontend/src/app/general/general.component.html deleted file mode 100644 index 21f47dc..0000000 --- a/frontend/src/app/general/general.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - Socket.IO chat - - - -
    -
-
- -
- - diff --git a/frontend/src/app/general/general.component.scss b/frontend/src/app/general/general.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/src/app/general/general.component.spec.ts b/frontend/src/app/general/general.component.spec.ts deleted file mode 100644 index 99edc2f..0000000 --- a/frontend/src/app/general/general.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { GeneralComponent } from './general.component'; - -describe('GeneralComponent', () => { - let component: GeneralComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ GeneralComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(GeneralComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/frontend/src/app/general/general.component.ts b/frontend/src/app/general/general.component.ts deleted file mode 100644 index 096d68b..0000000 --- a/frontend/src/app/general/general.component.ts +++ /dev/null @@ -1,61 +0,0 @@ -import {Component, ElementRef, OnInit, ViewChild} from '@angular/core'; -import {ChatInfo, ChatService} from "../services/chat/chat.service"; -import {environment} from "../../environments/environment"; -import {DatePipe} from "@angular/common"; -import {MessageService} from "../services/message/message.service"; - -@Component({ - selector: 'app-general', - templateUrl: './general.component.html', - styleUrls: ['./general.component.scss'] -}) -export class GeneralComponent implements OnInit { - - private username = sessionStorage.getItem('login'); - private room = 'general'; - public msg = ''; - - // @ts-ignore - @ViewChild('ulMessages') ulMsg: ElementRef; - - - constructor(private chatservice: ChatService, private pipe: DatePipe, private messageservice: MessageService) {} - - ngOnInit() { - console.log('General working'); - this.messageservice.sendMessage(environment.urlCL,'getUsers', {username: this.username}).subscribe( - data => { - if (data.status !== 'ok'){ - console.log(data.data.reason); - } - else{ - console.log(data.data); - } - } - ); - this.chatservice.setUrl(environment.urlCG); - this.chatservice.setRoom(this.room); - this.chatservice.onNewMessage(this.room).subscribe((infos: ChatInfo[]) => { - for(let data of infos){ - if(data !== undefined && data.date !== undefined){ - if(data.username === 'Server'){ - this.ulMsg.nativeElement.insertAdjacentHTML('beforeend', '
  • '+data.message+'
  • '); - } - else{ - this.ulMsg.nativeElement.insertAdjacentHTML('beforeend','
  • ['+this.pipe.transform(data.date, 'dd/MM/yyyy HH:MM:ss')+'] '+data.username+' : '+data.message+'
  • '); - } - } - } - window.scrollTo(0, document.body.scrollHeight); - }); - } - - sendButtonClick(){ - console.log('Button working'); - if(this.msg && this.username){ - this.chatservice.sendMessage(this.username, this.room, this.msg); - console.log(this.username, this.room, this.msg); - this.msg = ''; - } - } -} From 4b8337c4f62406981d47719e120f434afecca6b3 Mon Sep 17 00:00:00 2001 From: NyxiumYuuki Date: Sun, 30 May 2021 18:27:32 +0200 Subject: [PATCH 08/92] Errormessage added + type and required added --- frontend/src/app/login/login.component.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/login/login.component.ts b/frontend/src/app/login/login.component.ts index b2c0c55..a675c18 100644 --- a/frontend/src/app/login/login.component.ts +++ b/frontend/src/app/login/login.component.ts @@ -20,16 +20,16 @@ export class LoginComponent implements OnInit { } showCredentials(): void { - console.log('Login :', this.login); - console.log('Password :', this.password); + // console.log('Login :', this.login); + // console.log('Password :', this.password); this.auth.sendAuthentication(this.login, this.password).subscribe(data => { this.auth.finalizeAuthentication(data); - if (this.auth.islog === true) { + if (this.auth.islog) { sessionStorage.setItem('login', this.login); - this.router.navigateByUrl('/general'); + this.router.navigateByUrl('/chat'); } else { this.errorMessage = data.data.reason; - console.log(this.errorMessage); + //console.log(this.errorMessage); } }); From 6f7e465b86211d1be0fa15d58a793427e5c0a920 Mon Sep 17 00:00:00 2001 From: NyxiumYuuki Date: Sun, 30 May 2021 18:28:48 +0200 Subject: [PATCH 09/92] Errormessage added + type and required added --- frontend/src/app/login/login.component.html | 34 +++++++++------------ 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/frontend/src/app/login/login.component.html b/frontend/src/app/login/login.component.html index 7b5009d..aa64ec3 100644 --- a/frontend/src/app/login/login.component.html +++ b/frontend/src/app/login/login.component.html @@ -2,27 +2,21 @@ - -