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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-01-25 11:54:57 +01:00
parent c123e5310f
commit 3e3baa0f9e
34 changed files with 1229 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+1 -1
View File
@@ -1,4 +1,4 @@
#Thu Jan 21 09:26:08 WAT 2021
#Mon Jan 25 11:42:31 WAT 2021
path.3=classes_1.dex
path.2=classes_0.dex
path.1=classes.dex
android/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js
+2 -1
View File
@@ -636,7 +636,8 @@ const environment = {
production: false,
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
domain: 'gabinetedigital.local',
defaultuser: 'paulo.pinto',
defaultuserpwd: 'tabteste@006'
android/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/build/intermediates/merged_assets/debug/out/public/main-es5.js
+3 -1
View File
@@ -778,7 +778,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
domain: 'gabinetedigital.local',
defaultuser: 'paulo.pinto',
defaultuserpwd: 'tabteste@006'
android/app/build/intermediates/merged_assets/debug/out/public/main-es5.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js
+134 -25
View File
@@ -35,7 +35,7 @@ __webpack_require__.r(__webpack_exports__);
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"groupMessages()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar debounce=\"500\" (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n \r\n <div class=\"main-content\">\r\n <ion-virtual-scroll [items]=\"users | filter:textSearch: 'name'\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox color=\"primary\"></ion-checkbox>\r\n <p>{{user.name}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n");
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"createGroup()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar debounce=\"500\" (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n \r\n <div class=\"main-content\">\r\n <ion-virtual-scroll [items]=\"users | filter:textSearch: 'name'\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox (ionChange)=\"selectedContact(user)\" color=\"primary\"></ion-checkbox>\r\n <p>{{user.name}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n");
/***/ }),
@@ -48,7 +48,7 @@ __webpack_require__.r(__webpack_exports__);
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"header-top\">\r\n <app-btn-modal-dismiss></app-btn-modal-dismiss>\r\n <div class=\"middle\">\r\n <ion-label class=\"title\">{{room.name}}</ion-label>\r\n </div>\r\n <div class=\"right\">\r\n <ion-icon (click)=\"openOptions()\" src=\"assets/images/icons-menu.svg\"></ion-icon>\r\n </div> \r\n </div>\r\n <div class=\"header-bottom\">\r\n <div class=\"header-bottom-icon\">\r\n <ion-icon (click)=\"addContacts()\" src=\"assets/icon/icons-user.svg\"></ion-icon>\r\n </div>\r\n <div class=\"header-bottom-contacts\">\r\n <ion-label *ngFor=\"let member of members\" >\r\n {{member.name}},\r\n </ion-label>\r\n </div>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n\r\n<ion-content>\r\n <div class=\"welcome-text\">\r\n <ion-label>Esta conversa passou a grupo</ion-label><br />\r\n <ion-label>A conversa original mantêm-se como chat individual</ion-label>\r\n </div>\r\n <div class=\"messages\">\r\n <div *ngFor=\"let msg of messages\" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>\r\n <div class=\"title\">\r\n <ion-label>{{msg.u.username}}</ion-label>\r\n <span class=\"time\">{{msg._updatedAt | date: 'HH:mm' }}</span>\r\n </div>\r\n <div>\r\n <ion-label>{{msg.msg}}</ion-label>\r\n </div>\r\n </div>\r\n </div>\r\n\r\n</ion-content>\r\n<ion-footer>\r\n <ion-toolbar>\r\n <ion-row align-items-center class=\"row\">\r\n <ion-col size=\"1\">\r\n <ion-label class=\"ion-no-padding\" lines=\"none\">\r\n <ion-icon (click)=\"openChatOptions()\" class=\"chat-icon-options\" src=\"assets/icon/icons-chat-options.svg\"></ion-icon>\r\n </ion-label>\r\n </ion-col>\r\n <ion-col size=\"9\">\r\n <ion-item class=\"ion-no-padding type-message\" lines=\"none\">\r\n <ion-textarea placeholder=\"Escrever uma mensagem\" auto-grow class=\"message-input\" rows=\"1\" [(ngModel)]=\"message\"></ion-textarea>\r\n <ion-icon slot=\"end\" src=\"assets/icon/icons-chat-mic.svg\"></ion-icon>\r\n </ion-item>\r\n </ion-col>\r\n <ion-col size=\"2\">\r\n <!-- [disabled]=\"message === ''\" -->\r\n <ion-label>\r\n <ion-icon (click)=\"sendMessage()\" class=\"chat-icon-send\" src=\"assets/icon/icons-chat-send.svg\"></ion-icon>\r\n </ion-label>\r\n </ion-col>\r\n </ion-row>\r\n </ion-toolbar>\r\n</ion-footer>\r\n");
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"header-top\">\r\n <app-btn-modal-dismiss></app-btn-modal-dismiss>\r\n <div class=\"middle\">\r\n <ion-label class=\"title\">{{room.name}}</ion-label>\r\n </div>\r\n <div class=\"right\">\r\n <ion-icon (click)=\"openOptions()\" src=\"assets/images/icons-menu.svg\"></ion-icon>\r\n </div> \r\n </div>\r\n <div (click)=\"addContacts()\" class=\"header-bottom\">\r\n <div class=\"header-bottom-icon\">\r\n <ion-icon src=\"assets/icon/icons-user.svg\"></ion-icon>\r\n </div>\r\n <div class=\"header-bottom-contacts\">\r\n <ion-label *ngFor=\"let member of members\" >\r\n {{member.name}},\r\n </ion-label>\r\n </div>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n\r\n<ion-content>\r\n <div class=\"welcome-text\">\r\n <ion-label>Esta conversa passou a grupo</ion-label><br />\r\n <ion-label>A conversa original mantêm-se como chat individual</ion-label>\r\n </div>\r\n <div class=\"messages\">\r\n <div *ngFor=\"let msg of messages\" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>\r\n <div class=\"title\">\r\n <ion-label>{{msg.u.username}}</ion-label>\r\n <span class=\"time\">{{msg._updatedAt | date: 'HH:mm' }}</span>\r\n </div>\r\n <div>\r\n <ion-label>{{msg.msg}}</ion-label>\r\n </div>\r\n </div>\r\n </div>\r\n\r\n</ion-content>\r\n<ion-footer>\r\n <ion-toolbar>\r\n <ion-row align-items-center class=\"row\">\r\n <ion-col size=\"1\">\r\n <ion-label class=\"ion-no-padding\" lines=\"none\">\r\n <ion-icon (click)=\"openChatOptions()\" class=\"chat-icon-options\" src=\"assets/icon/icons-chat-options.svg\"></ion-icon>\r\n </ion-label>\r\n </ion-col>\r\n <ion-col size=\"9\">\r\n <ion-item class=\"ion-no-padding type-message\" lines=\"none\">\r\n <ion-textarea placeholder=\"Escrever uma mensagem\" auto-grow class=\"message-input\" rows=\"1\" [(ngModel)]=\"message\"></ion-textarea>\r\n <ion-icon slot=\"end\" src=\"assets/icon/icons-chat-mic.svg\"></ion-icon>\r\n </ion-item>\r\n </ion-col>\r\n <ion-col size=\"2\">\r\n <!-- [disabled]=\"message === ''\" -->\r\n <ion-label>\r\n <ion-icon (click)=\"sendMessage()\" class=\"chat-icon-send\" src=\"assets/icon/icons-chat-send.svg\"></ion-icon>\r\n </ion-label>\r\n </ion-col>\r\n </ion-row>\r\n </ion-toolbar>\r\n</ion-footer>\r\n");
/***/ }),
@@ -100,7 +100,7 @@ __webpack_require__.r(__webpack_exports__);
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"left\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"middle\">\r\n <ion-label class=\"title\">Novo Grupo</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"addContacts()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <div class=\"main-content\">\r\n <div class=\"item-container\">\r\n <ion-input placeholder=\"Título\"></ion-input>\r\n </div>\r\n <div class=\"item-container-no-border\">\r\n <ion-checkbox (ionChange)=\"_ionChange($event)\" color=\"primary\"></ion-checkbox>\r\n <ion-label>Grupo Ultra-secreto</ion-label>\r\n </div>\r\n\r\n <div *ngIf=\"showDuration\" class=\"container-div\">\r\n <div class=\"ion-item-class-2\">\r\n <div class=\"ion-icon-class\">\r\n <ion-icon slot=\"start\" src=\"assets/images/icons-duration.svg\"></ion-icon>\r\n </div>\r\n <div class=\"ion-input-class\">\r\n <ion-input (click)=\"showPicker()\" [(ngModel)]=\"displayDuration\" placeholder=\"Duração\"></ion-input>\r\n </div>\r\n </div>\r\n </div>\r\n \r\n </div> \r\n</ion-content>\r\n");
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"left\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"middle\">\r\n <ion-label class=\"title\">Novo Grupo</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"addContacts()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <div class=\"main-content\">\r\n <div class=\"item-container\">\r\n <ion-input [(ngModel)]=\"groupName\" placeholder=\"Título\"></ion-input>\r\n </div>\r\n <div class=\"item-container-no-border\">\r\n <ion-checkbox (ionChange)=\"_ionChange($event)\" color=\"primary\"></ion-checkbox>\r\n <ion-label>Grupo Ultra-secreto</ion-label>\r\n </div>\r\n\r\n <div *ngIf=\"showDuration\" class=\"container-div\">\r\n <div class=\"ion-item-class-2\">\r\n <div class=\"ion-icon-class\">\r\n <ion-icon slot=\"start\" src=\"assets/images/icons-duration.svg\"></ion-icon>\r\n </div>\r\n <div class=\"ion-input-class\">\r\n <ion-input (click)=\"showPicker()\" [(ngModel)]=\"displayDuration\" placeholder=\"Duração\"></ion-input>\r\n </div>\r\n </div>\r\n </div>\r\n \r\n </div> \r\n</ion-content>\r\n");
/***/ }),
@@ -608,7 +608,9 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _ionic_angular__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @ionic/angular */ "./node_modules/@ionic/angular/__ivy_ngcc__/fesm2015/ionic-angular.js");
/* harmony import */ var src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! src/app/services/auth.service */ "./src/app/services/auth.service.ts");
/* harmony import */ var src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! src/app/services/chat.service */ "./src/app/services/chat.service.ts");
/* harmony import */ var _group_messages_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../group-messages.page */ "./src/app/pages/chat/group-messages/group-messages.page.ts");
/* harmony import */ var _new_group_new_group_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../new-group/new-group.page */ "./src/app/pages/chat/new-group/new-group.page.ts");
/* harmony import */ var _group_messages_page__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../group-messages.page */ "./src/app/pages/chat/group-messages/group-messages.page.ts");
@@ -617,11 +619,12 @@ __webpack_require__.r(__webpack_exports__);
let GroupContactsPage = class GroupContactsPage {
constructor(modalController, http, chatService, authService) {
constructor(modalController, http, chatService, authService, navParams) {
this.modalController = modalController;
this.http = http;
this.chatService = chatService;
this.authService = authService;
this.navParams = navParams;
this.users = [];
this.contact = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
this.authService.userData$.subscribe((res) => {
@@ -630,9 +633,14 @@ let GroupContactsPage = class GroupContactsPage {
this.textSearch = "";
this.dm = null;
this.room = null;
this.isGroupCreated = this.navParams.get('isCreated');
this.groupName = this.navParams.get('name');
this.room = this.navParams.get('room');
}
ngOnInit() {
this.loadUsers();
console.log(this.groupName);
console.log(this.isGroupCreated);
}
loadUsers() {
this.options = {
@@ -640,7 +648,19 @@ let GroupContactsPage = class GroupContactsPage {
};
this.chatService.getAllUsers().subscribe((res) => {
console.log(res.users);
this.contacts = res.users.filter(data => data.username != this.loggedUser.me.username);
res.users.forEach(user => {
let usr = {
"_id": user._id,
"username": user.username,
"name": user.name,
"isChecked": false,
};
if (this.listContacts == null) {
this.listContacts = new Array();
}
this.listContacts.push(usr);
});
this.contacts = this.listContacts.filter(data => data.username != this.loggedUser.me.username);
this.users = this.contacts.sort((a, b) => {
if (a.name < b.name) {
return -1;
@@ -650,6 +670,7 @@ let GroupContactsPage = class GroupContactsPage {
}
return 0;
});
console.log(this.users);
this.showLoader = false;
});
}
@@ -667,7 +688,26 @@ let GroupContactsPage = class GroupContactsPage {
doRefresh(event) {
}
close() {
this.modalController.dismiss(true);
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
this.modalController.dismiss();
if (this.isGroupCreated) {
console.log('go to conversa');
}
else {
this.modalController.dismiss();
console.log('go to new group page');
const modal = yield this.modalController.create({
component: _new_group_new_group_page__WEBPACK_IMPORTED_MODULE_6__["NewGroupPage"],
componentProps: {
name: this.groupName,
duration: '',
},
cssClass: 'new-group',
backdropDismiss: false,
});
yield modal.present();
}
});
}
onChange(event) {
this.textSearch = event.detail.value;
@@ -675,21 +715,72 @@ let GroupContactsPage = class GroupContactsPage {
clicked() {
console.log('clicked');
}
groupMessages() {
selectedContact(user) {
/* this.groupName = this.room.name; */
user.isChecked = !user.isChecked;
}
addContacts(room) {
console.log(room);
this.selectedUserList = this.users.filter(function (contact) {
return contact.isChecked == true;
});
console.log(this.selectedUserList);
this.selectedUserList.forEach(user => {
let body = {
"roomId": room._id,
"userId": user._id,
};
this.chatService.addUserToGroup(body).subscribe(res => {
console.log(res['success']);
});
});
}
createGroup() {
if (!this.isGroupCreated) {
let body = { "name": this.groupName, };
this.chatService.addGroup(body).subscribe(res => {
console.log('group created');
console.log(res['group']);
this.addContacts(res['group']);
this.openGroupMessages(res['group']);
});
}
else {
this.addContacts(this.room);
this.openGroupMessages(this.room);
/* this.chatService.getGroupInfo(this.room._id).subscribe(res=>{
console.log(res);
this.addContacts(res['group']);
this.openGroupMessages(res['group']);
}) */
}
}
newGroup() {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
this.close();
const modal = yield this.modalController.create({
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_6__["GroupMessagesPage"],
componentProps: {},
cssClass: 'contacts',
component: _new_group_new_group_page__WEBPACK_IMPORTED_MODULE_6__["NewGroupPage"],
cssClass: 'new-group',
backdropDismiss: false,
});
yield modal.present();
modal.onDidDismiss();
});
}
openGroupMessages(room) {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
this.close();
const modal = yield this.modalController.create({
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_7__["GroupMessagesPage"],
componentProps: {
room: room,
},
cssClass: 'group-messages',
backdropDismiss: false
});
yield modal.present();
modal.onDidDismiss().then(res => {
if (res.data) {
console.log('go to new group');
}
});
modal.onDidDismiss();
});
}
};
@@ -697,7 +788,8 @@ GroupContactsPage.ctorParameters = () => [
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["ModalController"] },
{ type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"] },
{ type: src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__["ChatService"] },
{ type: src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__["AuthService"] }
{ type: src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__["AuthService"] },
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["NavParams"] }
];
GroupContactsPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
Object(_angular_core__WEBPACK_IMPORTED_MODULE_2__["Component"])({
@@ -741,7 +833,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! src/app/services/chat.service */ "./src/app/services/chat.service.ts");
/* harmony import */ var src_app_shared_popover_chat_options_popover_chat_options_popover_page__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! src/app/shared/popover/chat-options-popover/chat-options-popover.page */ "./src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts");
/* harmony import */ var src_app_shared_popover_chat_popover_chat_popover_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! src/app/shared/popover/chat-popover/chat-popover.page */ "./src/app/shared/popover/chat-popover/chat-popover.page.ts");
/* harmony import */ var _new_group_contacts_contacts_page__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../new-group/contacts/contacts.page */ "./src/app/pages/chat/new-group/contacts/contacts.page.ts");
/* harmony import */ var _group_contacts_group_contacts_page__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./group-contacts/group-contacts.page */ "./src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts");
@@ -760,6 +852,7 @@ let GroupMessagesPage = class GroupMessagesPage {
this.navParams = navParams;
this.authService = authService;
this.contacts = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
this.isGroupCreated = true;
this.room = this.navParams.get('room');
}
ngOnInit() {
@@ -770,6 +863,9 @@ let GroupMessagesPage = class GroupMessagesPage {
this.getGroupContacts();
this.loadGroupMessages();
}
close() {
this.modalController.dismiss();
}
getGroupContacts() {
//If group is private call getGroupMembers
if (this.room.t === 'p') {
@@ -791,7 +887,8 @@ let GroupMessagesPage = class GroupMessagesPage {
if (this.room.t === 'p') {
this.chatService.getPrivateGroupMessages(this.room._id).subscribe(res => {
console.log(res);
this.messages = res['messages'].reverse();
let msgOnly = res['messages'].filter(data => data.t != 'au');
this.messages = msgOnly.reverse();
});
}
//Otherwise call getChannelMembers for públic groups
@@ -874,9 +971,13 @@ let GroupMessagesPage = class GroupMessagesPage {
}
addContacts() {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
this.close();
const modal = yield this.modalController.create({
component: _new_group_contacts_contacts_page__WEBPACK_IMPORTED_MODULE_7__["ContactsPage"],
componentProps: {},
component: _group_contacts_group_contacts_page__WEBPACK_IMPORTED_MODULE_7__["GroupContactsPage"],
componentProps: {
isCreated: this.isGroupCreated,
room: this.room,
},
cssClass: 'contacts',
backdropDismiss: false
});
@@ -1445,11 +1546,14 @@ __webpack_require__.r(__webpack_exports__);
let NewGroupPage = class NewGroupPage {
constructor(pickerController, popoverController, modalController) {
constructor(pickerController, popoverController, modalController, navParams) {
this.pickerController = pickerController;
this.popoverController = popoverController;
this.modalController = modalController;
this.navParams = navParams;
this.selectedDuration = ['', '', ''];
this.isGroupCreated = false;
this.groupName = this.navParams.get('name');
}
ngOnInit() {
}
@@ -1461,10 +1565,14 @@ let NewGroupPage = class NewGroupPage {
}
addContacts() {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
this.close();
this.modalController.dismiss();
const modal = yield this.modalController.create({
component: _group_messages_group_contacts_group_contacts_page__WEBPACK_IMPORTED_MODULE_4__["GroupContactsPage"],
componentProps: {},
componentProps: {
isCreated: this.isGroupCreated,
name: this.groupName,
duration: '',
},
cssClass: 'contacts',
backdropDismiss: false
});
@@ -1602,7 +1710,8 @@ let NewGroupPage = class NewGroupPage {
NewGroupPage.ctorParameters = () => [
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["PickerController"] },
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["PopoverController"] },
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["ModalController"] }
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["ModalController"] },
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["NavParams"] }
];
NewGroupPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
Object(_angular_core__WEBPACK_IMPORTED_MODULE_1__["Component"])({
android/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js
+425 -246
View File
File diff suppressed because it is too large Load Diff
android/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js
+2
View File
@@ -171,8 +171,10 @@ let LoginPage = class LoginPage {
this.authService.loginChat(this.postData).subscribe((res) => {
this.storageService.store(src_app_config_auth_constants__WEBPACK_IMPORTED_MODULE_8__["AuthConnstants"].AUTH, res.data);
console.log('Login to Rocket chat OK');
this.presentAlert('Login to Rocket chat OK');
}, (error) => {
console.log('Network error');
this.presentAlert('Network error ' + error);
});
}
Login() {
android/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js
+4
View File
@@ -329,8 +329,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
_this.storageService.store(src_app_config_auth_constants__WEBPACK_IMPORTED_MODULE_8__["AuthConnstants"].AUTH, res.data);
console.log('Login to Rocket chat OK');
_this.presentAlert('Login to Rocket chat OK');
}, function (error) {
console.log('Network error');
_this.presentAlert('Network error ' + error);
});
}
}, {
android/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es2015.js
+15
View File
@@ -150,6 +150,9 @@ let ChatService = class ChatService {
return this.http.get(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'im.messages', opts);
}
/* GROUPS */
addGroup(body) {
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.create', body, this.options);
}
getGroupMembers(roomId) {
let params = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpParams"]();
let url = src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.members';
@@ -201,6 +204,18 @@ let ChatService = class ChatService {
deleteChannel(body) {
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'channels.delete', body, this.options);
}
addUserToGroup(body) {
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.invite', body, this.options);
}
getGroupInfo(roomId) {
let params = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpParams"]();
params = params.set("roomId", roomId);
let opts = {
headers: this.headers,
params: params
};
return this.http.get(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.info', opts);
}
};
ChatService.ctorParameters = () => [
{ type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"] },
android/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es2015.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es5.js
+21
View File
@@ -235,6 +235,11 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
}
/* GROUPS */
}, {
key: "addGroup",
value: function addGroup(body) {
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.create', body, this.options);
}
}, {
key: "getGroupMembers",
value: function getGroupMembers(roomId) {
@@ -303,6 +308,22 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
value: function deleteChannel(body) {
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'channels.delete', body, this.options);
}
}, {
key: "addUserToGroup",
value: function addUserToGroup(body) {
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.invite', body, this.options);
}
}, {
key: "getGroupInfo",
value: function getGroupInfo(roomId) {
var params = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpParams"]();
params = params.set("roomId", roomId);
var opts = {
headers: this.headers,
params: params
};
return this.http.get(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.info', opts);
}
}]);
return ChatService;
android/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es5.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/build/outputs/apk/debug/app-debug.apk
BIN
View File
Binary file not shown.
android/app/src/main/assets/public/main-es2015.js
+2 -1
View File
@@ -636,7 +636,8 @@ const environment = {
production: false,
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
domain: 'gabinetedigital.local',
defaultuser: 'paulo.pinto',
defaultuserpwd: 'tabteste@006'
android/app/src/main/assets/public/main-es2015.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/src/main/assets/public/main-es5.js
+3 -1
View File
@@ -778,7 +778,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
domain: 'gabinetedigital.local',
defaultuser: 'paulo.pinto',
defaultuserpwd: 'tabteste@006'
android/app/src/main/assets/public/main-es5.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/src/main/assets/public/pages-chat-chat-module-es2015.js
+134 -25
View File
@@ -35,7 +35,7 @@ __webpack_require__.r(__webpack_exports__);
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"groupMessages()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar debounce=\"500\" (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n \r\n <div class=\"main-content\">\r\n <ion-virtual-scroll [items]=\"users | filter:textSearch: 'name'\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox color=\"primary\"></ion-checkbox>\r\n <p>{{user.name}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n");
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"createGroup()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar debounce=\"500\" (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n \r\n <div class=\"main-content\">\r\n <ion-virtual-scroll [items]=\"users | filter:textSearch: 'name'\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox (ionChange)=\"selectedContact(user)\" color=\"primary\"></ion-checkbox>\r\n <p>{{user.name}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n");
/***/ }),
@@ -48,7 +48,7 @@ __webpack_require__.r(__webpack_exports__);
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"header-top\">\r\n <app-btn-modal-dismiss></app-btn-modal-dismiss>\r\n <div class=\"middle\">\r\n <ion-label class=\"title\">{{room.name}}</ion-label>\r\n </div>\r\n <div class=\"right\">\r\n <ion-icon (click)=\"openOptions()\" src=\"assets/images/icons-menu.svg\"></ion-icon>\r\n </div> \r\n </div>\r\n <div class=\"header-bottom\">\r\n <div class=\"header-bottom-icon\">\r\n <ion-icon (click)=\"addContacts()\" src=\"assets/icon/icons-user.svg\"></ion-icon>\r\n </div>\r\n <div class=\"header-bottom-contacts\">\r\n <ion-label *ngFor=\"let member of members\" >\r\n {{member.name}},\r\n </ion-label>\r\n </div>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n\r\n<ion-content>\r\n <div class=\"welcome-text\">\r\n <ion-label>Esta conversa passou a grupo</ion-label><br />\r\n <ion-label>A conversa original mantêm-se como chat individual</ion-label>\r\n </div>\r\n <div class=\"messages\">\r\n <div *ngFor=\"let msg of messages\" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>\r\n <div class=\"title\">\r\n <ion-label>{{msg.u.username}}</ion-label>\r\n <span class=\"time\">{{msg._updatedAt | date: 'HH:mm' }}</span>\r\n </div>\r\n <div>\r\n <ion-label>{{msg.msg}}</ion-label>\r\n </div>\r\n </div>\r\n </div>\r\n\r\n</ion-content>\r\n<ion-footer>\r\n <ion-toolbar>\r\n <ion-row align-items-center class=\"row\">\r\n <ion-col size=\"1\">\r\n <ion-label class=\"ion-no-padding\" lines=\"none\">\r\n <ion-icon (click)=\"openChatOptions()\" class=\"chat-icon-options\" src=\"assets/icon/icons-chat-options.svg\"></ion-icon>\r\n </ion-label>\r\n </ion-col>\r\n <ion-col size=\"9\">\r\n <ion-item class=\"ion-no-padding type-message\" lines=\"none\">\r\n <ion-textarea placeholder=\"Escrever uma mensagem\" auto-grow class=\"message-input\" rows=\"1\" [(ngModel)]=\"message\"></ion-textarea>\r\n <ion-icon slot=\"end\" src=\"assets/icon/icons-chat-mic.svg\"></ion-icon>\r\n </ion-item>\r\n </ion-col>\r\n <ion-col size=\"2\">\r\n <!-- [disabled]=\"message === ''\" -->\r\n <ion-label>\r\n <ion-icon (click)=\"sendMessage()\" class=\"chat-icon-send\" src=\"assets/icon/icons-chat-send.svg\"></ion-icon>\r\n </ion-label>\r\n </ion-col>\r\n </ion-row>\r\n </ion-toolbar>\r\n</ion-footer>\r\n");
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"header-top\">\r\n <app-btn-modal-dismiss></app-btn-modal-dismiss>\r\n <div class=\"middle\">\r\n <ion-label class=\"title\">{{room.name}}</ion-label>\r\n </div>\r\n <div class=\"right\">\r\n <ion-icon (click)=\"openOptions()\" src=\"assets/images/icons-menu.svg\"></ion-icon>\r\n </div> \r\n </div>\r\n <div (click)=\"addContacts()\" class=\"header-bottom\">\r\n <div class=\"header-bottom-icon\">\r\n <ion-icon src=\"assets/icon/icons-user.svg\"></ion-icon>\r\n </div>\r\n <div class=\"header-bottom-contacts\">\r\n <ion-label *ngFor=\"let member of members\" >\r\n {{member.name}},\r\n </ion-label>\r\n </div>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n\r\n<ion-content>\r\n <div class=\"welcome-text\">\r\n <ion-label>Esta conversa passou a grupo</ion-label><br />\r\n <ion-label>A conversa original mantêm-se como chat individual</ion-label>\r\n </div>\r\n <div class=\"messages\">\r\n <div *ngFor=\"let msg of messages\" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>\r\n <div class=\"title\">\r\n <ion-label>{{msg.u.username}}</ion-label>\r\n <span class=\"time\">{{msg._updatedAt | date: 'HH:mm' }}</span>\r\n </div>\r\n <div>\r\n <ion-label>{{msg.msg}}</ion-label>\r\n </div>\r\n </div>\r\n </div>\r\n\r\n</ion-content>\r\n<ion-footer>\r\n <ion-toolbar>\r\n <ion-row align-items-center class=\"row\">\r\n <ion-col size=\"1\">\r\n <ion-label class=\"ion-no-padding\" lines=\"none\">\r\n <ion-icon (click)=\"openChatOptions()\" class=\"chat-icon-options\" src=\"assets/icon/icons-chat-options.svg\"></ion-icon>\r\n </ion-label>\r\n </ion-col>\r\n <ion-col size=\"9\">\r\n <ion-item class=\"ion-no-padding type-message\" lines=\"none\">\r\n <ion-textarea placeholder=\"Escrever uma mensagem\" auto-grow class=\"message-input\" rows=\"1\" [(ngModel)]=\"message\"></ion-textarea>\r\n <ion-icon slot=\"end\" src=\"assets/icon/icons-chat-mic.svg\"></ion-icon>\r\n </ion-item>\r\n </ion-col>\r\n <ion-col size=\"2\">\r\n <!-- [disabled]=\"message === ''\" -->\r\n <ion-label>\r\n <ion-icon (click)=\"sendMessage()\" class=\"chat-icon-send\" src=\"assets/icon/icons-chat-send.svg\"></ion-icon>\r\n </ion-label>\r\n </ion-col>\r\n </ion-row>\r\n </ion-toolbar>\r\n</ion-footer>\r\n");
/***/ }),
@@ -100,7 +100,7 @@ __webpack_require__.r(__webpack_exports__);
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"left\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"middle\">\r\n <ion-label class=\"title\">Novo Grupo</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"addContacts()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <div class=\"main-content\">\r\n <div class=\"item-container\">\r\n <ion-input placeholder=\"Título\"></ion-input>\r\n </div>\r\n <div class=\"item-container-no-border\">\r\n <ion-checkbox (ionChange)=\"_ionChange($event)\" color=\"primary\"></ion-checkbox>\r\n <ion-label>Grupo Ultra-secreto</ion-label>\r\n </div>\r\n\r\n <div *ngIf=\"showDuration\" class=\"container-div\">\r\n <div class=\"ion-item-class-2\">\r\n <div class=\"ion-icon-class\">\r\n <ion-icon slot=\"start\" src=\"assets/images/icons-duration.svg\"></ion-icon>\r\n </div>\r\n <div class=\"ion-input-class\">\r\n <ion-input (click)=\"showPicker()\" [(ngModel)]=\"displayDuration\" placeholder=\"Duração\"></ion-input>\r\n </div>\r\n </div>\r\n </div>\r\n \r\n </div> \r\n</ion-content>\r\n");
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"left\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"middle\">\r\n <ion-label class=\"title\">Novo Grupo</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"addContacts()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <div class=\"main-content\">\r\n <div class=\"item-container\">\r\n <ion-input [(ngModel)]=\"groupName\" placeholder=\"Título\"></ion-input>\r\n </div>\r\n <div class=\"item-container-no-border\">\r\n <ion-checkbox (ionChange)=\"_ionChange($event)\" color=\"primary\"></ion-checkbox>\r\n <ion-label>Grupo Ultra-secreto</ion-label>\r\n </div>\r\n\r\n <div *ngIf=\"showDuration\" class=\"container-div\">\r\n <div class=\"ion-item-class-2\">\r\n <div class=\"ion-icon-class\">\r\n <ion-icon slot=\"start\" src=\"assets/images/icons-duration.svg\"></ion-icon>\r\n </div>\r\n <div class=\"ion-input-class\">\r\n <ion-input (click)=\"showPicker()\" [(ngModel)]=\"displayDuration\" placeholder=\"Duração\"></ion-input>\r\n </div>\r\n </div>\r\n </div>\r\n \r\n </div> \r\n</ion-content>\r\n");
/***/ }),
@@ -608,7 +608,9 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _ionic_angular__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @ionic/angular */ "./node_modules/@ionic/angular/__ivy_ngcc__/fesm2015/ionic-angular.js");
/* harmony import */ var src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! src/app/services/auth.service */ "./src/app/services/auth.service.ts");
/* harmony import */ var src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! src/app/services/chat.service */ "./src/app/services/chat.service.ts");
/* harmony import */ var _group_messages_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../group-messages.page */ "./src/app/pages/chat/group-messages/group-messages.page.ts");
/* harmony import */ var _new_group_new_group_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../new-group/new-group.page */ "./src/app/pages/chat/new-group/new-group.page.ts");
/* harmony import */ var _group_messages_page__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../group-messages.page */ "./src/app/pages/chat/group-messages/group-messages.page.ts");
@@ -617,11 +619,12 @@ __webpack_require__.r(__webpack_exports__);
let GroupContactsPage = class GroupContactsPage {
constructor(modalController, http, chatService, authService) {
constructor(modalController, http, chatService, authService, navParams) {
this.modalController = modalController;
this.http = http;
this.chatService = chatService;
this.authService = authService;
this.navParams = navParams;
this.users = [];
this.contact = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
this.authService.userData$.subscribe((res) => {
@@ -630,9 +633,14 @@ let GroupContactsPage = class GroupContactsPage {
this.textSearch = "";
this.dm = null;
this.room = null;
this.isGroupCreated = this.navParams.get('isCreated');
this.groupName = this.navParams.get('name');
this.room = this.navParams.get('room');
}
ngOnInit() {
this.loadUsers();
console.log(this.groupName);
console.log(this.isGroupCreated);
}
loadUsers() {
this.options = {
@@ -640,7 +648,19 @@ let GroupContactsPage = class GroupContactsPage {
};
this.chatService.getAllUsers().subscribe((res) => {
console.log(res.users);
this.contacts = res.users.filter(data => data.username != this.loggedUser.me.username);
res.users.forEach(user => {
let usr = {
"_id": user._id,
"username": user.username,
"name": user.name,
"isChecked": false,
};
if (this.listContacts == null) {
this.listContacts = new Array();
}
this.listContacts.push(usr);
});
this.contacts = this.listContacts.filter(data => data.username != this.loggedUser.me.username);
this.users = this.contacts.sort((a, b) => {
if (a.name < b.name) {
return -1;
@@ -650,6 +670,7 @@ let GroupContactsPage = class GroupContactsPage {
}
return 0;
});
console.log(this.users);
this.showLoader = false;
});
}
@@ -667,7 +688,26 @@ let GroupContactsPage = class GroupContactsPage {
doRefresh(event) {
}
close() {
this.modalController.dismiss(true);
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
this.modalController.dismiss();
if (this.isGroupCreated) {
console.log('go to conversa');
}
else {
this.modalController.dismiss();
console.log('go to new group page');
const modal = yield this.modalController.create({
component: _new_group_new_group_page__WEBPACK_IMPORTED_MODULE_6__["NewGroupPage"],
componentProps: {
name: this.groupName,
duration: '',
},
cssClass: 'new-group',
backdropDismiss: false,
});
yield modal.present();
}
});
}
onChange(event) {
this.textSearch = event.detail.value;
@@ -675,21 +715,72 @@ let GroupContactsPage = class GroupContactsPage {
clicked() {
console.log('clicked');
}
groupMessages() {
selectedContact(user) {
/* this.groupName = this.room.name; */
user.isChecked = !user.isChecked;
}
addContacts(room) {
console.log(room);
this.selectedUserList = this.users.filter(function (contact) {
return contact.isChecked == true;
});
console.log(this.selectedUserList);
this.selectedUserList.forEach(user => {
let body = {
"roomId": room._id,
"userId": user._id,
};
this.chatService.addUserToGroup(body).subscribe(res => {
console.log(res['success']);
});
});
}
createGroup() {
if (!this.isGroupCreated) {
let body = { "name": this.groupName, };
this.chatService.addGroup(body).subscribe(res => {
console.log('group created');
console.log(res['group']);
this.addContacts(res['group']);
this.openGroupMessages(res['group']);
});
}
else {
this.addContacts(this.room);
this.openGroupMessages(this.room);
/* this.chatService.getGroupInfo(this.room._id).subscribe(res=>{
console.log(res);
this.addContacts(res['group']);
this.openGroupMessages(res['group']);
}) */
}
}
newGroup() {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
this.close();
const modal = yield this.modalController.create({
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_6__["GroupMessagesPage"],
componentProps: {},
cssClass: 'contacts',
component: _new_group_new_group_page__WEBPACK_IMPORTED_MODULE_6__["NewGroupPage"],
cssClass: 'new-group',
backdropDismiss: false,
});
yield modal.present();
modal.onDidDismiss();
});
}
openGroupMessages(room) {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
this.close();
const modal = yield this.modalController.create({
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_7__["GroupMessagesPage"],
componentProps: {
room: room,
},
cssClass: 'group-messages',
backdropDismiss: false
});
yield modal.present();
modal.onDidDismiss().then(res => {
if (res.data) {
console.log('go to new group');
}
});
modal.onDidDismiss();
});
}
};
@@ -697,7 +788,8 @@ GroupContactsPage.ctorParameters = () => [
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["ModalController"] },
{ type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"] },
{ type: src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__["ChatService"] },
{ type: src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__["AuthService"] }
{ type: src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__["AuthService"] },
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["NavParams"] }
];
GroupContactsPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
Object(_angular_core__WEBPACK_IMPORTED_MODULE_2__["Component"])({
@@ -741,7 +833,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! src/app/services/chat.service */ "./src/app/services/chat.service.ts");
/* harmony import */ var src_app_shared_popover_chat_options_popover_chat_options_popover_page__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! src/app/shared/popover/chat-options-popover/chat-options-popover.page */ "./src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts");
/* harmony import */ var src_app_shared_popover_chat_popover_chat_popover_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! src/app/shared/popover/chat-popover/chat-popover.page */ "./src/app/shared/popover/chat-popover/chat-popover.page.ts");
/* harmony import */ var _new_group_contacts_contacts_page__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../new-group/contacts/contacts.page */ "./src/app/pages/chat/new-group/contacts/contacts.page.ts");
/* harmony import */ var _group_contacts_group_contacts_page__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./group-contacts/group-contacts.page */ "./src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts");
@@ -760,6 +852,7 @@ let GroupMessagesPage = class GroupMessagesPage {
this.navParams = navParams;
this.authService = authService;
this.contacts = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
this.isGroupCreated = true;
this.room = this.navParams.get('room');
}
ngOnInit() {
@@ -770,6 +863,9 @@ let GroupMessagesPage = class GroupMessagesPage {
this.getGroupContacts();
this.loadGroupMessages();
}
close() {
this.modalController.dismiss();
}
getGroupContacts() {
//If group is private call getGroupMembers
if (this.room.t === 'p') {
@@ -791,7 +887,8 @@ let GroupMessagesPage = class GroupMessagesPage {
if (this.room.t === 'p') {
this.chatService.getPrivateGroupMessages(this.room._id).subscribe(res => {
console.log(res);
this.messages = res['messages'].reverse();
let msgOnly = res['messages'].filter(data => data.t != 'au');
this.messages = msgOnly.reverse();
});
}
//Otherwise call getChannelMembers for públic groups
@@ -874,9 +971,13 @@ let GroupMessagesPage = class GroupMessagesPage {
}
addContacts() {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
this.close();
const modal = yield this.modalController.create({
component: _new_group_contacts_contacts_page__WEBPACK_IMPORTED_MODULE_7__["ContactsPage"],
componentProps: {},
component: _group_contacts_group_contacts_page__WEBPACK_IMPORTED_MODULE_7__["GroupContactsPage"],
componentProps: {
isCreated: this.isGroupCreated,
room: this.room,
},
cssClass: 'contacts',
backdropDismiss: false
});
@@ -1445,11 +1546,14 @@ __webpack_require__.r(__webpack_exports__);
let NewGroupPage = class NewGroupPage {
constructor(pickerController, popoverController, modalController) {
constructor(pickerController, popoverController, modalController, navParams) {
this.pickerController = pickerController;
this.popoverController = popoverController;
this.modalController = modalController;
this.navParams = navParams;
this.selectedDuration = ['', '', ''];
this.isGroupCreated = false;
this.groupName = this.navParams.get('name');
}
ngOnInit() {
}
@@ -1461,10 +1565,14 @@ let NewGroupPage = class NewGroupPage {
}
addContacts() {
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
this.close();
this.modalController.dismiss();
const modal = yield this.modalController.create({
component: _group_messages_group_contacts_group_contacts_page__WEBPACK_IMPORTED_MODULE_4__["GroupContactsPage"],
componentProps: {},
componentProps: {
isCreated: this.isGroupCreated,
name: this.groupName,
duration: '',
},
cssClass: 'contacts',
backdropDismiss: false
});
@@ -1602,7 +1710,8 @@ let NewGroupPage = class NewGroupPage {
NewGroupPage.ctorParameters = () => [
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["PickerController"] },
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["PopoverController"] },
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["ModalController"] }
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["ModalController"] },
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["NavParams"] }
];
NewGroupPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
Object(_angular_core__WEBPACK_IMPORTED_MODULE_1__["Component"])({
android/app/src/main/assets/public/pages-chat-chat-module-es2015.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/src/main/assets/public/pages-chat-chat-module-es5.js
+425 -246
View File
File diff suppressed because it is too large Load Diff
android/app/src/main/assets/public/pages-chat-chat-module-es5.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/src/main/assets/public/pages-login-login-module-es2015.js
+2
View File
@@ -171,8 +171,10 @@ let LoginPage = class LoginPage {
this.authService.loginChat(this.postData).subscribe((res) => {
this.storageService.store(src_app_config_auth_constants__WEBPACK_IMPORTED_MODULE_8__["AuthConnstants"].AUTH, res.data);
console.log('Login to Rocket chat OK');
this.presentAlert('Login to Rocket chat OK');
}, (error) => {
console.log('Network error');
this.presentAlert('Network error ' + error);
});
}
Login() {
android/app/src/main/assets/public/pages-login-login-module-es2015.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/src/main/assets/public/pages-login-login-module-es5.js
+4
View File
@@ -329,8 +329,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
_this.storageService.store(src_app_config_auth_constants__WEBPACK_IMPORTED_MODULE_8__["AuthConnstants"].AUTH, res.data);
console.log('Login to Rocket chat OK');
_this.presentAlert('Login to Rocket chat OK');
}, function (error) {
console.log('Network error');
_this.presentAlert('Network error ' + error);
});
}
}, {
android/app/src/main/assets/public/pages-login-login-module-es5.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es2015.js
+15
View File
@@ -150,6 +150,9 @@ let ChatService = class ChatService {
return this.http.get(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'im.messages', opts);
}
/* GROUPS */
addGroup(body) {
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.create', body, this.options);
}
getGroupMembers(roomId) {
let params = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpParams"]();
let url = src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.members';
@@ -201,6 +204,18 @@ let ChatService = class ChatService {
deleteChannel(body) {
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'channels.delete', body, this.options);
}
addUserToGroup(body) {
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.invite', body, this.options);
}
getGroupInfo(roomId) {
let params = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpParams"]();
params = params.set("roomId", roomId);
let opts = {
headers: this.headers,
params: params
};
return this.http.get(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.info', opts);
}
};
ChatService.ctorParameters = () => [
{ type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"] },
android/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es2015.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
android/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es5.js
+21
View File
@@ -235,6 +235,11 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
}
/* GROUPS */
}, {
key: "addGroup",
value: function addGroup(body) {
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.create', body, this.options);
}
}, {
key: "getGroupMembers",
value: function getGroupMembers(roomId) {
@@ -303,6 +308,22 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
value: function deleteChannel(body) {
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'channels.delete', body, this.options);
}
}, {
key: "addUserToGroup",
value: function addUserToGroup(body) {
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.invite', body, this.options);
}
}, {
key: "getGroupInfo",
value: function getGroupInfo(roomId) {
var params = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpParams"]();
params = params.set("roomId", roomId);
var opts = {
headers: this.headers,
params: params
};
return this.http.get(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.info', opts);
}
}]);
return ChatService;
android/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es5.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long