diff --git a/frontend/src/app/general/general.component.html b/frontend/src/app/general/general.component.html index 96d610a..aa993e6 100644 --- a/frontend/src/app/general/general.component.html +++ b/frontend/src/app/general/general.component.html @@ -1,52 +1,24 @@ -
-
+ + + + Socket.IO chat + + + + +
+ +
+ + diff --git a/frontend/src/app/general/general.component.ts b/frontend/src/app/general/general.component.ts index e6b5700..053c00d 100644 --- a/frontend/src/app/general/general.component.ts +++ b/frontend/src/app/general/general.component.ts @@ -1,8 +1,8 @@ -import { Component, OnInit } from '@angular/core'; -import {ChatService} from "../services/chat/chat.service"; +import {Component, Inject, Input, OnInit} from '@angular/core'; +import {ChatInfo, ChatService} from "../services/chat/chat.service"; import {AuthService} from "../services/auth/auth.service"; import {MessageService} from "../services/message/message.service"; -import {MatTableDataSource} from "@angular/material/table"; +import {environment} from "../../environments/environment"; @Component({ selector: 'app-general', @@ -10,123 +10,28 @@ import {MatTableDataSource} from "@angular/material/table"; styleUrls: ['./general.component.scss'] }) export class GeneralComponent implements OnInit { - dataSource = new MatTableDataSource(); - // @ts-ignore - public user:String; - // @ts-ignore - public room:String; - // @ts-ignore - public messageText: string; - messageArray:Array<{user:String,message:String}> = []; - private storageArray = []; - // @ts-ignore - public showScreen: boolean; + private username = sessionStorage.getItem('login'); + private room = 'general'; + public msg = ''; - // @ts-ignore - public password: string; - - // @ts-ignore - public selectedUser; - - - - constructor(private Auth: AuthService, - private chatService: ChatService, - private MS: MessageService - ) { - - - this.chatService.newUserJoined() - .subscribe(data=> this.messageArray.push(data)); - - - this.chatService.userLeftRoom() - .subscribe(data=>this.messageArray.push(data)); - - this.chatService.getMessage() - .subscribe(data=>this.messageArray.push(data)); - } - ngOnInit(): void { - this.MS.sendMessage('Cours/CoursGet', {}).subscribe( send => { - console.log(send.data); - this.dataSource.data = send.data as userList[]; + constructor(private chatservice: ChatService) {} + ngOnInit() { + console.log('General working'); + this.chatservice.setUrl(environment.urlCG); + this.chatservice.onNewMessage().subscribe(infos => { + console.log('message : '+infos); }); - // this.chatService.getMessage() - // .subscribe((data: {user: string, message: string}) => { - // this.messageArray.push(data); - // if (this.room) { - // setTimeout( () => { - // this.storageArray = this.chatService.getStorage(); - // //@ts-ignore - // const storeIndex = this.storageArray.findIndex((storage) => storage.room === this.room); - // //@ts-ignore - // this.messageArray = this.storageArray[storeIndex].chats; - // }, 500); - // } - // }); - } - // selectUserHandler(password: string): void { - // //this.selectedUser = this.userList.find(user => user.password === password); - // this.room = this.selectedUser.room[this.currentUser.id]; - // this.messageArray = []; - // - // this.storageArray = this.chatService.getStorage(); - // // @ts-ignore - // const storeIndex = this.storageArray.findIndex((storage) => storage.room === this.room); - // - // if (storeIndex > -1) { - // // @ts-ignore - // this.messageArray = this.storageArray[storeIndex].chats; - // } - // - // // @ts-ignore - // this.join(this.currentUser.name, this.room); - // } + sendButtonClick(){ + console.log('Button working'); + if(this.msg){ + this.chatservice.sendMessage(this.username, this.room, this.msg); + console.log(this.username, this.room, this.msg); + this.msg = ''; + } - join(username: string, room: string): void { - this.chatService.joinRoom({user: username, room: room}); } - - sendMessage() - { - this.chatService.sendMessage({user:this.user, room:this.room, message:this.messageText}); - - // this.storageArray = this.chatService.getStorage(); - // // @ts-ignore - // const storeIndex = this.storageArray.findIndex((storage) => storage.room === this.room); - // - // if (storeIndex > -1) { - // // @ts-ignore - // this.storageArray[storeIndex].chats.push({ - // user: this.currentUser.name, - // message: this.messageText - // }) - // } else { - // const updateStorage = { - // room: this.room, - // chats: [{ - // user: this.currentUser.name, - // message: this.messageText - // }] - // }; - // // @ts-ignore - // this.storageArray.push(updateStorage); - // } - // this.chatService.setStorage(this.storageArray); - // this.messageText = ''; - } - - - leave(){ - this.chatService.leaveRoom({login:this.dataSource.data, room:this.room}); - } - - -} -export interface userList { - login: string; }