From fcf88e3cde43ef9ba989b6cfb821c108af844a4d Mon Sep 17 00:00:00 2001 From: NyxiumYuuki Date: Tue, 1 Jun 2021 22:37:37 +0200 Subject: [PATCH] New Room dialog added --- .../src/app/private/private.component.html | 9 ++- frontend/src/app/private/private.component.ts | 73 ++++++++++++++----- 2 files changed, 63 insertions(+), 19 deletions(-) diff --git a/frontend/src/app/private/private.component.html b/frontend/src/app/private/private.component.html index f13d015..1d9bf5e 100644 --- a/frontend/src/app/private/private.component.html +++ b/frontend/src/app/private/private.component.html @@ -1,12 +1,17 @@
-
+ + + + + +

General

- +
diff --git a/frontend/src/app/private/private.component.ts b/frontend/src/app/private/private.component.ts index 6b54b24..031baad 100644 --- a/frontend/src/app/private/private.component.ts +++ b/frontend/src/app/private/private.component.ts @@ -2,6 +2,8 @@ import {Component, ElementRef, OnInit, ViewChild} from '@angular/core'; import {environment} from "../../environments/environment"; import {ChatService} from "../services/chat/chat.service"; import {MessageService} from "../services/message/message.service"; +import {CreateRoomDialogComponent} from "../create-room-dialog/create-room-dialog.component"; +import {MatDialog} from "@angular/material/dialog"; @Component({ selector: 'app-private', @@ -12,29 +14,15 @@ export class PrivateComponent implements OnInit { public username = sessionStorage.getItem('login'); public roomSelected = 'general'; + public privateRoomActivate = false; // @ts-ignore @ViewChild('userList') userList: ElementRef; - constructor(private chatservice: ChatService, private messageservice: MessageService) {} + constructor(private chatservice: ChatService, private messageservice: MessageService, public dialog: MatDialog) {} ngOnInit(): void { - 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); - //data.data = data.data.concat(data.data).concat(data.data).concat(data.data).concat(data.data).concat(data.data).concat(data.data).concat(data.data).concat(data.data); - for(let user of data.data){ - if(user !== undefined && user.login !== undefined){ - this.userList.nativeElement.insertAdjacentHTML('beforeend', '

'+user.login+'

'); - } - } - } - } - ); + this.changeListGeneral(); } selectRoom(event: Event): void { @@ -47,4 +35,55 @@ export class PrivateComponent implements OnInit { } } + changeListPrivate(): void{ + this.privateRoomActivate = true; + // @ts-ignore + document.getElementById('userList').innerHTML = ''; + this.messageservice.sendMessage(environment.urlCPR,'conversations/getRooms', {member: this.username}).subscribe( + data => { + if (data.status !== 'ok'){ + console.log(data.data.reason); + } + else{ + console.log(data.data); + for(let user of data.data){ + if(user !== undefined && user.roomName !== undefined){ + this.userList.nativeElement.insertAdjacentHTML('beforeend', '

'+user.roomName+'

'); + } + } + } + } + ); + } + + changeListGeneral(): void{ + this.privateRoomActivate = false; + // @ts-ignore + document.getElementById('userList').innerHTML = '

General

'; + this.messageservice.sendMessage(environment.urlCL,'getUsers', {username: this.username}).subscribe( + data => { + if (data.status !== 'ok'){ + console.log(data.data.reason); + } + else{ + for(let user of data.data){ + if(user !== undefined && user.login !== undefined){ + this.userList.nativeElement.insertAdjacentHTML('beforeend', '

'+user.login+'

'); + } + } + } + } + ); + } + + newRoom(): void{ + const dialogRef = this.dialog.open(CreateRoomDialogComponent, { + width: '50%', + data: {owner: this.username} + }); + dialogRef.afterClosed().subscribe(data => { + console.log(data); + this.changeListPrivate(); + }); + } }