diff --git a/package-lock.json b/package-lock.json index 88a50acfd..228bc2678 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17290,8 +17290,7 @@ }, "ssri": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "resolved": "", "dev": true, "requires": { "figgy-pudding": "^3.5.1" diff --git a/package.json b/package.json index 4811311de..386204484 100644 --- a/package.json +++ b/package.json @@ -138,4 +138,4 @@ "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git" }, "license": "ISC" -} \ No newline at end of file +} diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html index 7b473c119..09dfeb3d2 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html @@ -3,7 +3,9 @@
- +
Contactos @@ -33,11 +35,16 @@
Contactos selecção: -
- -

{{user.name}}

- -
+ + + +

{{user.name}}

+ +
+ + Apagar + +
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss index b6e007730..7879b0cae 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss @@ -93,10 +93,15 @@ .members-checkbox{ display: flex; - margin: .5px 20px .5px 20px !important; + margin: 0px 20px 0px 20px !important; overflow: auto; align-items: center; + border-bottom: 1px solid #ebebeb; + } + .members-options{ + margin: 0px 20px 0px 19px !important; + overflow: auto; } .item-divider{ @@ -114,11 +119,17 @@ align-items: center; } + + .members-checkbox ion-checkbox{ + --border-color: #0d89d1; + --background-checked:#0d89d1; + float: left; + } - .item-checkbox ion-checkbox, .members-checkbox ion-checkbox{ + .item-checkbox ion-checkbox{ --border-color: #0d89d1; --background-checked:#0d89d1; - float: left; + float: left; } .item-checkbox p, .members-checkbox p{ diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts index c1fdc3618..682e002a8 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts @@ -57,6 +57,28 @@ export class GroupContactsPage implements OnInit { console.log(this.isGroupCreated); } + deleteMember(data:any){ + let body = { + "roomId": this.room._id, + "userId": data._id, + } + console.log(this.room); + + console.log(body); + if(this.room.t == "p"){ + this.chatService.removeGroupMember(body).subscribe(res=>{ + console.log(res); + this.loadUsers(); + }); + } + else if(this.room.t == "c"){ + this.chatService.removeChannelMember(body).subscribe(res=>{ + console.log(res); + this.loadUsers(); + }); + } + } + loadUsers(){ this.options = { headers: this.headers, diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 3e288ecf2..2aaefbe54 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -98,7 +98,7 @@ export class LoginPage implements OnInit { } if (await this.authService.login(this.userattempt)) { this.loginRocketChat(); - this.getToken(); + //this.getToken(); this.router.navigate(['/home/events']); } diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index 6d68c7b70..b221f27a9 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -119,6 +119,12 @@ export class ChatService { } return this.http.post(environment.apiChatUrl+'chat.sendMessage', body, opts); } + leaveRoom(body:any){ + let opts = { + headers: this.headers, + } + return this.http.post(environment.apiChatUrl+'rooms.leave', body, opts); + } //Load members from a chat getMembers(roomId:any){ @@ -205,6 +211,12 @@ export class ChatService { closeChannel(body:any){ return this.http.post(environment.apiChatUrl+'channels.close', body, this.options); } + removeChannelMember(body:any){ + let opts = { + headers: this.headers, + } + return this.http.post(environment.apiChatUrl+'channels.kick', body, opts); + } deleteGroup(body:any){ return this.http.post(environment.apiChatUrl+'groups.delete', body, this.options); } @@ -227,5 +239,11 @@ export class ChatService { renameGroup(body:any){ return this.http.post(environment.apiChatUrl+'groups.rename', body, this.options); } + removeGroupMember(body:any){ + let opts = { + headers: this.headers, + } + return this.http.post(environment.apiChatUrl+'groups.kick', body, opts); + } }