Merge branch 'feature/chat' of bitbucket.org:equilibriumito/gabinete-digital into feature/calendar

This commit is contained in:
Peter Maquiran
2021-03-16 12:15:51 +01:00
9 changed files with 99 additions and 91 deletions
+1 -1
View File
@@ -39,9 +39,9 @@ ion-content{
font-family: Roboto;
margin: 0 auto;
background-color: #fff;
//overflow:auto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
overflow: auto;
.aside-wrapper{
padding: 0 !important;
+2 -3
View File
@@ -86,17 +86,16 @@ export class ChatPage implements OnInit {
this.authService.userData$.subscribe((res:any)=>{
this.loggedUser=res;
console.log(this.loggedUser);
this.load();
});
this.storage.get('userDataKey').then(val=> {
let t = JSON.parse(unescape(atob(val)));
this.loggedUser=t;
this.load();
//this.load();
})
console.log(this.roomId);
}
closeAllDesktopComponents() {
this.showMessages=false;