+ {{header}}
+
+
+
+
+
+ {{user.first}} {{user.last}}
+
+
+
+
+ Contactos
+
+
-
-
+
+
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss
index ce22de9f4..2d381ea85 100644
--- a/src/app/pages/chat/chat.page.scss
+++ b/src/app/pages/chat/chat.page.scss
@@ -63,6 +63,7 @@
.item{
width: 100%;
border-bottom: 1px solid #ebebeb;
+ overflow: auto;
.item-icon{
width: 40px;
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index faa8987b7..cc083cb90 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -1,9 +1,12 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service';
import { ConversationPage } from './conversation/conversation.page';
import { GroupMessagesPage } from './group-messages/group-messages.page';
+import { ContactsPage } from './messages/contacts/contacts.page';
+import { MessagesPage } from './messages/messages.page';
import { NewGroupPage } from './new-group/new-group.page';
import { NewchatPage } from './newchat/newchat.page';
@@ -13,48 +16,121 @@ import { NewchatPage } from './newchat/newchat.page';
styleUrls: ['./chat.page.scss'],
})
export class ChatPage implements OnInit {
+
+ headers: HttpHeaders;
+ options:any;
+ X_User_Id:any;
+ X_Auth_Token:any;
+
showLoader: boolean;
loggedUser: any;
/* Set segment variable */
segment:string;
- groupList: any[];
+ allGroups: any[];
+ privateGroups: any[];
+ publicGroups: any[];
userConnectedList: any[];
+ userRooms: any[];
+ userChannels: any[];
+ userDirectMessages: any[];
result:any;
+ dmUsers:any;
constructor(
+ private http:HttpClient,
private chatService: ChatService,
private modalController: ModalController,
- private authService: AuthService) { }
+ private authService: AuthService,
+
+ ) {
+ this.headers = new HttpHeaders();
+ this.headers = this.headers.set('X-User-Id', 'GqjNWiLrGEHRna7Zn');
+ this.headers = this.headers.set('X-Auth-Token', 'SJwIgtlqfloPK696fpc2VBvyDluipuIHKB_0Q6-9ycJ');
+ }
ngOnInit() {
this.segment = "Contactos";
+ this.authService.userData$.subscribe((res:any)=>{
+ this.loggedUser=res;
+ console.log(this.loggedUser);
+
+ });
this.doRefresh();
- this.authService.getUserData();
-
+ this.loadJoinedRooms();
+ }
+ loadJoinedRooms(){
+ this.chatService.loadJoinedRooms().subscribe(res => {
+ console.log(res);
+ });
}
onSegmentChange(){
this.doRefresh();
}
doRefresh(){
- this.getGroups();
- this.getConnectedUsers();
+ setInterval(()=>{
+ this.getDirectMessages();
+ this.getGroups();
+ }, 2000);
}
getGroups(){
this.showLoader = true;
this.result = this.chatService.getAllPrivateGroups().subscribe((res:any)=>{
- this.groupList = res.groups;
+ this.privateGroups = res.groups;
+ this.result = this.chatService.getAllUserChannels().subscribe((res:any)=>{
+ this.publicGroups = res.channels;
+ this.allGroups = this.privateGroups.concat(this.publicGroups);
this.showLoader = false;
+ });
});
}
-
- getConnectedUsers(){
+ getDirectMessages(){
this.showLoader = true;
+
+ this.result = this.chatService.getAllDirectMessages().subscribe((res:any)=>{
+ this.userDirectMessages = res.ims;
+ console.log(res);
+
+ this.showLoader = false;
+ });
+ }
+ getChatMembers(){
+ this.chatService.getMembers(this.userDirectMessages[0]._id).subscribe(res=> {
+ this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
+ /* console.log(res);
+ console.log(this.dmUsers); */
+ });
+ }
+ /* getConnectedChannels(){
+ this.showLoader = true;
+
+ this.result = this.chatService.getAllUserChannels().subscribe((res:any)=>{
+ this.userChannels = res.channels;
+ console.log(res);
+
+ this.showLoader = false;
+ });
+ } */
+
+ /* getConnectedRooms(){
+ this.showLoader = true;
+
+ this.result = this.chatService.getAllRooms().subscribe((res:any)=>{
+ this.userRooms = res.update;
+ console.log(res.update);
+
+ this.showLoader = false;
+ });
+ } */
+
+ /* getConnectedUsers(){
+ this.showLoader = true;
+
this.result = this.chatService.getAllConnectedUsers().subscribe((res:any)=>{
this.userConnectedList = res.users;
- console.log(this.userConnectedList);
+
this.showLoader = false;
- });
- }
+ });
+ } */
async startConversation(selectedUser) {
const modal = await this.modalController.create({
@@ -70,8 +146,8 @@ export class ChatPage implements OnInit {
}
async selectContact(){
const modal = await this.modalController.create({
- component: NewchatPage,
- cssClass: 'newchat',
+ component: ContactsPage,
+ cssClass: 'contacts',
backdropDismiss: false,
});
await modal.present();
@@ -86,11 +162,28 @@ export class ChatPage implements OnInit {
await modal.present();
modal.onDidDismiss();
}
- async openGroupMessages(){
+ async openMessages(dm:any){
+ console.log(dm);
+
+ const modal = await this.modalController.create({
+ component: MessagesPage,
+ cssClass: 'group-messages',
+ backdropDismiss: false,
+ componentProps: {
+ dm: dm,
+ },
+ });
+ await modal.present();
+ modal.onDidDismiss();
+ }
+ async openGroupMessages(user:any){
const modal = await this.modalController.create({
component: GroupMessagesPage,
cssClass: 'group-messages',
backdropDismiss: false,
+ componentProps: {
+ user: user,
+ },
});
await modal.present();
modal.onDidDismiss();
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts
new file mode 100644
index 000000000..c998741ed
--- /dev/null
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { GroupContactsPage } from './group-contacts.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: GroupContactsPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class GroupContactsPageRoutingModule {}
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts
new file mode 100644
index 000000000..9ec279e82
--- /dev/null
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { GroupContactsPageRoutingModule } from './group-contacts-routing.module';
+
+import { GroupContactsPage } from './group-contacts.page';
+import { SharedModule } from 'src/app/shared/shared.module';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ SharedModule,
+ GroupContactsPageRoutingModule
+ ],
+ declarations: [GroupContactsPage]
+})
+export class GroupContactsPageModule {}
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
new file mode 100644
index 000000000..190194b56
--- /dev/null
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss
new file mode 100644
index 000000000..cf9de70f9
--- /dev/null
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss
@@ -0,0 +1,127 @@
+.header-toolbar{
+ --background:transparent;
+ --opacity: 1;
+
+ .main-header{
+ width: 100%; /* 400px */
+ height: 100%;
+ font-family: Roboto;
+ border-top-left-radius: 25px;
+ border-top-right-radius: 25px;
+ background-color: #fff;
+ overflow:hidden;
+ padding: 30px 20px 0px 20px;
+ color:#000;
+ transform: translate3d(0, 1px, 0);
+
+ .div-icon{
+ width: 40px;
+ float: right;
+ font-size: 35px;
+ overflow: auto;
+ padding: 1px;
+ }
+ .div-icon ion-icon{
+ float: right;
+ padding-left: 20px;
+ }
+ .title-content{
+ width: 360px;
+ margin: 0px auto;
+ overflow: auto;
+ padding: 0 !important;
+ }
+
+ .back-icon{
+ width: 37px;
+ float: left;
+ font-size: 35px;
+ overflow: auto;
+
+ }
+ .div-title{
+ width: 221px;
+ padding: 0!important;
+ float: left;
+ margin: 2.5px 0 0 5px;
+ }
+ .title{
+ font-size: 25px;
+ }
+ }
+ }
+ .toolbar-search{
+ --padding-top:0 !important;
+ --padding-bottom:0 !important;
+ --padding-start:0 !important;
+ --padding-end:0 !important;
+
+ .search{
+ border: 1px solid #ebebeb;
+ margin: 5px 20px 5px 20px;
+ border-radius: 5px;
+ }
+ .search ion-searchbar{
+ /* border: 1px solid green; */
+ width: 100%;
+ margin: 0 !important;
+ padding: 0 !important;
+ --border-radius: 5px;
+ --box-shadow: none;
+ overflow: auto;
+ --icon-color:#0d89d1;
+ }
+
+ }
+ ion-content{
+ --background:transparent;
+ }
+ .main-content{
+ width: 100%;
+ height: 100%;
+ font-family: Roboto;
+ margin: 0 auto;
+ background-color: #fff;
+ overflow:auto;
+ padding: 0 0 0 0;
+
+ .item-divider{
+ background: #ebebeb;
+ font-size: 15px;
+ margin: 10px 0 10px 0;
+ padding:5px 0 5px 20px;
+
+ }
+
+ .item-checkbox{
+ display: flex;
+ margin: 10px 20px 10px 20px !important;
+ overflow: auto;
+ align-items: center;
+
+ }
+
+ .item-checkbox ion-checkbox{
+ --border-color: #0d89d1;
+ --background-checked:#0d89d1;
+ float: left;
+ }
+
+ .item-checkbox p{
+ display: block;
+ margin: 0 !important;
+ width: 330px;
+ padding-left: 10px;
+ font-size: 15px;
+ color: #0d89d1;
+ float: left;
+ }
+ .item-checkbox ion-icon{
+ font-size: 10px;
+ float: left;
+ color:#99e47b;
+ margin-left: 10px;
+ }
+ }
+
+
\ No newline at end of file
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.spec.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.spec.ts
new file mode 100644
index 000000000..dde2043a8
--- /dev/null
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { GroupContactsPage } from './group-contacts.page';
+
+describe('GroupContactsPage', () => {
+ let component: GroupContactsPage;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ GroupContactsPage ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(GroupContactsPage);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
new file mode 100644
index 000000000..f109751bd
--- /dev/null
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -0,0 +1,152 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+import { GroupMessagesPage } from '../group-messages.page';
+
+@Component({
+ selector: 'app-group-contacts',
+ templateUrl: './group-contacts.page.html',
+ styleUrls: ['./group-contacts.page.scss'],
+})
+export class GroupContactsPage implements OnInit {
+ showLoader: boolean;
+ users = [];
+
+ contact: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
+
+ headers: HttpHeaders;
+ options:any;
+
+ contacts: Contact[] = [
+ {
+ first: 'Ana',
+ last: 'Manuel',
+ url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
+ },
+ {
+ first: 'Abdullah',
+ last: 'Hill',
+ url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
+ },
+ {
+ first: 'Batur',
+ last: 'Oymen',
+ url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
+ },
+ {
+ first: 'Bianca',
+ last: 'Costa',
+ url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
+ },
+ {
+ first: 'Zaya',
+ last: 'Mary',
+ url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
+ },
+ {
+ first: 'Tiago',
+ last: 'Kayaya',
+ url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
+ }
+];
+
+ constructor(
+ private modalController: ModalController,
+ private http: HttpClient,
+ )
+ {
+ this.headers = new HttpHeaders();
+ this.headers = this.headers.set('Access-Control-Allow-Origin' , '*');
+ this.headers = this.headers.set('Access-Control-Allow-Methods', 'POST, GET, OPTIONS, PUT');
+ this.headers = this.headers.set('Accept','application/json');
+ this.headers = this.headers.set('content-type','application/json');
+
+
+ }
+
+ ngOnInit() {
+ this.loadUsers();
+
+ }
+
+ loadUsers(){
+ this.options = {
+ headers: this.headers,
+ };
+ /* this.http.get('https://randomuser.me/api/?results=100', this.options)
+ .subscribe(res => {
+ this.users = res['results'].sort((a,b) => {
+ if(a.name.first < b.name.first){
+ return -1;
+ }
+ if(a.name.first > b.name.first){
+ return 1;
+ }
+ return 0;
+ });
+ console.log(res);
+ console.log(this.users);
+ }); */
+ this.users = this.contacts.sort((a,b) => {
+ if(a.first < b.first){
+ return -1;
+ }
+ if(a.first > b.first){
+ return 1;
+ }
+ return 0;
+ });
+ }
+
+ separateLetter(record, recordIndex, records){
+ /* if(recordIndex == 0){
+ return record.name.first[0];
+ }
+
+ let first_prev = records[recordIndex - 1].name.first[0];
+ let first_current = record.name.first[0];
+
+ if(first_prev != first_current){
+ return first_current;
+ }
+ return null; */
+ if(recordIndex == 0){
+ return record.first[0];
+ }
+
+ let first_prev = records[recordIndex - 1].first[0];
+ let first_current = record.first[0];
+
+ if(first_prev != first_current){
+ return first_current;
+ }
+ return null;
+ }
+
+ doRefresh(event){
+
+ }
+ close(){
+ this.modalController.dismiss();
+ }
+ onChange(event){
+
+ }
+ clicked(){
+ console.log('clicked');
+
+ }
+ async groupMessages(){
+ const modal = await this.modalController.create({
+ component: GroupMessagesPage,
+ componentProps: {},
+ cssClass: 'contacts',
+ backdropDismiss: false
+ });
+
+ await modal.present();
+
+ modal.onDidDismiss();
+ }
+
+}
diff --git a/src/app/pages/chat/group-messages/group-messages-routing.module.ts b/src/app/pages/chat/group-messages/group-messages-routing.module.ts
index 5a4f0ae40..708ec8d8f 100644
--- a/src/app/pages/chat/group-messages/group-messages-routing.module.ts
+++ b/src/app/pages/chat/group-messages/group-messages-routing.module.ts
@@ -1,17 +1,21 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { GroupMessagesPage } from './group-messages.page';
-
-const routes: Routes = [
- {
- path: '',
- component: GroupMessagesPage
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { GroupMessagesPage } from './group-messages.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: GroupMessagesPage
+ },
{
+ path: 'group-contacts',
+ loadChildren: () => import('./group-contacts/group-contacts.module').then( m => m.GroupContactsPageModule)
}
-];
-@NgModule({
- imports: [RouterModule.forChild(routes)],
- exports: [RouterModule],
-})
-export class GroupMessagesPageRoutingModule {}
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class GroupMessagesPageRoutingModule {}
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index a999b764c..ca0a8e4b8 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -1,7 +1,7 @@
-
+
+
+
+
- Secretário Assuntos Sociais
+
+
+ {{user}}
+
+
+
+ {{dm.lastMessage._updatedAt | date: 'HH:mm'}}
+
+ {{dm.lastMessage.msg}}
+
+
+
+
+
+
+
+
+
+ {{group.name}}
+
+ {{group.lastMessage._updatedAt | date: 'HH:mm'}}
+
+ {{group.lastMessage.u.name}}: {{group.lastMessage.msg}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
-
-
- 
-
+
+
+
+
-
-
+
+
-
-
- 
-
+
+
+
+
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss
index f02b586d7..cbe5a62e7 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.scss
+++ b/src/app/pages/chat/group-messages/group-messages.page.scss
@@ -1,3 +1,4 @@
+@import '~src/function.scss';
.header-toolbar{
--background:transparent;
--opacity: 1;
@@ -14,7 +15,7 @@
color:#000;
transform: translate3d(0, 1px, 0);
- .title-content{
+ .header-top{
width: 360px;
margin: 0px auto;
overflow: auto;
@@ -34,6 +35,30 @@
margin: 5px 0 0 0;
}
}
+ .header-bottom{
+ width: 310px;
+ overflow: auto;
+ margin: 0 auto;
+
+ .header-bottom-icon{
+ width: 30px;
+ font-size: 25px;
+ float: left;
+ padding: 2px;
+
+ }
+ .header-bottom-contacts{
+ width: 275px;
+ font-size: 15px;
+ color: #797979;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ float: left;
+ padding: 5px;
+ margin: 1px;
+ }
+ }
.title{
font-size: 25px;
@@ -50,4 +75,88 @@
padding-left: 20px;
}
}
+ }
+ ion-content{
+ .welcome-text{
+ /* width: 322px; */
+ width: em(422px);
+ background: #ebebeb;
+ text-align: center;
+ font-size: 13px;
+ color: #797979;
+ padding: 10px;
+ margin: 0 auto;
+ line-height: 1.2rem;
+ margin: 20px 39px 25px;
+ border-radius: 8px;
+ }
+ .messages{
+ font-size: 13px;
+ font-family: Roboto;
+ overflow: auto;
+
+ .incoming, .outgoing{
+ width: 305px;
+ padding: 15px 20px;
+ border-radius: 10px;
+ }
+
+ .incoming{
+ margin: 10px 75px 10px 20px;
+ background: #ebebeb;
+ float: left;
+
+ }
+ }
+ .outgoing{
+ margin: 10px 20px 10px 75px;
+ background: #e4f4fe;
+ float: right;
+ }
+ .title{
+ color: #0782c9;
+
+ font-weight: bold;
+ margin-bottom: 5px;
+
+ .time{
+ color: #797979;
+ text-align: right;
+ float: right;
+ }
+ }
+ }
+
+ ion-footer{
+ .row{
+ width: 380px;
+ margin: 0 auto;
+ }
+
+ .chat-icon-options{
+ display:block !important;
+ font-size: 25px;
+ float: right !important;
+ margin-top: 10px;
+ }
+
+ .chat-icon-send{
+ font-size: 45px;
+ margin: 0 auto;
+ margin-top: 4px;
+ }
+
+ .type-message{
+ display: flex;
+ border: 1px solid #ebebeb;
+ border-radius: 25px;
+ padding-left: 15px;
+ align-items: center;
+ overflow: auto;
+
+ ion-textarea{
+ margin: 0 !important;
+ align-self: center;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 2cfa68310..5399545da 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -1,6 +1,9 @@
import { Component, OnInit } from '@angular/core';
-import { ActionSheetController, MenuController, PopoverController } from '@ionic/angular';
+import { ActionSheetController, MenuController, ModalController, PopoverController } from '@ionic/angular';
+import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popover.page';
+import { ContactsPage } from '../new-group/contacts/contacts.page';
+import { NewGroupPage } from '../new-group/new-group.page';
@Component({
selector: 'app-group-messages',
@@ -10,9 +13,11 @@ import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popove
export class GroupMessagesPage implements OnInit {
message:any;
+ contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
constructor(
private menu: MenuController,
+ private modalController: ModalController,
private actionSheetController: ActionSheetController,
public popoverController: PopoverController,
) { }
@@ -53,6 +58,27 @@ export class GroupMessagesPage implements OnInit {
});
return await popover.present();
}
+ async openChatOptions(ev: any) {
+ const popover = await this.popoverController.create({
+ component: ChatOptionsPopoverPage,
+ cssClass: 'chat-options-popover',
+ event: ev,
+ translucent: true
+ });
+ return await popover.present();
+ }
+ async addContacts(){
+ const modal = await this.modalController.create({
+ component: ContactsPage,
+ componentProps: {},
+ cssClass: 'contacts',
+ backdropDismiss: false
+ });
+
+ await modal.present();
+
+ modal.onDidDismiss();
+ }
}
diff --git a/src/app/pages/chat/messages/contacts/contacts-routing.module.ts b/src/app/pages/chat/messages/contacts/contacts-routing.module.ts
new file mode 100644
index 000000000..fb8c7a5ea
--- /dev/null
+++ b/src/app/pages/chat/messages/contacts/contacts-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ContactsPage } from './contacts.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: ContactsPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class ContactsPageRoutingModule {}
diff --git a/src/app/pages/chat/messages/contacts/contacts.module.ts b/src/app/pages/chat/messages/contacts/contacts.module.ts
new file mode 100644
index 000000000..8284984be
--- /dev/null
+++ b/src/app/pages/chat/messages/contacts/contacts.module.ts
@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ContactsPageRoutingModule } from './contacts-routing.module';
+
+import { ContactsPage } from './contacts.page';
+import { SharedModule } from 'src/app/shared/shared.module';
+import { PipesModule } from 'src/app/pipes/pipes.module';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ SharedModule,
+ PipesModule,
+ ContactsPageRoutingModule
+ ],
+ declarations: [ContactsPage]
+})
+export class ContactsPageModule {}
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html
new file mode 100644
index 000000000..b2f8e9705
--- /dev/null
+++ b/src/app/pages/chat/messages/contacts/contacts.page.html
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.scss b/src/app/pages/chat/messages/contacts/contacts.page.scss
new file mode 100644
index 000000000..1eb104bdb
--- /dev/null
+++ b/src/app/pages/chat/messages/contacts/contacts.page.scss
@@ -0,0 +1,136 @@
+
+.header-toolbar{
+ --background:transparent;
+ --opacity: 1;
+
+ .main-header{
+ width: 100%; /* 400px */
+ height: 100%;
+ font-family: Roboto;
+ border-top-left-radius: 25px;
+ border-top-right-radius: 25px;
+ background-color: #fff;
+ overflow:hidden;
+ padding: 30px 20px 0px 20px;
+ color:#000;
+ transform: translate3d(0, 1px, 0);
+
+ .div-icon{
+ width: 40px;
+ float: right;
+ font-size: 35px;
+ overflow: auto;
+ padding: 1px;
+ }
+ .div-icon ion-icon{
+ float: right;
+ padding-left: 20px;
+ }
+ .title-content{
+ width: 360px;
+ margin: 0px auto;
+ overflow: auto;
+ padding: 0 !important;
+ }
+
+ .back-icon{
+ width: 37px;
+ float: left;
+ font-size: 35px;
+ overflow: auto;
+
+ }
+ .div-title{
+ width: 221px;
+ padding: 0!important;
+ float: left;
+ margin: 2.5px 0 0 5px;
+ }
+ .title{
+ font-size: 25px;
+ }
+ }
+ }
+ .toolbar-search{
+ --padding-top:0 !important;
+ --padding-bottom:0 !important;
+ --padding-start:0 !important;
+ --padding-end:0 !important;
+
+ .search{
+ border: 1px solid #ebebeb;
+ margin: 5px 20px 5px 20px;
+ border-radius: 5px;
+ height: auto;
+ padding: 0 !important;
+ }
+ .search ion-searchbar{
+ /* border: 1px solid green; */
+ width: 100%;
+ margin: 0 !important;
+ padding: 0 !important;
+ --border-radius: 5px;
+ --box-shadow: none;
+ overflow: hidden;
+ --icon-color:#0d89d1;
+ }
+
+ }
+ ion-content{
+ --background:transparent;
+ }
+ .main-content{
+ width: 100%;
+ height: 100%;
+ font-family: Roboto;
+ margin: 0 auto;
+ background-color: #fff;
+ overflow:auto;
+ padding: 0 0 0 0;
+
+ .item-divider{
+ background: #ebebeb;
+ font-size: 15px;
+ margin: 10px 0 10px 0;
+ padding:5px 0 5px 20px;
+
+ }
+
+ .item-user{
+ display: flex;
+ margin: 10px 20px 10px 20px !important;
+ overflow: auto;
+ align-items: center;
+ }
+
+ .item-user p{
+ display: block;
+ margin: 0 !important;
+ width: 90%;
+ font-size: 15px;
+ color: #0d89d1;
+ float: left;
+ }
+ .item-user .icon{
+ width: 10%;
+ font-size: 10px;
+ display: block;
+ text-align: right;
+ overflow: auto;
+ }
+ .online{
+ color:#99e47b;
+ }
+ .offline{
+ color:#cbced1;
+ }
+ .away{
+ color:#ffd21f;
+ }
+ .invisible{
+ color:#cbced1;
+ }
+ .busy{
+ color:#f5455c;
+ }
+ }
\ No newline at end of file
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.spec.ts b/src/app/pages/chat/messages/contacts/contacts.page.spec.ts
new file mode 100644
index 000000000..8f263232b
--- /dev/null
+++ b/src/app/pages/chat/messages/contacts/contacts.page.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ContactsPage } from './contacts.page';
+
+describe('ContactsPage', () => {
+ let component: ContactsPage;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ContactsPage ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(ContactsPage);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts
new file mode 100644
index 000000000..ff86e8d5b
--- /dev/null
+++ b/src/app/pages/chat/messages/contacts/contacts.page.ts
@@ -0,0 +1,153 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+import { AuthService } from 'src/app/services/auth.service';
+import { ChatService } from 'src/app/services/chat.service';
+import { GroupMessagesPage } from '../../group-messages/group-messages.page';
+import { MessagesPage } from '../messages.page';
+
+@Component({
+ selector: 'app-contacts',
+ templateUrl: './contacts.page.html',
+ styleUrls: ['./contacts.page.scss'],
+})
+export class ContactsPage implements OnInit {
+ showLoader: boolean;
+ loggedUser: any;
+ users = [];
+
+ headers: HttpHeaders;
+ options:any;
+ contacts:any;
+ textSearch:string;
+ room:any;
+ dm:any;
+
+ constructor(
+ private modalController: ModalController,
+ private http: HttpClient,
+ private chatService: ChatService,
+ private authService: AuthService,
+ )
+ {
+ this.authService.userData$.subscribe((res:any)=>{
+ this.loggedUser=res;
+ });
+ this.textSearch="";
+ this.dm=null;
+ this.room=null;
+ }
+
+ ngOnInit() {
+ this.loadUsers();
+
+ }
+ onChange(event){
+ this.textSearch = event.detail.value;
+ }
+
+ loadUsers(){
+ this.options = {
+ headers: this.headers,
+ };
+ this.chatService.getAllUsers().subscribe((res:any)=>{
+ console.log(res.users);
+ this.contacts = res.users.filter(data => data.username != this.loggedUser.me.username);
+ this.users = this.contacts.sort((a,b) => {
+ if(a.name < b.name){
+ return -1;
+ }
+ if(a.name > b.name){
+ return 1;
+ }
+ return 0;
+ });
+ this.showLoader = false;
+ });
+ }
+
+ separateLetter(record, recordIndex, records){
+ if(recordIndex == 0){
+ return record.name[0];
+ }
+
+ let first_prev = records[recordIndex - 1].name[0];
+ let first_current = record.name[0];
+
+ if(first_prev != first_current){
+ return first_current;
+ }
+ return null;
+ }
+
+ doRefresh(event){
+ }
+
+ close(){
+ this.modalController.dismiss();
+ }
+
+ clicked(){
+ console.log('clicked');
+ }
+
+ createRoom(username:string){
+ let body = {
+ username: username,
+ }
+ this.chatService.createRoom(body).subscribe(res => {
+ console.log(res);
+ this.room = res['room'];
+ this.getDirectMessage(this.room._id);
+ });
+ }
+ getDirectMessage(roomId:any){
+ console.log(roomId);
+
+ this.chatService.getAllDirectMessages().subscribe(res=>{
+ let result = res['ims'].filter(data => data._id == roomId);
+ this.dm = result[0];
+ console.log(this.dm);
+ this.openModal(this.dm);
+ });
+ }
+ async openModal(dm:any){
+ this.close();
+ console.log(dm);
+
+ const modal = await this.modalController.create({
+ component: MessagesPage,
+ cssClass: 'group-messages',
+ backdropDismiss: false,
+ componentProps: {
+ dm: dm,
+ },
+ });
+ await modal.present();
+ modal.onDidDismiss();
+ }
+
+ async openMessages(username:string){
+ /* this.close(); */
+
+ let dm:any;
+ //Create new room
+ this.createRoom(username);
+ //Get direct messages (dm)
+ /* this.getDirectMessage(this.room._id); */
+ console.log(this.dm);
+
+
+ /* const modal = await this.modalController.create({
+ component: MessagesPage,
+ cssClass: 'group-messages',
+ backdropDismiss: false,
+ componentProps: {
+ dm: dm,
+ },
+ });
+ await modal.present();
+ modal.onDidDismiss(); */
+ }
+
+}
diff --git a/src/app/pages/chat/messages/messages-routing.module.ts b/src/app/pages/chat/messages/messages-routing.module.ts
new file mode 100644
index 000000000..c00bd5ccb
--- /dev/null
+++ b/src/app/pages/chat/messages/messages-routing.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { MessagesPage } from './messages.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: MessagesPage
+ },
{
+ path: 'contacts',
+ loadChildren: () => import('./contacts/contacts.module').then( m => m.ContactsPageModule)
+ }
+
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class MessagesPageRoutingModule {}
diff --git a/src/app/pages/chat/messages/messages.module.ts b/src/app/pages/chat/messages/messages.module.ts
new file mode 100644
index 000000000..c933f79fe
--- /dev/null
+++ b/src/app/pages/chat/messages/messages.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { MessagesPageRoutingModule } from './messages-routing.module';
+
+import { MessagesPage } from './messages.page';
+import { SharedModule } from 'src/app/shared/shared.module';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ SharedModule,
+ MessagesPageRoutingModule
+ ],
+ declarations: [MessagesPage]
+})
+export class MessagesPageModule {}
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
new file mode 100644
index 000000000..76c20b2f0
--- /dev/null
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/pages/chat/messages/messages.page.scss
new file mode 100644
index 000000000..c485116ff
--- /dev/null
+++ b/src/app/pages/chat/messages/messages.page.scss
@@ -0,0 +1,194 @@
+@import '~src/function.scss';
+.header-toolbar{
+ --background:transparent;
+ --opacity: 1;
+
+ .main-header{
+ width: 100%; /* 400px */
+ height: 100%;
+ font-family: Roboto;
+ border-top-left-radius: 25px;
+ border-top-right-radius: 25px;
+ background-color: #fff;
+ overflow:hidden;
+ padding: 30px 20px 0px 20px;
+ color:#000;
+ transform: translate3d(0, 1px, 0);
+
+ .header-top{
+ width: 360px;
+ margin: 0px auto;
+ overflow: auto;
+ padding: 0 !important;
+ background: #fff;
+ .middle{
+ padding: 0!important;
+ float: left;
+ width: 280px;
+ margin: 2.5px 0 0 5px;
+ display: flex;
+ align-items: center;
+
+ }
+ .right{
+ padding: 0!important;
+ float: right;
+ font-size: 25px;
+ color: #0782c9;
+ margin: 5px 0 0 0;
+ }
+ }
+ .header-bottom{
+ width: 310px;
+ overflow: auto;
+ margin: 0 auto;
+
+ .header-bottom-icon{
+ width: 30px;
+ font-size: 25px;
+ float: left;
+ padding: 2px;
+
+ }
+ .header-bottom-contacts{
+ width: 275px;
+ font-size: 15px;
+ color: #797979;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ float: left;
+ padding: 5px;
+ margin: 1px;
+ }
+ }
+
+ .title{
+ font-size: 25px;
+ overflow: auto;
+ float: left;
+ }
+ .div-icon{
+ width: 40px;
+ float: right;
+ font-size: 35px;
+ overflow: auto;
+ padding: 1px;
+ }
+ .div-icon ion-icon{
+ float: right;
+ padding-left: 20px;
+ }
+ }
+ }
+ ion-content{
+ .welcome-text{
+ /* width: 322px; */
+ width: em(422px);
+ background: #ebebeb;
+ text-align: center;
+ font-size: 13px;
+ color: #797979;
+ padding: 10px;
+ margin: 0 auto;
+ line-height: 1.2rem;
+ margin: 20px 39px 25px;
+ border-radius: 8px;
+ }
+ .messages{
+ font-size: 13px;
+ font-family: Roboto;
+ overflow: auto;
+
+ //set scroll do bottom
+ position: absolute;
+ top: 0;
+ left: 0;
+ overflow-x: hidden;
+ overflow-y: auto;
+ width: 100%;
+ height: 100%;
+ word-wrap: break-word;
+ -webkit-overflow-scrolling: touch;
+
+
+ .incoming-true, .incoming-false{
+ width: 305px;
+ padding: 15px 20px;
+ border-radius: 10px;
+
+ }
+
+ .incoming-true{
+ margin: 10px 75px 10px 20px;
+ background: #ebebeb;
+ float: left;
+
+ }
+ }
+ .incoming-false{
+ margin: 10px 20px 10px 75px;
+ background: #e4f4fe;
+ float: right;
+ }
+ .title{
+ display: inline;
+ color: #0782c9;
+ font-weight: bold;
+ margin-bottom: 5px;
+
+ .time{
+ color: #797979;
+ text-align: right;
+ float: right;
+ }
+ }
+ }
+
+ ion-footer{
+ .row{
+ width: 380px;
+ margin: 0 auto;
+ }
+
+ .chat-icon-options{
+ display:block !important;
+ font-size: 25px;
+ float: right !important;
+ margin-top: 10px;
+ }
+
+ .chat-icon-send{
+ font-size: 45px;
+ margin: 0 auto;
+ margin-top: 4px;
+ }
+
+ .type-message{
+ display: flex;
+ border: 1px solid #ebebeb;
+ border-radius: 25px;
+ padding-left: 15px;
+ align-items: center;
+ overflow: auto;
+
+ ion-textarea{
+ margin: 0 !important;
+ align-self: center;
+ }
+ }
+ }
+
+ .text-color-blue{
+ font-size: 15px;
+ color: #0782c9;
+ font-weight: 500;
+ letter-spacing: normal;
+ }
+ .user-status-online{
+ display: block;
+ float: left;
+ color:#99e47b;
+ padding-left: 10px;
+ }
+
\ No newline at end of file
diff --git a/src/app/pages/chat/messages/messages.page.spec.ts b/src/app/pages/chat/messages/messages.page.spec.ts
new file mode 100644
index 000000000..826962a23
--- /dev/null
+++ b/src/app/pages/chat/messages/messages.page.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { MessagesPage } from './messages.page';
+
+describe('MessagesPage', () => {
+ let component: MessagesPage;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ MessagesPage ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(MessagesPage);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
new file mode 100644
index 000000000..ce5a3f1a5
--- /dev/null
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -0,0 +1,144 @@
+import { AfterViewChecked, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { Status } from 'src/app/models/chat/status.model';
+import { AuthService } from 'src/app/services/auth.service';
+import { ChatService } from 'src/app/services/chat.service';
+import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
+import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page';
+import { ContactsPage } from '../new-group/contacts/contacts.page';
+
+@Component({
+ selector: 'app-messages',
+ templateUrl: './messages.page.html',
+ styleUrls: ['./messages.page.scss'],
+})
+export class MessagesPage implements OnInit, AfterViewChecked {
+
+ @ViewChild('scrollMe') private myScrollContainer: ElementRef;
+
+ loggedUser: any;
+
+ message = '';
+ messages:any;
+ dm:any;
+ userPresence='';
+ dmUsers:any;
+
+
+ constructor(
+ public popoverController: PopoverController,
+ private modalController: ModalController,
+ private navParams: NavParams,
+ private chatService: ChatService,
+ private authService: AuthService,
+ ) {
+ this.dm = this.navParams.get('dm');
+ }
+
+ ngOnInit() {
+
+ this.scrollToBottom();
+
+ this.authService.userData$.subscribe((res:any)=>{
+ this.loggedUser=res;
+ console.log(this.loggedUser);
+ });
+
+ /* console.log(this.dm); */
+
+ setInterval(()=>{
+ this.checkUserPresence();
+ this.loadMessages();
+ }, 2000);
+
+ this.getChatMembers();
+
+
+ }
+ loadUser(){
+ console.log('working');
+
+ }
+ ngAfterViewChecked() {
+ this.scrollToBottom();
+ }
+ scrollToBottom(): void {
+ try {
+ this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
+ } catch(err) { }
+ }
+ loadMoreMessages(ev:any){
+
+ }
+
+ checkUserPresence(){
+ this.chatService.getUserPresence(this.dm.lastMessage.u._id).subscribe(res=>{
+ this.userPresence = res['presence'];
+ });
+ }
+ sendMessage(){
+
+ let body = {
+ "message":
+ {
+ "rid": this.dm._id, "msg": this.message
+ }
+ }
+
+ this.chatService.sendMessage(body).subscribe(res=> {
+ this.loadMessages();
+ });
+ this.message = "";
+ }
+
+ loadMessages(){
+ this.chatService.getRoomMessages(this.dm._id).subscribe(res => {
+ /* console.log(res); */
+ this.messages = res['messages'].reverse();
+ })
+ }
+ getChatMembers(){
+ this.chatService.getMembers(this.dm._id).subscribe(res=> {
+ this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
+ console.log(res);
+ console.log(this.dmUsers);
+ });
+ }
+
+ async openMessagesOptions(ev: any) {
+ const popover = await this.popoverController.create({
+ component: MessagesOptionsPage,
+ componentProps: {
+ roomId: this.dm._id,
+ },
+ cssClass: 'messages-options',
+ event: ev,
+ translucent: true,
+ });
+ return await popover.present();
+ }
+
+ async addContacts(){
+ const modal = await this.modalController.create({
+ component: ContactsPage,
+ componentProps: {},
+ cssClass: 'contacts',
+ backdropDismiss: false
+ });
+
+ await modal.present();
+
+ modal.onDidDismiss();
+ }
+
+ async openChatOptions(ev: any) {
+ const popover = await this.popoverController.create({
+ component: ChatOptionsPopoverPage,
+ cssClass: 'chat-options-popover',
+ event: ev,
+ translucent: true
+ });
+ return await popover.present();
+ }
+
+}
diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.html b/src/app/pages/chat/new-group/contacts/contacts.page.html
index ab73e8012..5120198ad 100644
--- a/src/app/pages/chat/new-group/contacts/contacts.page.html
+++ b/src/app/pages/chat/new-group/contacts/contacts.page.html
@@ -12,8 +12,10 @@
+
Grupo de Trabalho A
@@ -10,36 +10,104 @@
+
+
+
+ {{contact}}
+
+
+ HHHHH
- - - +
+ Esta conversa passou a grupo
+A conversa original mantêm-se como chat individual
+
+ +
+
+
+
+ Secretário Assuntos sociais
+ 14:23
+
+
+ 
+ Investidura Filipe Nyusi
+
+
+
+
+
+ Secretário Assuntos sociais
+ 14:23
+
+
+ Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república
+
+
+
+
+ Presidente da República
+ 14:23
+
+
+ Pois é, momentos históricos
+
+
+
+
+ Ministro do interior
+ 16:23
+
+
+ Grande momento
+
+
+
+
+ Secretário Assuntos sociais
+ 14:23
+
+
+ Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república
+
+
+
+
+ Secretário Assuntos sociais
+ 14:23
+
+
+ Caros colegas, partilho o momento de confraternização do presidente Filipe Nyusi e de dua excelência, o presidente da república
+
+
-
-
+
+
+
+
+
+ Nova Conversa
+
+
+
+
+
+
+
+
+
+
+
+ {{header}}
+
+
+
+
+
+ {{user.name}}
+ +
+
+
+
+
+ {{users.name}}
+
+
+
+
+
+
+
+ Adicionar contacto
+
+
+
-
-
-
-
+
+
-
Tiago Kayaya
+ + --> + +
+ {{header}}
-
+
+
diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.scss b/src/app/pages/chat/new-group/contacts/contacts.page.scss
index a940a13d8..c97008f82 100644
--- a/src/app/pages/chat/new-group/contacts/contacts.page.scss
+++ b/src/app/pages/chat/new-group/contacts/contacts.page.scss
@@ -1,6 +1,4 @@
-ion-content{
- --background:transparent;
-}
+
.header-toolbar{
--background:transparent;
--opacity: 1;
@@ -53,19 +51,55 @@ ion-content{
}
}
}
- .main-content{
- width: 360px;
- height: 100%;
- font-family: Roboto;
- margin: 0 auto;
- background-color: #fff;
- overflow:auto;
- padding: 0 20px 0 20px;
+.toolbar-search{
+ --padding-top:0 !important;
+ --padding-bottom:0 !important;
+ --padding-start:0 !important;
+ --padding-end:0 !important;
+
+ .search{
+ border: 1px solid #ebebeb;
+ margin: 5px 20px 5px 20px;
+ border-radius: 5px;
+ }
+ .search ion-searchbar{
+ /* border: 1px solid green; */
+ width: 100%;
+ margin: 0 !important;
+ padding: 0 !important;
+ --border-radius: 5px;
+ --box-shadow: none;
+ overflow: auto;
+ --icon-color:#0d89d1;
+ }
+
+}
+ion-content{
+ --background:transparent;
+}
+.main-content{
+ width: 100%;
+ height: 100%;
+ font-family: Roboto;
+ margin: 0 auto;
+ background-color: #fff;
+ overflow:auto;
+ padding: 0 0 0 0;
+
+ .item-divider{
+ background: #ebebeb;
+ font-size: 15px;
+ margin: 10px 0 10px 0;
+ padding:5px 0 5px 20px;
+
+ }
.item-checkbox{
- width: 100%;
- margin: 15px 0 15px 0;
- overflow: auto;
+ display: flex;
+ margin: 10px 20px 10px 20px !important;
+ overflow: auto;
+ align-items: center;
+
}
.item-checkbox ion-checkbox{
@@ -77,26 +111,17 @@ ion-content{
.item-checkbox p{
display: block;
margin: 0 !important;
- width: 270px;
+ width: 330px;
padding-left: 10px;
font-size: 15px;
color: #0d89d1;
float: left;
}
.item-checkbox ion-icon{
- float: left;
- color:#99e47b;
+ font-size: 10px;
+ float: left;
+ color:#99e47b;
+ margin-left: 10px;
}
}
- .header-search{
- margin-top: 15px;
- ion-searchbar{
- width: 380px;
- margin: 0px auto;
- --border-radius: 5px;
- --box-shadow: /* inset */ .5px .5px 5px #ebebeb;
- overflow: auto;
- --icon-color:#0d89d1;
- }
- }
diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.ts b/src/app/pages/chat/new-group/contacts/contacts.page.ts
index 82c3b001c..b2d114651 100644
--- a/src/app/pages/chat/new-group/contacts/contacts.page.ts
+++ b/src/app/pages/chat/new-group/contacts/contacts.page.ts
@@ -1,3 +1,4 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { GroupMessagesPage } from '../../group-messages/group-messages.page';
@@ -9,16 +10,119 @@ import { GroupMessagesPage } from '../../group-messages/group-messages.page';
})
export class ContactsPage implements OnInit {
showLoader: boolean;
+ users = [];
+
+ contact: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
+
+ headers: HttpHeaders;
+ options:any;
+
+ contacts: Contact[] = [
+ {
+ first: 'Ana',
+ last: 'Manuel',
+ url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
+ },
+ {
+ first: 'Abdullah',
+ last: 'Hill',
+ url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
+ },
+ {
+ first: 'Batur',
+ last: 'Oymen',
+ url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
+ },
+ {
+ first: 'Bianca',
+ last: 'Costa',
+ url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
+ },
+ {
+ first: 'Zaya',
+ last: 'Mary',
+ url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
+ },
+ {
+ first: 'Tiago',
+ last: 'Kayaya',
+ url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
+ }
+];
constructor(
- private modalController: ModalController,
- ) {
+ private modalController: ModalController,
+ private http: HttpClient,
+ )
+ {
+ this.headers = new HttpHeaders();
+ this.headers = this.headers.set('Access-Control-Allow-Origin' , '*');
+ this.headers = this.headers.set('Access-Control-Allow-Methods', 'POST, GET, OPTIONS, PUT');
+ this.headers = this.headers.set('Accept','application/json');
+ this.headers = this.headers.set('content-type','application/json');
+
}
ngOnInit() {
+ this.loadUsers();
}
+
+ loadUsers(){
+ this.options = {
+ headers: this.headers,
+ };
+ /* this.http.get('https://randomuser.me/api/?results=100', this.options)
+ .subscribe(res => {
+ this.users = res['results'].sort((a,b) => {
+ if(a.name.first < b.name.first){
+ return -1;
+ }
+ if(a.name.first > b.name.first){
+ return 1;
+ }
+ return 0;
+ });
+ console.log(res);
+ console.log(this.users);
+ }); */
+ this.users = this.contacts.sort((a,b) => {
+ if(a.first < b.first){
+ return -1;
+ }
+ if(a.first > b.first){
+ return 1;
+ }
+ return 0;
+ });
+ }
+
+ separateLetter(record, recordIndex, records){
+ /* if(recordIndex == 0){
+ return record.name.first[0];
+ }
+
+ let first_prev = records[recordIndex - 1].name.first[0];
+ let first_current = record.name.first[0];
+
+ if(first_prev != first_current){
+ return first_current;
+ }
+ return null; */
+ if(recordIndex == 0){
+ return record.first[0];
+ }
+
+ let first_prev = records[recordIndex - 1].first[0];
+ let first_current = record.first[0];
+
+ if(first_prev != first_current){
+ return first_current;
+ }
+ return null;
+ }
+
doRefresh(event){
}
diff --git a/src/app/pages/chat/new-group/new-group.page.html b/src/app/pages/chat/new-group/new-group.page.html
index 8b6d4b772..5dbfe0769 100644
--- a/src/app/pages/chat/new-group/new-group.page.html
+++ b/src/app/pages/chat/new-group/new-group.page.html
@@ -19,26 +19,18 @@
Gilson Manuel
+{{user.first}} {{user.last}}
+ Grupo Ultra-secreto
-
+
-
+
diff --git a/src/app/pages/chat/new-group/new-group.page.scss b/src/app/pages/chat/new-group/new-group.page.scss
index 244fbb7bd..d05552f41 100644
--- a/src/app/pages/chat/new-group/new-group.page.scss
+++ b/src/app/pages/chat/new-group/new-group.page.scss
@@ -107,21 +107,19 @@ ion-content{
border-radius: 5px;
padding-left: 10px;
}
+
.item-container-no-border{
+ display: flex;
width: 360px;
- margin: 15px auto;
+ margin: 25px auto;
border-radius: 5px;
- padding-left: 10px;
- }
- .item-container-no-border ion-checkbox{
- margin-top: 10px;
+ align-items: center;
}
.item-container-no-border ion-label{
padding-left: 10px;
font-size: 12px;
color: #000;
- margin-top: 0 !important;
}
}
diff --git a/src/app/pages/chat/new-group/new-group.page.ts b/src/app/pages/chat/new-group/new-group.page.ts
index c284363ea..4cd6e03be 100644
--- a/src/app/pages/chat/new-group/new-group.page.ts
+++ b/src/app/pages/chat/new-group/new-group.page.ts
@@ -1,5 +1,7 @@
+import { analyzeAndValidateNgModules } from '@angular/compiler';
import { Component, OnInit } from '@angular/core';
-import { ModalController } from '@ionic/angular';
+import { ModalController, PickerController, PopoverController } from '@ionic/angular';
+import { GroupDurationPage } from 'src/app/shared/popover/group-duration/group-duration.page';
import { ContactsPage } from './contacts/contacts.page';
@Component({
@@ -9,8 +11,13 @@ import { ContactsPage } from './contacts/contacts.page';
})
export class NewGroupPage implements OnInit {
showLoader: boolean;
+ displayDuration: any;
+ showDuration: boolean;
+ selectedDuration = ['','',''];
constructor(
+ private pickerController: PickerController,
+ private popoverController: PopoverController,
private modalController: ModalController,
) {
@@ -18,6 +25,9 @@ export class NewGroupPage implements OnInit {
ngOnInit() {
+ }
+ _ionChange(event){
+ this.showDuration = event.detail.checked;
}
close(){
this.modalController.dismiss();
@@ -35,5 +45,130 @@ export class NewGroupPage implements OnInit {
modal.onDidDismiss();
}
+
+ async setDuration(ev: any) {
+ const popover = await this.popoverController.create({
+ component: GroupDurationPage,
+ cssClass: 'group-duration',
+ event: ev,
+ translucent: true
+ });
+ return await popover.present();
+ }
+
+ async showPicker(){
+ const picker = await this.pickerController.create({
+ cssClass: '',
+ buttons: [
+ {
+ text: 'Cancelar', role: 'cancel', cssClass: 'btn-cancel'
+ },
+ {
+ text: 'Ok',
+ cssClass: 'btn-cancel',
+ handler:(value:any)=>{
+ console.log('button done pressed');
+ this.selectedDuration = [
+ value.days.value,
+ value.hours.value,
+ value.minutes.value,
+ ]
+ console.log(this.selectedDuration);
+ if(value.days.value != null && value.hours.value != null && value.minutes.value != null){
+ if(value.days.value > 0){
+ if(value.days.value == 1){
+ if(value.hours.value == 1){
+ this.displayDuration = value.days.value + " day " +
+ value.hours.value + " hora " +
+ value.minutes.value + " minutos";
+ }
+ else{
+ this.displayDuration = value.days.value + " days " +
+ value.hours.value + " horas " +
+ value.minutes.value + " minutos";
+ }
+ }
+ else{
+ if(value.hours.value == 1){
+ this.displayDuration = value.days.value + " days " +
+ value.hours.value + " hora " +
+ value.minutes.value + " minutos";
+ }
+ else{
+ this.displayDuration = value.days.value + " days " +
+ value.hours.value + " horas " +
+ value.minutes.value + " minutos";
+ }
+ }
+ }
+ else{
+ if(value.hours.value == 1){
+ this.displayDuration = value.hours.value + " hora " +
+ value.minutes.value + " minutos";
+ }
+ else{
+ this.displayDuration = value.hours.value + " horas " +
+ value.minutes.value + " minutos";
+ }
+ }
+ }
+ },
+ },
+ ],
+ columns: [
+ {
+ name: 'days',
+ prefix: 'Dias',
+ options: [
+ { text: '0', value: 0 },
+ { text: '1', value: 1 },
+ { text: '2', value: 2 },
+ { text: '3', value: 3 },
+ { text: '4', value: 4 },
+ ]
+ },
+ {
+ name: 'hours',
+ prefix: 'Horas',
+ options: [
+ { text: '0', value: 0 },
+ { text: '1', value: 1 },
+ { text: '2', value: 2 },
+ { text: '3', value: 3 },
+ { text: '4', value: 4 },
+ { text: '5', value: 5 },
+ { text: '6', value: 6 },
+ { text: '7', value: 7 },
+ { text: '8', value: 8 },
+ ]
+ },
+ {
+ name: 'minutes',
+ prefix: 'Minutos',
+ selectedIndex: 3,
+ options: [
+ { text: '0', value: 0 },
+ { text: '5', value: 5 },
+ { text: '10', value: 10 },
+ { text: '15', value: 15 },
+ { text: '20', value: 20 },
+ { text: '25', value: 25 },
+ { text: '30', value: 30 },
+ { text: '35', value: 35 },
+ { text: '45', value: 45 },
+ { text: '50', value: 50 },
+ { text: '55', value: 55 },
+ ]
+ }
+ ]
+ });
+ await picker.present();
+ picker.onDidDismiss().then(async data =>{
+ let day = await picker.getColumn('days');
+ let hour = await picker.getColumn('hours');
+ let minutes = await picker.getColumn('minutes');
+ });
+
+ }
}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 002c690a9..79128f750 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -131,7 +131,9 @@ export class EventsPage implements OnInit {
if(this.profile == "mdgpr"){
this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt') /* + ' 00:00:00' */, formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.eventsList = res;
- this.currentEvent = res[0].Subject;
+ if(res.length > 0){
+ this.currentEvent = res[0].Subject;
+ }
this.totalEvent = this.eventsList.length;
this.showLoader = false;
});
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 0e019fd0a..095126a7f 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -23,7 +23,7 @@ export class LoginPage implements OnInit {
userattempt: User;
public body = {"user": this.username,"password": this.password};
- public postData = {"user": "admin","password": this.password};
+ public postData = {"user": this.username,"password": this.password};
constructor(
private router: Router,
@@ -57,7 +57,7 @@ export class LoginPage implements OnInit {
loginRocketChat(){
this.authService.loginChat(this.postData).subscribe((res: any) =>{
- this.storageService.store(res);
+ this.storageService.store(AuthConnstants.AUTH, res.data);
console.log('Login to Rocket chat OK');
},(error:any) =>{
console.log('Network error');
@@ -67,7 +67,7 @@ export class LoginPage implements OnInit {
async Login(){
- try {
+ /* try { */
//Go to our home in home/feed.
//this.router.navigate(['/home/events']);
if(this.validateInput()){
@@ -79,8 +79,7 @@ export class LoginPage implements OnInit {
}
if (await this.authService.login(this.userattempt)){
this.loginRocketChat();
- console.log('Log Gabinete Digital OK');
- this.router.navigate(['/home/events']);
+ this.router.navigate(['/home/events']);this.presentAlert('1');
}
else
{
@@ -92,8 +91,9 @@ export class LoginPage implements OnInit {
//this.toastService.presentToast('Preencha todos campos');
this.presentAlert('Por favor, insira o seu nome de utilizador e palavra-passe.');
}
- } catch (error) {
- this.presentAlert('Ocorreu um erro ao fazer login. Contacte o administrador de sistema.');
- }
+ /* } catch (error) {
+ error
+ this.presentAlert('Ocorreu um erro ao fazer login. Contacte o administrador de sistema. '+ error);
+ } */
}
}
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index ee3389064..48a448a72 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -10,9 +10,10 @@ import { Image } from 'src/app/models/image';
import { ThrowStmt } from '@angular/compiler';
import { PhotoService } from 'src/app/services/photo.service';
import { AlertService } from 'src/app/services/alert.service';
-
+//Capacitor
/* const { Camera } = Plugins; */
+//Cordova
import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
import { PublicationFolder } from 'src/app/models/publicationfolder';
import { ViewPublicationsPage } from '../view-publications/view-publications.page';
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
index 3bd5967dc..29226a050 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
@@ -70,9 +70,6 @@ export class PublicationDetailPage implements OnInit {
this.showLoader = false;
});
}
- doRefresh(event){
-
- }
close(){
this.modalController.dismiss();
diff --git a/src/app/pipes/filter.pipe.spec.ts b/src/app/pipes/filter.pipe.spec.ts
new file mode 100644
index 000000000..1427de361
--- /dev/null
+++ b/src/app/pipes/filter.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { FilterPipe } from './filter.pipe';
+
+describe('FilterPipe', () => {
+ it('create an instance', () => {
+ const pipe = new FilterPipe();
+ expect(pipe).toBeTruthy();
+ });
+});
diff --git a/src/app/pipes/filter.pipe.ts b/src/app/pipes/filter.pipe.ts
new file mode 100644
index 000000000..68440de14
--- /dev/null
+++ b/src/app/pipes/filter.pipe.ts
@@ -0,0 +1,21 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'filter'
+})
+export class FilterPipe implements PipeTransform {
+
+ transform(array: any[], text:string, column:string): any {
+
+ if(text === ''){
+ return array;
+ }
+
+ text = text.toLowerCase();
+
+ return array.filter(item =>{
+ return item[column].toLowerCase().includes(text);
+ });
+ }
+
+}
diff --git a/src/app/pipes/pipes.module.ts b/src/app/pipes/pipes.module.ts
new file mode 100644
index 000000000..0d9ad52be
--- /dev/null
+++ b/src/app/pipes/pipes.module.ts
@@ -0,0 +1,10 @@
+import { NgModule } from '@angular/core';
+import { FilterPipe } from './filter.pipe';
+
+
+@NgModule({
+ declarations: [FilterPipe],
+ exports: [FilterPipe],
+ imports: []
+})
+export class PipesModule { }
diff --git a/src/app/resolvers/userData.resolver.ts b/src/app/resolvers/userData.resolver.ts
index 8d9771fc6..b5b5bbc93 100644
--- a/src/app/resolvers/userData.resolver.ts
+++ b/src/app/resolvers/userData.resolver.ts
@@ -8,6 +8,6 @@ export class UserDataResolver{
constructor(private authService: AuthService){}
resolve(){
- /* return this.authService.getUserData(); */
+ return this.authService.getUserData();
}
}
\ No newline at end of file
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 177d1c37c..bdb4ca88e 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -47,37 +47,28 @@ export class AuthService {
//Login to rocketChat server
loginChat(postData: any):Observable {
- const res = this.httpService.post('login', postData);
- const res2 = res.subscribe(res=>{
- this.storageService.store(res);
- });
- return res;
+ return this.httpService.post('login', postData);
}
- //Get user data from RocketChat
+ //Get user data from RocketChat | global object
getUserData(){
- const res = this.storageService.get('user');
- console.log(res);
-
-
- /* this.storageService.get(AuthConnstants.AUTH).then(res=>{
+ this.storageService.get(AuthConnstants.AUTH).then(res=>{
this.userData$.next(res);
- }) */
+ });
}
- /* getProfile(){
+ getProfile(){
this.storageService.get(AuthConnstants.PROFILE).then(res=>{
return res;
});
- } */
+ }
logoutChat(){
//this.storageService.clear();
- /* this.storageService.removeStorageItem(AuthConnstants.AUTH).then(res =>{
+ this.storageService.removeStorageItem(AuthConnstants.AUTH).then(res =>{
this.userData$.next('');
this.router.navigate(['']);
- }) */
-
+ })
}
}
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 0b0de9853..f400ca1ca 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -1,4 +1,4 @@
-import { HttpHeaders } from '@angular/common/http';
+import { HttpHeaders, HttpParams } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from "rxjs"
import { AuthService } from './auth.service';
@@ -14,6 +14,9 @@ import { Storage } from '@ionic/storage';
export class ChatService {
headers: HttpHeaders;
options:any;
+ options1:any;
+ X_User_Id:any;
+ X_Auth_Token:any;
constructor(
@@ -23,35 +26,126 @@ export class ChatService {
private storage: Storage,
private storageService:StorageService,) {
this.headers = new HttpHeaders();
-
- this.storage.get('user').then((val) => {
- console.log(JSON.parse(unescape(atob(val))).data.userId);
- let user = JSON.parse(unescape(atob(val))).data;
-
- this.headers = this.headers.set('Access-Control-Allow-Origin', 'http://localhost:8100');
- this.headers = this.headers.set('Access-Control-Allow-Credentials', 'true');
- this.headers = this.headers.set('Access-Control-Allow-Headers', 'Access-Control-Allow-Origin, Access-Control-Allow-Credentials, Access-Control-Allow-Headers, x-requested-with, Content-Type, X-Auth-Token, X-User-Id, origin, authorization, accept, client-security-token');
- this.headers = this.headers.set('X-User-Id', user.userId);
- this.headers = this.headers.set('X-Auth-Token', user.authToken);
- });
-
- /* this.authService.userData$.subscribe((res:any)=>{
+ /* this.headers = this.headers.set('X-User-Id', 'GqjNWiLrGEHRna7Zn');
+ this.headers = this.headers.set('X-Auth-Token', 'dAM0ZOTAy8jzQA_vS25z2IrnSc6sYLfi5rmaa35YNUz'); */
+ -
+ this.authService.userData$.subscribe((res:any)=>{
this.headers = this.headers.set('X-User-Id', res.userId);
this.headers = this.headers.set('X-Auth-Token', res.authToken);
- }); */
+ });
this.options = {
headers: this.headers,
};
}
+ /* getUser(){
+ this.storage.get('user').then((val) => {
+ let user = JSON.parse(unescape(atob(val))).data;
+
+ this.headers = this.headers.set('X-User-Id', user.userId);
+ this.headers = this.headers.set('X-Auth-Token', user.authToken);
+
+ this.options1 = {
+ headers: this.headers,
+ };
+ console.log(this.options1);
+
+ this.http.get(environment.apiChatUrl+'users.presence', this.options1).subscribe(res => {
+ console.log(res);
+ });
+
+ });
+ } */
+ getAllDirectMessages(){
+ return this.http.get(environment.apiChatUrl+'im.list', this.options);
+ }
+ getAllChannels(){
+ return this.http.get(environment.apiChatUrl+'channels.list', this.options);
+ }
+ getAllUserChannels(){
+ return this.http.get(environment.apiChatUrl+'channels.list.joined', this.options);
+ }
+
+ getAllRooms(){
+ return this.http.get(environment.apiChatUrl+'rooms.get', this.options);
+ }
+ getAllPrivateGroups(){
+ return this.http.get(environment.apiChatUrl+'groups.list', this.options);
+ }
+
getAllUsers(){
- console.log(this.headers);
return this.http.get(environment.apiChatUrl+'users.list', this.options);
}
getAllConnectedUsers(){
return this.http.get(environment.apiChatUrl+'users.presence', this.options);
}
- getAllPrivateGroups(){
- return this.http.get(environment.apiChatUrl+'groups.list', this.options);
+ //Check whether user is online or offline
+ getUserPresence(id:any){
+
+ let params = new HttpParams();
+ params = params.set("userId", id);
+
+ let opts = {
+ headers: this.headers,
+ params: params
+ }
+ return this.http.get(environment.apiChatUrl+'users.getPresence', opts);
}
+
+ //Load messages from roomId
+ loadJoinedRooms(){
+ return this.http.get(environment.apiChatUrl+'im.list', this.options);
+ }
+
+ //Load messages from roomId
+ getRoomMessages(roomId:any){
+
+ let params = new HttpParams();
+ params = params.set("roomId", roomId);
+
+ let opts = {
+ headers: this.headers,
+ params: params
+ }
+ return this.http.get(environment.apiChatUrl+'im.history', opts);
+ }
+
+ sendMessage(body:any){
+ let opts = {
+ headers: this.headers,
+ }
+ return this.http.post(environment.apiChatUrl+'chat.sendMessage', body, opts);
+ }
+ //Load members from a chat
+ getMembers(roomId:any){
+
+ let params = new HttpParams();
+ params = params.set("roomId", roomId);
+
+ let opts = {
+ headers: this.headers,
+ params: params
+ }
+ return this.http.get(environment.apiChatUrl+'im.members', opts);
+ }
+ removeChatRoom(body:any){
+ let opts = {
+ headers: this.headers,
+ }
+ return this.http.post(environment.apiChatUrl+'im.close', body, this.options);
+ }
+ createRoom(body:any){
+ return this.http.post(environment.apiChatUrl+'im.create', body, this.options);
+ }
+ getDirectMessage(roomId:string){
+ let params = new HttpParams();
+ params = params.set("roomId", roomId);
+
+ let opts = {
+ headers: this.headers,
+ params: params
+ }
+ return this.http.get(environment.apiChatUrl+'im.messages', opts);
+ }
+
}
diff --git a/src/app/services/storage.service.ts b/src/app/services/storage.service.ts
index 9650edd7b..d47dacad2 100644
--- a/src/app/services/storage.service.ts
+++ b/src/app/services/storage.service.ts
@@ -1,37 +1,33 @@
import { Injectable } from '@angular/core';
-import { Storage } from '@ionic/storage';
-import { AuthConnstants } from '../config/auth-constants';
+import { Plugins } from '@capacitor/core';
+const { Storage } = Plugins;
@Injectable({
providedIn: 'root'
})
export class StorageService {
- user: any = "Max";
- storageKey = "user";
- constructor(private storage: Storage) {}
+ constructor() {}
- // set a key/value2
- store(user:any){
- const encryptedValue = btoa(escape(JSON.stringify(user)));
- this.storage.set(AuthConnstants.AUTH, encryptedValue);
+ // Store the value
+ async store(storageKey: string, value: any) {
+ const encryptedValue = btoa(escape(JSON.stringify(value)));
+ await Storage.set({
+ key: storageKey,
+ value: encryptedValue
+ });
}
-
- // Or to get a key/value pair
- get(key:any){
- let user = this.storage.get(key).then((val) => {
- console.log(JSON.parse(unescape(atob(val))).data);
- return JSON.parse(unescape(atob(val))).data;
- });
- return user;
+ // Get the value
+ async get(storageKey: string) {
+ const ret = await Storage.get({ key: storageKey });
+ return JSON.parse(unescape(atob(ret.value)));
}
-
- /* async removeStorageItem(storageKey: string) {
- await this.storage.remove({ key: storageKey });
- } */
+ async removeStorageItem(storageKey: string) {
+ await Storage.remove({ key: storageKey });
+ }
// Clear storage
async clear() {
- await this.storage.clear();
+ await Storage.clear();
}
}
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover-routing.module.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover-routing.module.ts
new file mode 100644
index 000000000..8e189ed7f
--- /dev/null
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ChatOptionsPopoverPage } from './chat-options-popover.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: ChatOptionsPopoverPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class ChatOptionsPopoverPageRoutingModule {}
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.module.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.module.ts
new file mode 100644
index 000000000..d6e7129d9
--- /dev/null
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ChatOptionsPopoverPageRoutingModule } from './chat-options-popover-routing.module';
+
+import { ChatOptionsPopoverPage } from './chat-options-popover.page';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ ChatOptionsPopoverPageRoutingModule
+ ],
+ declarations: [ChatOptionsPopoverPage]
+})
+export class ChatOptionsPopoverPageModule {}
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
new file mode 100644
index 000000000..ebd9a9c01
--- /dev/null
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss
new file mode 100644
index 000000000..1e44f4b3d
--- /dev/null
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss
@@ -0,0 +1,32 @@
+ion-row{
+ padding: 10px 10px 5px 10px;
+}
+.border-top{
+ padding-top: 5px !important;
+ border-top: 1px solid #ebebeb;
+}
+/* ion-col{
+ border: 1px solid red;
+} */
+.btn-cancel{
+ display: block;
+ width: 170px !important;
+ height: 45px !important;
+ border-radius: 22.5px;
+ background-color: #e0e9ee;
+ --color: #061b52 !important;
+ --background:transparent;
+ --box-shadow: none;
+ margin: 0 auto !important;
+ }
+
+.btn-ok{
+ display: block;
+ width: 170px !important;
+ height: 45px !important;
+ border-radius: 22.5px;
+ --background: #42b9fe;
+ --color: #ffffff !important;
+ margin: 0 auto !important;
+
+ }
\ No newline at end of file
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.spec.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.spec.ts
new file mode 100644
index 000000000..a720defb5
--- /dev/null
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ChatOptionsPopoverPage } from './chat-options-popover.page';
+
+describe('ChatOptionsPopoverPage', () => {
+ let component: ChatOptionsPopoverPage;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ChatOptionsPopoverPage ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(ChatOptionsPopoverPage);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
new file mode 100644
index 000000000..283b273a0
--- /dev/null
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
@@ -0,0 +1,22 @@
+import { Component, OnInit } from '@angular/core';
+import { PopoverController } from '@ionic/angular';
+
+@Component({
+ selector: 'app-chat-options-popover',
+ templateUrl: './chat-options-popover.page.html',
+ styleUrls: ['./chat-options-popover.page.scss'],
+})
+export class ChatOptionsPopoverPage implements OnInit {
+
+ constructor(
+ private popoverController: PopoverController
+ ) { }
+
+ ngOnInit() {
+ }
+
+ close(){
+ this.popoverController.dismiss();
+ }
+
+}
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html
index 69938a705..93794cd0d 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.html
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.html
@@ -1,16 +1,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.scss b/src/app/shared/popover/chat-popover/chat-popover.page.scss
index cb6972c78..0171ad1d0 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.scss
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.scss
@@ -1,49 +1,15 @@
-.buttons{
- overflow: auto;
- padding-top: 10px;
- padding-bottom: 10px;
+ion-row{
+ padding: 10px 10px 5px 10px;
}
-.btn-item{
- padding: 2px;
- margin: 10px 20px 10px 20px !important;
- overflow: auto;
+.border-top{
+ padding-top: 5px !important;
+ border-top: 1px solid #ebebeb;
}
-.btn-ok, .btn-cancel, .btn-delete{
+/* ion-col{
+ border: 1px solid red;
+} */
+
+/* .btn-ok, .btn-cancel, .btn-delete{
font-size: 13px;
padding:0 !important;
-}
-hr.solid {
- width: 360px;
- border-top: 1px solid #ebebeb;
- }
-.btn-ok{
- display: block;
- width: 170px !important;
- height: 45px !important;
- border-radius: 22.5px;
- /* right: 20px !important; */
- --background: #42b9fe;
- --color: #ffffff !important;
- float: left;
- }
- .btn-cancel{
- width: 170px !important;
- height: 45px !important;
- border-radius: 22.5px;
- background-color: #e0e9ee;
- --color: #061b52 !important;
- --background:transparent;
- --box-shadow: none;
- float: right;
-
- }
- .btn-delete{
- width: 170px !important;
- height: 45px !important;;
- border-radius: 22.5px;
- --background: #ffe0e0;
- --color: #d30a0a !important;
- --padding-start:0 !important;
- --padding-end:0 !important;
- float: left;
- }
\ No newline at end of file
+} */
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts
index 3e18c59fb..07c0841ee 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts
@@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core';
+import { PopoverController } from '@ionic/angular';
@Component({
selector: 'app-chat-popover',
@@ -7,9 +8,14 @@ import { Component, OnInit } from '@angular/core';
})
export class ChatPopoverPage implements OnInit {
- constructor() { }
+ constructor(
+ private popoverController: PopoverController,
+ ) { }
ngOnInit() {
}
+ close(){
+ this.popoverController.dismiss();
+ }
}
diff --git a/src/app/shared/popover/group-duration/group-duration-routing.module.ts b/src/app/shared/popover/group-duration/group-duration-routing.module.ts
new file mode 100644
index 000000000..fe80d4118
--- /dev/null
+++ b/src/app/shared/popover/group-duration/group-duration-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { GroupDurationPage } from './group-duration.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: GroupDurationPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class GroupDurationPageRoutingModule {}
diff --git a/src/app/shared/popover/group-duration/group-duration.module.ts b/src/app/shared/popover/group-duration/group-duration.module.ts
new file mode 100644
index 000000000..eb4dd1468
--- /dev/null
+++ b/src/app/shared/popover/group-duration/group-duration.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { GroupDurationPageRoutingModule } from './group-duration-routing.module';
+
+import { GroupDurationPage } from './group-duration.page';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ GroupDurationPageRoutingModule
+ ],
+ declarations: [GroupDurationPage]
+})
+export class GroupDurationPageModule {}
diff --git a/src/app/shared/popover/group-duration/group-duration.page.html b/src/app/shared/popover/group-duration/group-duration.page.html
new file mode 100644
index 000000000..768a33230
--- /dev/null
+++ b/src/app/shared/popover/group-duration/group-duration.page.html
@@ -0,0 +1,19 @@
+
+
diff --git a/src/app/shared/popover/group-duration/group-duration.page.scss b/src/app/shared/popover/group-duration/group-duration.page.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/shared/popover/group-duration/group-duration.page.spec.ts b/src/app/shared/popover/group-duration/group-duration.page.spec.ts
new file mode 100644
index 000000000..ba52f3ffa
--- /dev/null
+++ b/src/app/shared/popover/group-duration/group-duration.page.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { GroupDurationPage } from './group-duration.page';
+
+describe('GroupDurationPage', () => {
+ let component: GroupDurationPage;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ GroupDurationPage ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(GroupDurationPage);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/shared/popover/group-duration/group-duration.page.ts b/src/app/shared/popover/group-duration/group-duration.page.ts
new file mode 100644
index 000000000..7e095ff05
--- /dev/null
+++ b/src/app/shared/popover/group-duration/group-duration.page.ts
@@ -0,0 +1,21 @@
+import { Component, OnInit } from '@angular/core';
+import { PopoverController } from '@ionic/angular';
+
+@Component({
+ selector: 'app-group-duration',
+ templateUrl: './group-duration.page.html',
+ styleUrls: ['./group-duration.page.scss'],
+})
+export class GroupDurationPage implements OnInit {
+
+ constructor(
+ public popoverController: PopoverController,
+ ) { }
+
+ ngOnInit() {
+ }
+ close(){
+ this.popoverController.dismiss();
+ }
+
+}
diff --git a/src/app/shared/popover/messages-options/messages-options-routing.module.ts b/src/app/shared/popover/messages-options/messages-options-routing.module.ts
new file mode 100644
index 000000000..1ae2ef283
--- /dev/null
+++ b/src/app/shared/popover/messages-options/messages-options-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { MessagesOptionsPage } from './messages-options.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: MessagesOptionsPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class MessagesOptionsPageRoutingModule {}
diff --git a/src/app/shared/popover/messages-options/messages-options.module.ts b/src/app/shared/popover/messages-options/messages-options.module.ts
new file mode 100644
index 000000000..da09a957d
--- /dev/null
+++ b/src/app/shared/popover/messages-options/messages-options.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { MessagesOptionsPageRoutingModule } from './messages-options-routing.module';
+
+import { MessagesOptionsPage } from './messages-options.page';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ MessagesOptionsPageRoutingModule
+ ],
+ declarations: [MessagesOptionsPage]
+})
+export class MessagesOptionsPageModule {}
diff --git a/src/app/shared/popover/messages-options/messages-options.page.html b/src/app/shared/popover/messages-options/messages-options.page.html
new file mode 100644
index 000000000..be9bcf347
--- /dev/null
+++ b/src/app/shared/popover/messages-options/messages-options.page.html
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/shared/popover/messages-options/messages-options.page.scss b/src/app/shared/popover/messages-options/messages-options.page.scss
new file mode 100644
index 000000000..63122bda8
--- /dev/null
+++ b/src/app/shared/popover/messages-options/messages-options.page.scss
@@ -0,0 +1,3 @@
+ion-row{
+ padding: 10px 10px 5px 10px;
+}
\ No newline at end of file
diff --git a/src/app/shared/popover/messages-options/messages-options.page.spec.ts b/src/app/shared/popover/messages-options/messages-options.page.spec.ts
new file mode 100644
index 000000000..f81205230
--- /dev/null
+++ b/src/app/shared/popover/messages-options/messages-options.page.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { MessagesOptionsPage } from './messages-options.page';
+
+describe('MessagesOptionsPage', () => {
+ let component: MessagesOptionsPage;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ MessagesOptionsPage ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(MessagesOptionsPage);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/shared/popover/messages-options/messages-options.page.ts b/src/app/shared/popover/messages-options/messages-options.page.ts
new file mode 100644
index 000000000..98ac52044
--- /dev/null
+++ b/src/app/shared/popover/messages-options/messages-options.page.ts
@@ -0,0 +1,38 @@
+import { Component, OnInit } from '@angular/core';
+import { NavParams, PopoverController } from '@ionic/angular';
+import { ChatService } from 'src/app/services/chat.service';
+
+@Component({
+ selector: 'app-messages-options',
+ templateUrl: './messages-options.page.html',
+ styleUrls: ['./messages-options.page.scss'],
+})
+export class MessagesOptionsPage implements OnInit {
+
+ roomId:string;
+
+ constructor(
+ private popoverController: PopoverController,
+ private chatService: ChatService,
+ private navParams: NavParams,
+ )
+ {
+ this.roomId = this.navParams.get('roomId');
+ }
+
+ ngOnInit() {
+ }
+
+ close(){
+ this.popoverController.dismiss();
+ }
+
+ closeChatRoom(){
+ let body = { "roomId": this.roomId }
+ this.chatService.removeChatRoom(body).subscribe(res=>{
+ console.log(res);
+ });
+ this.close();
+ }
+
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 981845628..5af0817a6 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -19,14 +19,12 @@ import { ChatPopoverPage } from './popover/chat-popover/chat-popover.page';
HeaderPrPage,
BtnSeguintePage,
BtnModalDismissPage,
- ChatPopoverPage,
],
entryComponents:[],
declarations: [HeaderPage,
HeaderPrPage,
BtnSeguintePage,
BtnModalDismissPage,
- ChatPopoverPage,
]
})
export class SharedModule {}
\ No newline at end of file
diff --git a/src/assets/icon/icons-chat-mic.svg b/src/assets/icon/icons-chat-mic.svg
new file mode 100644
index 000000000..6ee4201ff
--- /dev/null
+++ b/src/assets/icon/icons-chat-mic.svg
@@ -0,0 +1,17 @@
+
diff --git a/src/assets/icon/icons-chat-options.svg b/src/assets/icon/icons-chat-options.svg
new file mode 100644
index 000000000..0823c7065
--- /dev/null
+++ b/src/assets/icon/icons-chat-options.svg
@@ -0,0 +1,16 @@
+
diff --git a/src/assets/images/icons-chat-send.svg b/src/assets/icon/icons-chat-send.svg
similarity index 100%
rename from src/assets/images/icons-chat-send.svg
rename to src/assets/icon/icons-chat-send.svg
diff --git a/src/assets/icon/icons-user.svg b/src/assets/icon/icons-user.svg
new file mode 100644
index 000000000..74a4a034b
--- /dev/null
+++ b/src/assets/icon/icons-user.svg
@@ -0,0 +1,16 @@
+
diff --git a/src/assets/images/icons-chat-contacts-list.svg b/src/assets/images/icons-chat-contacts-list.svg
new file mode 100644
index 000000000..74a4a034b
--- /dev/null
+++ b/src/assets/images/icons-chat-contacts-list.svg
@@ -0,0 +1,16 @@
+
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 640e53a5a..74da63bde 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,7 +1,7 @@
export const environment = {
production: true,
apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/v1/api/',
- apiChatUrl: 'http://192.168.100.111:3000/api/v1/',
+ apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
domain: 'gabinetedigital.local',
defaultuser: '',
defaultuserpwd: ''
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 4b92544cb..8792937f1 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -5,7 +5,7 @@
export const environment = {
production: false,
apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/',
- apiChatUrl: 'http://192.168.100.111:3000/api/v1/',
+ apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
domain: 'gabinetedigital.local',
defaultuser: 'paulo.pinto',
defaultuserpwd: 'tabteste@006'
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 877420d58..6e7fc3d46 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -264,7 +264,7 @@
background: rgba(51, 51, 51, 0.3);
}
.newchat, .new-group, .contacts, .group-messages, .custom-modal{
- padding-top: 73px;
+ padding-top: 93px;
--border-radius: 25px 25px 0 0;
--border-width:0px;
}
@@ -281,6 +281,33 @@
max-height: 160px;
min-height: 160px;
}
+.messages-options .popover-content{
+ width: 100% !important;
+ left: 0 !important;
+ bottom: 0 !important;
+ right: 0 !important;
+ top: calc(100% - 90px) !important;
+ max-height: 90px;
+ min-height: 90px;
+}
+.chat-options-popover .popover-content{
+ width: 100% !important;
+ left: 0 !important;
+ bottom: 0 !important;
+ right: 0 !important;
+ top: calc(100% - 210px) !important;
+ max-height: 210px;
+ min-height: 210px;
+}
+.group-duration .popover-content{
+ width: 100% !important;
+ left: 0 !important;
+ bottom: 0 !important;
+ right: 0 !important;
+ top: calc(100% - 500px) !important;
+ max-height: 500px;
+ min-height: 500px;
+}
/* .event-actions-popover ion-list{
} */
@@ -381,10 +408,10 @@
--background: #fff;
}
.btn-ok{
- width: 160px !important;
+ width: 170px !important;
height: 45px !important;
- margin: 0 auto;
- padding: 10px 15px;
+ margin: 0 auto !important;
+ padding:0 !important;
border-radius: 22.5px;
background-color: #42b9fe;
color: #ffffff !important;
@@ -398,22 +425,24 @@
color: #ffffff !important;
}
.btn-delete{
+ display: block;
width: 170px !important;
height: 45px !important;
- margin: 0 auto;
+ margin: 0 auto !important;
padding:0 !important;
border-radius: 22.5px;
background-color: #ffe0e0;
color: #d30a0a !important;
}
.btn-cancel{
- width: 160px !important;
+ display: block;
+ width: 170px !important;
height: 45px !important;
- margin: 0 auto;
padding:0 !important;
border-radius: 22.5px;
background-color: #e0e9ee;
color: #061b52 !important;
+ margin: 0 auto !important;
}
.bg-blue{
--background:#0782c9;
-
-
+
-
-
-
-
+
+
+ Duração
+
+
+
+
+
+