mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
Merge branch 'feature/chat' of bitbucket.org:equilibriumito/gabinete-digital into feature/calendar
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user