From 6a0e65393bc270f0919a1a1fea916089d53919a2 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 23 Jul 2021 15:28:51 +0100 Subject: [PATCH 1/9] save --- src/environments/environment.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 8532c63aa..9a6f9b6f9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,8 +4,8 @@ export const environment = { production: false, - apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/', - /* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/', */ + /* apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/', */ + apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */ domain: 'gabinetedigital.local', //gabinetedigital.local From 03d52e09186bbdefa838ce2b27d2b90b0999c5e1 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 26 Jul 2021 09:44:11 +0100 Subject: [PATCH 2/9] save --- src/app/pages/chat/chat.page.ts | 11 +- .../group-messages/group-messages.page.html | 2 +- src/app/pages/chat/messages/messages.page.ts | 5 +- src/app/services/chat.service.ts | 100 +++++++++--------- src/app/services/websocket.service.ts | 2 +- .../group-messages/group-messages.page.html | 6 +- .../group-messages/group-messages.page.ts | 20 +++- src/app/shared/chat/messages/messages.page.ts | 14 +-- 8 files changed, 82 insertions(+), 78 deletions(-) diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index b30f385cb..43caf1ab2 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -103,7 +103,6 @@ export class ChatPage implements OnInit { ){ this.loggedUserChat = authService.ValidatedUserChat['data']; this.headers = new HttpHeaders(); - this.loadMessage(); } ngOnInit() { @@ -140,16 +139,16 @@ hideRefreshButton(){ } -loadMessage(){ +/* loadMessage(){ this.chatService.messages.subscribe(msg => { console.log("Response from websocket: " + msg); }); -} -sendMsg() { +} */ +/* sendMsg() { console.log("new message from client to websocket: ", this.message); this.chatService.messages.next(this.message); this.message.msg = ""; -} +} */ /* Fim websockets functions */ @@ -168,9 +167,7 @@ sendMsg() { this.showEmptyComponent=true; } openGroupContactsPage(data){ - console.log(data); this.groupRoomId = data; - console.log(this.groupRoomId); this.closeAllDesktopComponents(); if(window.innerWidth <= 1024){ diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 8591a6dca..2ab28f6eb 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -37,7 +37,7 @@ Esta conversa passou a grupo
A conversa original mantêm-se como chat individual -
+
{{msg.u.name}} diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 06df3ea3a..50bad6262 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -49,8 +49,8 @@ export class MessagesPage implements OnInit, AfterViewChecked { /* setInterval(()=>{ */ this.load(); /* }, 9000); */ - this.el = document.getElementById("scrollToBottom"); - this.el.scrollTop = this.el.scrollHeight - this.el.scrollTop; + /* this.el = document.getElementById("scrollToBottom"); + this.el.scrollTop = this.el.scrollHeight - this.el.scrollTop; */ } @@ -78,7 +78,6 @@ export class MessagesPage implements OnInit, AfterViewChecked { try { this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight; } catch(err) { } - } sendMessage(){ diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index 838225d47..0d00b4bb6 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -20,8 +20,8 @@ export class ChatService { X_User_Id:any; X_Auth_Token:any; - SERVER_URL = 'wss://www.tabularium.pt/websocket'; - public messages: Subject; + //SERVER_URL = 'wss://www.tabularium.pt/websocket'; + //public messages: Subject; loggedUserChat:any; constructor( @@ -30,7 +30,7 @@ export class ChatService { private authService: AuthService, private storage: Storage, private storageService:StorageService, - private wsService: WebsocketService, + //private wsService: WebsocketService, ) { this.loggedUserChat = authService.ValidatedUserChat; @@ -41,13 +41,13 @@ export class ChatService { headers: this.headers, }; - this.messages = >this.wsService.connect(this.SERVER_URL).map((response: MessageEvent): any => { + /* this.messages = >this.wsService.connect(this.SERVER_URL).map((response: MessageEvent): any => { let data = JSON.parse(response.data); console.log(data); return (JSON.stringify(data)); - }); + }); */ } - + getAllChannels(){ return this.http.get(environment.apiChatUrl+'channels.list', this.options); } @@ -61,17 +61,17 @@ export class ChatService { getRoomInfo(roomId:any){ let params = new HttpParams(); params = params.set("roomId", roomId); - let opts = { - headers: this.headers, - params: params + let opts = { + headers: this.headers, + params: params } return this.http.get(environment.apiChatUrl+'rooms.info', opts); - + } customsRooms(params:any){ - let opts = { - headers: this.headers, - params: params + let opts = { + headers: this.headers, + params: params } return this.http.get(environment.apiChatUrl+'rooms.get', opts); } @@ -95,22 +95,22 @@ export class ChatService { let params = new HttpParams(); params = params.set("roomId", roomId); - - let opts = { - headers: this.headers, - params: params + + let opts = { + headers: this.headers, + params: params } return this.http.get(environment.apiChatUrl+'im.history', opts); } sendMessage(body:any){ - let opts = { + let opts = { headers: this.headers, } return this.http.post(environment.apiChatUrl+'chat.sendMessage', body, opts); } leaveRoom(body:any){ - let opts = { + let opts = { headers: this.headers, } return this.http.post(environment.apiChatUrl+'rooms.leave', body, opts); @@ -120,15 +120,15 @@ export class ChatService { let params = new HttpParams(); params = params.set("roomId", roomId); - - let opts = { - headers: this.headers, - params: params + + let opts = { + headers: this.headers, + params: params } return this.http.get(environment.apiChatUrl+'im.members', opts); } removeChatRoom(body:any){ - let opts = { + let opts = { headers: this.headers, } return this.http.post(environment.apiChatUrl+'im.close', body, this.options); @@ -139,10 +139,10 @@ export class ChatService { getDirectMessage(roomId:string){ let params = new HttpParams(); params = params.set("roomId", roomId); - - let opts = { - headers: this.headers, - params: params + + let opts = { + headers: this.headers, + params: params } return this.http.get(environment.apiChatUrl+'im.messages', opts); } @@ -155,10 +155,10 @@ export class ChatService { let params = new HttpParams(); let url=environment.apiChatUrl+'groups.members'; params = params.set("roomId", roomId); - - let opts = { - headers: this.headers, - params: params + + let opts = { + headers: this.headers, + params: params } return this.http.get(url, opts); } @@ -166,10 +166,10 @@ export class ChatService { let params = new HttpParams(); let url=environment.apiChatUrl+'channels.members'; params = params.set("roomId", roomId); - - let opts = { - headers: this.headers, - params: params + + let opts = { + headers: this.headers, + params: params } return this.http.get(url, opts); } @@ -178,20 +178,20 @@ export class ChatService { let params = new HttpParams(); params = params.set("roomId", roomId); - - let opts = { - headers: this.headers, - params: params + + let opts = { + headers: this.headers, + params: params } return this.http.get(environment.apiChatUrl+'groups.history', opts); } getPublicGroupMessages(roomId:any){ let params = new HttpParams(); params = params.set("roomId", roomId); - - let opts = { - headers: this.headers, - params: params + + let opts = { + headers: this.headers, + params: params } return this.http.get(environment.apiChatUrl+'channels.history', opts); } @@ -208,7 +208,7 @@ export class ChatService { return this.http.post(environment.apiChatUrl+'channels.leave', body, this.options); } removeChannelMember(body:any){ - let opts = { + let opts = { headers: this.headers, } return this.http.post(environment.apiChatUrl+'channels.kick', body, opts); @@ -225,10 +225,10 @@ export class ChatService { getGroupInfo(roomId:any){ let params = new HttpParams(); params = params.set("roomId", roomId); - - let opts = { - headers: this.headers, - params: params + + let opts = { + headers: this.headers, + params: params } return this.http.get(environment.apiChatUrl+'groups.info', opts); } @@ -236,7 +236,7 @@ export class ChatService { return this.http.post(environment.apiChatUrl+'groups.rename', body, this.options); } removeGroupMember(body:any){ - let opts = { + let opts = { headers: this.headers, } return this.http.post(environment.apiChatUrl+'groups.kick', body, opts); diff --git a/src/app/services/websocket.service.ts b/src/app/services/websocket.service.ts index a4a9d8471..424a6914e 100644 --- a/src/app/services/websocket.service.ts +++ b/src/app/services/websocket.service.ts @@ -25,7 +25,7 @@ export class WebsocketService { let ws = new WebSocket(url); console.log(ws); - + let observable = Rx.Observable.create((obs: Rx.Observer) => { ws.onmessage = obs.next.bind(obs); diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index e6ff5712f..ef014d413 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -36,8 +36,8 @@ {{message}} Esta conversa passou a grupo
A conversa original mantêm-se como chat individual
-
-
+
+
{{msg.u.name}} @@ -68,7 +68,7 @@
- diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index f3d67b623..36e609cc9 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -1,4 +1,4 @@ -import { Component, OnChanges, OnInit, Input, SimpleChanges, Output, EventEmitter} from '@angular/core'; +import { Component, OnChanges, OnInit, Input, SimpleChanges, Output, EventEmitter, ViewChild, ElementRef, AfterViewChecked} from '@angular/core'; import { ActionSheetController, AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; @@ -14,7 +14,7 @@ import { GroupContactsPage } from './group-contacts/group-contacts.page'; templateUrl: './group-messages.page.html', styleUrls: ['./group-messages.page.scss'], }) -export class GroupMessagesPage implements OnInit, OnChanges { +export class GroupMessagesPage implements OnInit, OnChanges, AfterViewChecked { showLoader: boolean; isGroupCreated:boolean; loggedUser: any; @@ -34,6 +34,8 @@ export class GroupMessagesPage implements OnInit, OnChanges { @Output() openGroupContacts:EventEmitter = new EventEmitter(); @Output() openEditGroupPage:EventEmitter = new EventEmitter(); + @ViewChild('scrollMe') private myScrollContainer: ElementRef; + constructor( private menu: MenuController, private modalController: ModalController, @@ -49,6 +51,7 @@ export class GroupMessagesPage implements OnInit, OnChanges { } ngOnChanges(changes: SimpleChanges): void { this.getRoomInfo(); + this.scrollToBottom(); } ngOnInit() { @@ -57,8 +60,16 @@ export class GroupMessagesPage implements OnInit, OnChanges { console.log(this.roomId); } - notImplemented(){ - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + ngAfterViewChecked() { + this.scrollToBottom(); + } + + scrollToBottom(): void { + try { + this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight; + } catch(err) { } + finally { + } } openGroupContactsPage(){ @@ -73,6 +84,7 @@ export class GroupMessagesPage implements OnInit, OnChanges { this.getRoomInfo(); ev.target.complete(); } + get watch(){ this.getRoomInfo(); console.log('here watching'); diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index cce722c73..c4db23c5d 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -45,15 +45,14 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges { /* this.dm = this.navParams.get('dm'); */ } ngOnChanges(changes: SimpleChanges): void { - console.log(this.roomId); - this.load(); + //this.load(); //throw new Error('Method not implemented.'); } ngOnInit() { - //this.scrollToBottom(); + this.scrollToBottom(); /* setInterval(()=>{ */ this.load(); @@ -79,20 +78,17 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges { } ngAfterViewChecked() { - //this.scrollToBottom(); - console.log(this.roomId); + this.scrollToBottom(); } - /* scrollToBottom(): void { - const loader = this.toastService.loading() + scrollToBottom(): void { try { this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight; } catch(err) { } finally { - loader.remove() } + } - } */ loadMoreMessages(ev:any){ } From 22134e4b48d86878911e265e009cc765a24f073b Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 26 Jul 2021 09:44:52 +0100 Subject: [PATCH 3/9] save --- src/app/shared/chat/messages/messages.page.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index bec13d054..a30d5ad00 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -48,7 +48,6 @@ - FOOter
From d8d0d47a13bcd5574275bc249c4449b7d4687421 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 26 Jul 2021 10:03:59 +0100 Subject: [PATCH 6/9] save --- src/app/pages/chat/group-messages/group-messages.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 2ab28f6eb..1b0535c0d 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -90,7 +90,7 @@
- From e9f5903ff5aba4ede2906b32bab3eb415a572aa8 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 26 Jul 2021 10:09:33 +0100 Subject: [PATCH 7/9] save --- src/app/pages/chat/chat.page.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 0c9346ee0..2e5485424 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -169,7 +169,7 @@ hideRefreshButton(){ openGroupContactsPage(data){ this.groupRoomId = data; this.closeAllDesktopComponents(); - if(window.innerWidth <= 1024){ + if(window.innerWidth < 801){ } else{ @@ -177,7 +177,7 @@ hideRefreshButton(){ } } openMessagesPage(rid) { - if( window.innerWidth <= 1024){ + if( window.innerWidth < 801){ this.openMessagesModal(rid); } else{ @@ -191,7 +191,7 @@ hideRefreshButton(){ console.log('OK'); this.closeAllDesktopComponents(); - if( window.innerWidth <= 1024){ + if( window.innerWidth < 801){ this.selectContact(); } else{ @@ -200,7 +200,7 @@ hideRefreshButton(){ } } openNewGroupPage() { - if( window.innerWidth <= 1024){ + if( window.innerWidth < 801){ this.newGroup(); } else{ @@ -210,7 +210,7 @@ hideRefreshButton(){ } openEditGroupPage(rid) { - if( window.innerWidth <= 1024){ + if( window.innerWidth < 801){ this.editGroup(rid); } else{ @@ -222,7 +222,7 @@ hideRefreshButton(){ openGroupMessagesPage(rid) { console.log(rid); - if( window.innerWidth <= 1024){ + if( window.innerWidth < 801){ this.openGroupMessagesModal(rid); } else{ From b82341457598a1b9f257df2b44f10cf67787b0bb Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 26 Jul 2021 10:48:34 +0100 Subject: [PATCH 8/9] save --- src/app/pages/chat/chat.page.scss | 10 +++++----- .../group-messages/group-messages.page.html | 2 +- .../group-messages/group-messages.page.scss | 17 +++++++++++------ .../chat/group-messages/group-messages.page.ts | 2 +- src/app/shared/chat/messages/messages.page.html | 2 +- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss index 09db58932..8e1d8545a 100644 --- a/src/app/pages/chat/chat.page.scss +++ b/src/app/pages/chat/chat.page.scss @@ -20,7 +20,7 @@ ion-content{ } .div-icon{ display: flex; - width: 50%; + width: fit-content; float: right; font-size: 35px; overflow: auto; @@ -32,7 +32,7 @@ ion-content{ padding-left: 20px; } } - + .main-content{ font-family: Roboto; @@ -104,9 +104,9 @@ ion-content{ color: #000; } } -@media only screen and (min-width: 1024px) { +@media only screen and (min-width: 801px) { .main-content{ - + .aside-wrapper{ width: 35%; @@ -131,7 +131,7 @@ ion-content{ width: 90%; } } - + } } diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index ef014d413..c0b2753e3 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -68,7 +68,7 @@
- diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss index 77fcebb70..88a31c1ba 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.scss +++ b/src/app/shared/chat/group-messages/group-messages.page.scss @@ -10,7 +10,7 @@ padding: 30px 20px 0px 20px; color:#000; //transform: translate3d(0, 1px, 0); - + .header-top{ width: 100%; overflow: auto; @@ -52,7 +52,7 @@ margin: 1px; } } - + .title{ font-size: 25px; } @@ -66,7 +66,7 @@ .div-icon ion-icon{ float: right; padding-left: 20px; - } + } } } ion-content{ @@ -159,9 +159,9 @@ .container{ justify-content: center; justify-content: space-evenly; - + } - + .chat-icon-options{ display:block !important; font-size: 25px; @@ -183,10 +183,15 @@ align-items: center; overflow: auto; + ion-textarea{ + width: fit-content; + display: block; margin: 0 !important; align-self: center; + border: 1px solid red; + //overflow: auto; } } - + } diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 36e609cc9..b2098e07f 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -18,7 +18,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewChecked { showLoader: boolean; isGroupCreated:boolean; loggedUser: any; - message:any; + message:any=""; leaveStatus:any; messages:any; diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index a30d5ad00..c2b613be9 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -57,7 +57,7 @@
- From b6c9008ae08e278f1b2ac0e1c8c23d61cfd0bb78 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 26 Jul 2021 10:48:57 +0100 Subject: [PATCH 9/9] save --- src/app/shared/chat/group-messages/group-messages.page.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss index 88a31c1ba..9873b07ef 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.scss +++ b/src/app/shared/chat/group-messages/group-messages.page.scss @@ -189,7 +189,7 @@ display: block; margin: 0 !important; align-self: center; - border: 1px solid red; + //border: 1px solid red; //overflow: auto; } }