diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 51e875035..45c936c76 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -24,10 +24,6 @@ Acções - - - Pesquisa - Chat diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index c709a2439..32138f4be 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -1,4 +1,4 @@ -import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; import { AuthService } from 'src/app/services/auth.service'; @@ -70,8 +70,16 @@ export class ChatPage implements OnInit { /* setInterval(()=>{ */ this.getDirectMessages(); this.getGroups(); + this.customRoom(); /* }, 2000); */ } + customRoom(){ + let params = new HttpParams(); + params = params.set("types", "c"); + this.chatService.customsRooms(params).subscribe(res=>{ + console.log(res); + }); + } getDirectMessages(){ this.showLoader = true; diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 1cf3a7fe1..15a261c8a 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -117,6 +117,9 @@ export class GroupMessagesPage implements OnInit { component: ChatPopoverPage, cssClass: 'chat-popover', event: ev, + componentProps: { + room: this.room, + }, translucent: true }); return await popover.present(); @@ -127,7 +130,7 @@ export class GroupMessagesPage implements OnInit { cssClass: 'chat-options-popover', event: ev, componentProps: { - roomId: this.room._id, + room: this.room, }, translucent: true }); diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 962278a8d..302f8d8d3 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -55,19 +55,19 @@ export class LoginPage implements OnInit { await alert.present(); } - /* loginRocketChat(){ + loginRocketChat(){ this.authService.loginChat(this.postData).subscribe((res: any) =>{ this.storageService.store(AuthConnstants.AUTH, res.data); console.log('Login to Rocket chat OK'); },(error:any) =>{ console.log('Network error'); }); - } */ + } async Login(){ - /* try { */ + try { //Go to our home in home/feed. //this.router.navigate(['/home/events']); if(this.validateInput()){ @@ -78,7 +78,7 @@ export class LoginPage implements OnInit { BasicAuthKey: "" } if (await this.authService.login(this.userattempt)){ - /* this.loginRocketChat(); */ + this.loginRocketChat(); this.router.navigate(['/home/events']); } else @@ -91,9 +91,9 @@ export class LoginPage implements OnInit { //this.toastService.presentToast('Preencha todos campos'); this.presentAlert('Por favor, insira o seu nome de utilizador e palavra-passe.'); } - /* } catch (error) { + } catch (error) { error - this.presentAlert('Ocorreu um erro ao fazer login. Contacte o administrador de sistema. '+ error); - } */ + this.presentAlert('Ocorreu um erro ao fazer login. Contacte o administrador de sistema. '); + } } } diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index d41fc88ea..c2f93da88 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -67,6 +67,13 @@ export class ChatService { getAllRooms(){ return this.http.get(environment.apiChatUrl+'rooms.get', this.options); } + customsRooms(params:any){ + let opts = { + headers: this.headers, + params: params + } + return this.http.get(environment.apiChatUrl+'rooms.get', opts); + } getAllPrivateGroups(){ return this.http.get(environment.apiChatUrl+'groups.list', this.options); } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 597a17cd2..31b168f32 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -5,6 +5,7 @@ export const environment = { production: false, apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V3/api/', + /* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */ apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', domain: 'gabinetedigital.local', defaultuser: 'paulo.pinto',