diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 736ecbf38..8251c8678 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -17,7 +17,7 @@
-
+
@@ -229,7 +229,7 @@
-
@@ -271,7 +271,7 @@
-
@@ -327,7 +327,7 @@
-
-
-
\ No newline at end of file
+
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 2b6880152..678d7e141 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -1,6 +1,7 @@
import { AfterViewChecked, AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router'
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { map } from 'rxjs/operators';
import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page';
import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service';
@@ -151,7 +152,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
loadMessages() {
this.showLoader = true;
const roomId = this.roomId
-
+
this.chatService.getRoomMessages(this.roomId).subscribe(res => {
/* console.log(res); */
this.messages = res['messages'].reverse();
@@ -252,9 +253,18 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
async serverLongPull() {
+ alert('YAS')
const roomId = this.roomId
- this.chatService.getRoomMessages(roomId).subscribe(async res => {
+
+ this.chatService.getRoomMessages(roomId).subscribe(res=>{
+ console.log(res);
+
+ })
+
+
+ /* this.chatService.getRoomMessages(roomId).subscribe(async res => {
+
if (res == 502) {
// Connection timeout
@@ -287,7 +297,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
//this.loadMessages()
await this.serverLongPull();
}
- });
+ }); */
}
}
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index ee388ca95..5500b8c4d 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -102,7 +102,7 @@ export class LoginPage implements OnInit {
if (attempt) {
await this.authService.loginChat(this.userattempt);
await this.getToken();
-
+
this.router.navigate(['/pin']);
}
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 8d21e8119..440a2e978 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -99,7 +99,7 @@ export class ChatService {
let opts = {
headers: this.headers,
- params: params
+ params: params,
}
return this.http.get(environment.apiChatUrl+'im.history', opts);
}
diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html
index 348467823..71ac37fc9 100644
--- a/src/app/shared/agenda/event-list/event-list.page.html
+++ b/src/app/shared/agenda/event-list/event-list.page.html
@@ -33,7 +33,7 @@