diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 8d9efe98a..3dd13aae4 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -15,6 +15,14 @@ const routes: Routes = [
path: 'empty-chat',
loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule)
},
+ {
+ path: 'btn-criar',
+ loadChildren: () => import('./shared/buttons/btn-criar/btn-criar.module').then( m => m.BtnCriarPageModule)
+ },
+ {
+ path: 'btn-adicionar',
+ loadChildren: () => import('./shared/buttons/btn-adicionar/btn-adicionar.module').then( m => m.BtnAdicionarPageModule)
+ },
/* {
path: 'chat',
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index be3fe5977..d05ced47c 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -10,7 +10,7 @@
-
+
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss
index 609d7e864..8c5e7498a 100644
--- a/src/app/pages/chat/chat.page.scss
+++ b/src/app/pages/chat/chat.page.scss
@@ -8,7 +8,6 @@ ion-content{
.title-content{
width: 100%;
margin-bottom: 15px;
- overflow: auto;
padding: 0 !important;
background: #fff;
@@ -44,7 +43,6 @@ ion-content{
overflow: auto;
.aside-wrapper{
- border: 1px solid red;
padding: 0 !important;
margin: 0 !important;
}
diff --git a/src/app/shared/btn-seguinte/btn-seguinte.page.html b/src/app/shared/btn-seguinte/btn-seguinte.page.html
index 2ecf0814d..526d8f40c 100644
--- a/src/app/shared/btn-seguinte/btn-seguinte.page.html
+++ b/src/app/shared/btn-seguinte/btn-seguinte.page.html
@@ -1,3 +1,3 @@
Seguinte
-
+
\ No newline at end of file
diff --git a/src/app/shared/btn-seguinte/btn-seguinte.page.scss b/src/app/shared/btn-seguinte/btn-seguinte.page.scss
index fef7141e5..bc35e6d03 100644
--- a/src/app/shared/btn-seguinte/btn-seguinte.page.scss
+++ b/src/app/shared/btn-seguinte/btn-seguinte.page.scss
@@ -1,7 +1,7 @@
.right{
- padding: 0!important;
- float: right;
- font-size: 15px;
- color: #0782c9;
- margin: 8px 0 0 5px;
- }
\ No newline at end of file
+ padding: 0!important;
+ float: right;
+ font-size: 15px;
+ color: #0782c9;
+ margin: 8px 0 0 5px;
+}
\ No newline at end of file
diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar-routing.module.ts b/src/app/shared/buttons/btn-adicionar/btn-adicionar-routing.module.ts
new file mode 100644
index 000000000..b6f074394
--- /dev/null
+++ b/src/app/shared/buttons/btn-adicionar/btn-adicionar-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { BtnAdicionarPage } from './btn-adicionar.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: BtnAdicionarPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class BtnAdicionarPageRoutingModule {}
diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts b/src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts
new file mode 100644
index 000000000..42e7d2a67
--- /dev/null
+++ b/src/app/shared/buttons/btn-adicionar/btn-adicionar.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 { BtnAdicionarPageRoutingModule } from './btn-adicionar-routing.module';
+
+import { BtnAdicionarPage } from './btn-adicionar.page';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ BtnAdicionarPageRoutingModule
+ ],
+ declarations: [BtnAdicionarPage]
+})
+export class BtnAdicionarPageModule {}
diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.html b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.html
new file mode 100644
index 000000000..e53e30f5d
--- /dev/null
+++ b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.html
@@ -0,0 +1,3 @@
+
+ Adicionar
+
diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.scss b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.scss
new file mode 100644
index 000000000..b7b93819b
--- /dev/null
+++ b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.scss
@@ -0,0 +1,7 @@
+.right{
+ padding: 0!important;
+ float: right;
+ font-size: 15px;
+ color: #0782c9;
+ margin: 8px 5px 0 5px;
+ }
\ No newline at end of file
diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.spec.ts b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.spec.ts
new file mode 100644
index 000000000..43026a2ac
--- /dev/null
+++ b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { BtnAdicionarPage } from './btn-adicionar.page';
+
+describe('BtnAdicionarPage', () => {
+ let component: BtnAdicionarPage;
+ let fixture: ComponentFixture
;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ BtnAdicionarPage ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BtnAdicionarPage);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.ts b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.ts
new file mode 100644
index 000000000..55d0d768f
--- /dev/null
+++ b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-btn-adicionar',
+ templateUrl: './btn-adicionar.page.html',
+ styleUrls: ['./btn-adicionar.page.scss'],
+})
+export class BtnAdicionarPage implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/shared/buttons/btn-criar/btn-criar-routing.module.ts b/src/app/shared/buttons/btn-criar/btn-criar-routing.module.ts
new file mode 100644
index 000000000..83df1196f
--- /dev/null
+++ b/src/app/shared/buttons/btn-criar/btn-criar-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { BtnCriarPage } from './btn-criar.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: BtnCriarPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class BtnCriarPageRoutingModule {}
diff --git a/src/app/shared/buttons/btn-criar/btn-criar.module.ts b/src/app/shared/buttons/btn-criar/btn-criar.module.ts
new file mode 100644
index 000000000..311f914d5
--- /dev/null
+++ b/src/app/shared/buttons/btn-criar/btn-criar.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 { BtnCriarPageRoutingModule } from './btn-criar-routing.module';
+
+import { BtnCriarPage } from './btn-criar.page';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ BtnCriarPageRoutingModule
+ ],
+ declarations: [BtnCriarPage]
+})
+export class BtnCriarPageModule {}
diff --git a/src/app/shared/buttons/btn-criar/btn-criar.page.html b/src/app/shared/buttons/btn-criar/btn-criar.page.html
new file mode 100644
index 000000000..cf6ccee57
--- /dev/null
+++ b/src/app/shared/buttons/btn-criar/btn-criar.page.html
@@ -0,0 +1,3 @@
+
+ Criar grupo
+
diff --git a/src/app/shared/buttons/btn-criar/btn-criar.page.scss b/src/app/shared/buttons/btn-criar/btn-criar.page.scss
new file mode 100644
index 000000000..b7b93819b
--- /dev/null
+++ b/src/app/shared/buttons/btn-criar/btn-criar.page.scss
@@ -0,0 +1,7 @@
+.right{
+ padding: 0!important;
+ float: right;
+ font-size: 15px;
+ color: #0782c9;
+ margin: 8px 5px 0 5px;
+ }
\ No newline at end of file
diff --git a/src/app/shared/buttons/btn-criar/btn-criar.page.spec.ts b/src/app/shared/buttons/btn-criar/btn-criar.page.spec.ts
new file mode 100644
index 000000000..ce36f9653
--- /dev/null
+++ b/src/app/shared/buttons/btn-criar/btn-criar.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { BtnCriarPage } from './btn-criar.page';
+
+describe('BtnCriarPage', () => {
+ let component: BtnCriarPage;
+ let fixture: ComponentFixture;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ BtnCriarPage ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BtnCriarPage);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/shared/buttons/btn-criar/btn-criar.page.ts b/src/app/shared/buttons/btn-criar/btn-criar.page.ts
new file mode 100644
index 000000000..6afea0c23
--- /dev/null
+++ b/src/app/shared/buttons/btn-criar/btn-criar.page.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-btn-criar',
+ templateUrl: './btn-criar.page.html',
+ styleUrls: ['./btn-criar.page.scss'],
+})
+export class BtnCriarPage implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
index 7653713b6..a2ae1f8b7 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
@@ -3,12 +3,12 @@
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
index ae7e9eb29..8c2c6dea7 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -70,6 +70,11 @@ export class GroupContactsPage implements OnInit {
this.openGroupMessage.emit(this.room._id)
});
}
+ openGroupMessagesPage(){
+ this.showLoader = true;
+ this.openGroupMessage.emit(this.roomId)
+ this.showLoader = false;
+ }
loadUsers(){
this.options = {
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 437f8909d..262a9813f 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -9,7 +9,7 @@
-
@@ -16,7 +16,7 @@
+
Grupo Ultra-secreto
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 7924c965b..3b01186fc 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -9,6 +9,8 @@ import { BtnModalDismissPage } from './btn-modal-dismiss/btn-modal-dismiss.page'
import { ChatPopoverPage } from './popover/chat-popover/chat-popover.page';
import { HeaderNoSearchPage } from './headers/header-no-search/header-no-search.page';
import { EmptyChatPage } from './chat/empty-chat/empty-chat.page';
+import { BtnCriarPage } from './buttons/btn-criar/btn-criar.page';
+import { BtnAdicionarPage } from './buttons/btn-adicionar/btn-adicionar.page';
@NgModule({
imports: [
@@ -23,6 +25,8 @@ import { EmptyChatPage } from './chat/empty-chat/empty-chat.page';
BtnSeguintePage,
BtnModalDismissPage,
EmptyChatPage,
+ BtnCriarPage,
+ BtnAdicionarPage,
],
entryComponents:[],
declarations: [
@@ -32,6 +36,8 @@ import { EmptyChatPage } from './chat/empty-chat/empty-chat.page';
BtnSeguintePage,
BtnModalDismissPage,
EmptyChatPage,
+ BtnCriarPage,
+ BtnAdicionarPage,
]
})
export class SharedModule {}
\ No newline at end of file