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/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index b30f385cb..2e5485424 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,11 +167,9 @@ sendMsg() {
this.showEmptyComponent=true;
}
openGroupContactsPage(data){
- console.log(data);
this.groupRoomId = data;
- console.log(this.groupRoomId);
this.closeAllDesktopComponents();
- if(window.innerWidth <= 1024){
+ if(window.innerWidth < 801){
}
else{
@@ -180,8 +177,8 @@ sendMsg() {
}
}
openMessagesPage(rid) {
- if( window.innerWidth <= 1024){
- //this.openMessagesModal(rid);
+ if( window.innerWidth < 801){
+ this.openMessagesModal(rid);
}
else{
this.closeAllDesktopComponents();
@@ -194,7 +191,7 @@ sendMsg() {
console.log('OK');
this.closeAllDesktopComponents();
- if( window.innerWidth <= 1024){
+ if( window.innerWidth < 801){
this.selectContact();
}
else{
@@ -203,7 +200,7 @@ sendMsg() {
}
}
openNewGroupPage() {
- if( window.innerWidth <= 1024){
+ if( window.innerWidth < 801){
this.newGroup();
}
else{
@@ -213,7 +210,7 @@ sendMsg() {
}
openEditGroupPage(rid) {
- if( window.innerWidth <= 1024){
+ if( window.innerWidth < 801){
this.editGroup(rid);
}
else{
@@ -225,7 +222,7 @@ sendMsg() {
openGroupMessagesPage(rid) {
console.log(rid);
- if( window.innerWidth <= 1024){
+ if( window.innerWidth < 801){
this.openGroupMessagesModal(rid);
}
else{
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..1b0535c0d 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 @@