mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
fix
This commit is contained in:
Generated
+3
-3
@@ -6300,9 +6300,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"beast-orm": {
|
"beast-orm": {
|
||||||
"version": "1.0.3",
|
"version": "1.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.0.3.tgz",
|
"resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.0.4.tgz",
|
||||||
"integrity": "sha512-kSTc8Sosm1CbLjSGc+nA1s9i4QmGQoF1rfWDmhTrHOvH+uZAtRXbZAypzscMmF67g04mK5XAuB+TUoKV5XmNiQ=="
|
"integrity": "sha512-3x4cw/0/JjrUksNtzUXC1RcBgsTky6uf8fzh6AnbOrzk5Y9KFUStIVkGBPydtxmtxLO3+gtspyqvH5VdIid6FA=="
|
||||||
},
|
},
|
||||||
"big-integer": {
|
"big-integer": {
|
||||||
"version": "1.6.49",
|
"version": "1.6.49",
|
||||||
|
|||||||
+1
-1
@@ -104,7 +104,7 @@
|
|||||||
"angular-svg-icon": "^12.0.0",
|
"angular-svg-icon": "^12.0.0",
|
||||||
"angular-tag-cloud-module": "^5.2.2",
|
"angular-tag-cloud-module": "^5.2.2",
|
||||||
"base64-js": "^1.5.1",
|
"base64-js": "^1.5.1",
|
||||||
"beast-orm": "^1.0.3",
|
"beast-orm": "^1.0.4",
|
||||||
"bootstrap": "^4.5.0",
|
"bootstrap": "^4.5.0",
|
||||||
"build": "0.1.4",
|
"build": "0.1.4",
|
||||||
"capacitor-voice-recorder": "^2.0.0",
|
"capacitor-voice-recorder": "^2.0.0",
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import { NewGroupPage } from '../../new-group/new-group.page';
|
|||||||
import { GroupMessagesPage } from '../group-messages.page';
|
import { GroupMessagesPage } from '../group-messages.page';
|
||||||
import { ThemeService } from 'src/app/services/theme.service'
|
import { ThemeService } from 'src/app/services/theme.service'
|
||||||
import { SessionStore } from 'src/app/store/session.service';
|
import { SessionStore } from 'src/app/store/session.service';
|
||||||
|
import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-group-contacts',
|
selector: 'app-group-contacts',
|
||||||
@@ -40,7 +41,8 @@ export class GroupContactsPage implements OnInit {
|
|||||||
private chatService: ChatService,
|
private chatService: ChatService,
|
||||||
private authService: AuthService,
|
private authService: AuthService,
|
||||||
private navParams: NavParams,
|
private navParams: NavParams,
|
||||||
public ThemeService: ThemeService
|
public ThemeService: ThemeService,
|
||||||
|
public wsChatMethodsService: WsChatMethodsService,
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
this.loggedUser = authService.ValidatedUserChat['data'];
|
this.loggedUser = authService.ValidatedUserChat['data'];
|
||||||
@@ -91,12 +93,14 @@ export class GroupContactsPage implements OnInit {
|
|||||||
if(this.room.t == "p"){
|
if(this.room.t == "p"){
|
||||||
this.chatService.getGroupMembers(this.room._id).subscribe(res=>{
|
this.chatService.getGroupMembers(this.room._id).subscribe(res=>{
|
||||||
this.members = res['members'];
|
this.members = res['members'];
|
||||||
|
this.wsChatMethodsService.getAllRooms()
|
||||||
this.loadUsers();
|
this.loadUsers();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else if(this.room.t == "c"){
|
else if(this.room.t == "c"){
|
||||||
this.chatService.getChannelMembers(this.room._id).subscribe(res=>{
|
this.chatService.getChannelMembers(this.room._id).subscribe(res=>{
|
||||||
this.members = res['members'];
|
this.members = res['members'];
|
||||||
|
this.wsChatMethodsService.getAllRooms()
|
||||||
this.loadUsers();
|
this.loadUsers();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ export class ContactsPage implements OnInit {
|
|||||||
private chatService: ChatService,
|
private chatService: ChatService,
|
||||||
private authService: AuthService,
|
private authService: AuthService,
|
||||||
public ThemeService: ThemeService,
|
public ThemeService: ThemeService,
|
||||||
public WsChatMethodsService: WsChatMethodsService
|
public WsChatMethodsService: WsChatMethodsService,
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
this.loggedUser = authService.ValidatedUserChat['data'];
|
this.loggedUser = authService.ValidatedUserChat['data'];
|
||||||
@@ -106,6 +106,7 @@ export class ContactsPage implements OnInit {
|
|||||||
console.log(this.room._id);
|
console.log(this.room._id);
|
||||||
|
|
||||||
this.getDirectMessage(this.room._id);
|
this.getDirectMessage(this.room._id);
|
||||||
|
this.WsChatMethodsService.getAllRooms()
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
getDirectMessage(roomId:any){
|
getDirectMessage(roomId:any){
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import { StorageService } from 'src/app/services/storage.service';
|
|||||||
import { ChatService } from 'src/app/services/chat.service';
|
import { ChatService } from 'src/app/services/chat.service';
|
||||||
import { PermissionService } from 'src/app/services/permission.service';
|
import { PermissionService } from 'src/app/services/permission.service';
|
||||||
import { PermissionList } from 'src/app/models/permission/permissionList';
|
import { PermissionList } from 'src/app/models/permission/permissionList';
|
||||||
|
import { MessageModel, DeleteMessageModel } from '../../models/beast-orm'
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-login',
|
selector: 'app-login',
|
||||||
templateUrl: './login.page.html',
|
templateUrl: './login.page.html',
|
||||||
@@ -127,6 +127,8 @@ export class LoginPage implements OnInit {
|
|||||||
this.clearStoreService.clear();
|
this.clearStoreService.clear();
|
||||||
SessionStore.delete();
|
SessionStore.delete();
|
||||||
window.localStorage.clear();
|
window.localStorage.clear();
|
||||||
|
await MessageModel.deleteAll()
|
||||||
|
await DeleteMessageModel.deleteAll()
|
||||||
|
|
||||||
await this.authService.SetSession(attempt, this.userattempt);
|
await this.authService.SetSession(attempt, this.userattempt);
|
||||||
|
|
||||||
|
|||||||
@@ -195,6 +195,8 @@ export class WsChatMethodsService {
|
|||||||
const users = members.filter(data => data.username != this.sessionStore.user.UserName);
|
const users = members.filter(data => data.username != this.sessionStore.user.UserName);
|
||||||
|
|
||||||
rooms.result.update[index]['members'] = users
|
rooms.result.update[index]['members'] = users
|
||||||
|
|
||||||
|
await this.prepareRoom(roomData);
|
||||||
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -203,7 +205,7 @@ export class WsChatMethodsService {
|
|||||||
const users = members.filter(data => data.username != this.sessionStore.user.UserName);
|
const users = members.filter(data => data.username != this.sessionStore.user.UserName);
|
||||||
|
|
||||||
rooms.result.update[index]['members'] = users
|
rooms.result.update[index]['members'] = users
|
||||||
|
await this.prepareRoom(roomData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -121,6 +121,7 @@ export class ContactsPage implements OnInit {
|
|||||||
console.log(res);
|
console.log(res);
|
||||||
this.room = res['room'];
|
this.room = res['room'];
|
||||||
this.openMessagesModal(this.room._id);
|
this.openMessagesModal(this.room._id);
|
||||||
|
this.WsChatMethodsService.getAllRooms()
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -113,6 +113,7 @@ export class NewGroupPage implements OnInit{
|
|||||||
|
|
||||||
this.wsChatMethodsService.subscribeToRoomUpdate(res.result.rid, res.result);
|
this.wsChatMethodsService.subscribeToRoomUpdate(res.result.rid, res.result);
|
||||||
this.addGroupMessage.emit(res.result.rid);
|
this.addGroupMessage.emit(res.result.rid);
|
||||||
|
this.wsChatMethodsService.getAllRooms()
|
||||||
}
|
}
|
||||||
|
|
||||||
async addContacts(){
|
async addContacts(){
|
||||||
|
|||||||
Reference in New Issue
Block a user