peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Peter Maquiran
2022-04-22 16:42:55 +01:00
parent 9823e58938 ecdf34edbc
commit c5f7e18f11
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/assets/capacitor.config.json
-3
View File
@@ -16,8 +16,5 @@
"sound" "sound"
] ]
} }
},
"server": {
"url": "http://192.168.0.38:8101"
} }
} }
src/app/pages/chat/messages/messages.page.html
+3 -2
View File
@@ -45,9 +45,9 @@
</ion-header> </ion-header>
<ion-content> <ion-content>
<div (click)="handleClick()" class="messages" #scrollMe> <div (click)="handleClick()" class="messages" #scrollMe>
<div class="messages-list-item-wrapper container-width-100" <ion-list>
<div class="messages-list-item-wrapper container-width-100"
*ngFor="let msg of wsChatMethodsService.getDmRoom(this.roomId).messages; let last = last" *ngFor="let msg of wsChatMethodsService.getDmRoom(this.roomId).messages; let last = last"
[class.messages-list-item-wrapper-active]="msg._id == selectedMsgId"> [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId">
<div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=sessionStore.user.UserName}}' <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=sessionStore.user.UserName}}'
@@ -204,6 +204,7 @@
Apagou a mensagem Apagou a mensagem
</div> </div>
</div> </div>
</ion-list>
</div> </div>
<ion-fab horizontal="end" vertical="bottom" slot="fixed"> <ion-fab horizontal="end" vertical="bottom" slot="fixed">
<ion-fab-button *ngIf="scrollToBottomBtn" (click)="scrollToBottomClicked()" color="light" size="small"> <ion-fab-button *ngIf="scrollToBottomBtn" (click)="scrollToBottomClicked()" color="light" size="small">
src/app/pages/login/login.page.ts
+2 -2
View File
@@ -111,9 +111,9 @@ export class LoginPage implements OnInit {
if(attempt.ChatData){ if(attempt.ChatData){
await this.authService.loginChat(attempt.ChatData.data); await this.authService.loginChat(attempt.ChatData.data);
try { //try {
await this.authService.loginToChatWs(); await this.authService.loginToChatWs();
} catch(e) {} // } catch(e) {}
} }
src/app/shared/chat/messages/messages.page.html
+6 -1
View File
@@ -34,7 +34,9 @@
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="messages" #scrollMe> <div class="messages" #scrollMe>
<div class="messages-list-item-wrapper container-width-100" <ion-list>
<div class="messages-list-item-wrapper container-width-100"
*ngFor="let msg of wsChatMethodsService.getDmRoom(roomId).messages; index as i; let last = last"> *ngFor="let msg of wsChatMethodsService.getDmRoom(roomId).messages; index as i; let last = last">
<div class='message-item incoming-{{msg.u.username!=sessionStore.user.UserName}} max-width-45' *ngIf="msg.msg !=''"> <div class='message-item incoming-{{msg.u.username!=sessionStore.user.UserName}} max-width-45' *ngIf="msg.msg !=''">
<div class="message-item-options d-flex justify-content-end"> <div class="message-item-options d-flex justify-content-end">
@@ -183,6 +185,9 @@
</div> </div>
</ion-list>
</div> </div>
<ion-fab horizontal="end" vertical="bottom" slot="fixed"> <ion-fab horizontal="end" vertical="bottom" slot="fixed">