diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 3a0c83fff..564618489 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -16,14 +16,6 @@ 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: 'empty-container',
loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule)
diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts
index 35ad22a3d..742903dc0 100644
--- a/src/app/components/components.module.ts
+++ b/src/app/components/components.module.ts
@@ -3,8 +3,6 @@ import { CommonModule } from '@angular/common';
import { BtnSeguintePage } from '../shared/btn-seguinte/btn-seguinte.page';
import { BtnModalDismissPage } from '../shared/btn-modal-dismiss/btn-modal-dismiss.page';
import { EmptyChatPage } from '../shared/chat/empty-chat/empty-chat.page';
-import { BtnCriarPage } from '../shared/buttons/btn-criar/btn-criar.page';
-import { BtnAdicionarPage } from '../shared/buttons/btn-adicionar/btn-adicionar.page';
import { NewEventPage } from '../shared/agenda/new-event/new-event.page';
import { EditEventPage } from '../shared/agenda/edit-event/edit-event.page';
import { ViewEventPage } from '../shared/agenda/view-event/view-event.page';
@@ -15,10 +13,8 @@ import { AttendeesPage } from '../shared/event/attendees/attendees.page';
@NgModule({
declarations: [
- BtnSeguintePage,
+ /* BtnSeguintePage, */
BtnModalDismissPage,
- BtnCriarPage,
- BtnAdicionarPage,
//NewEventPage,
//EditEventPage,
@@ -34,10 +30,8 @@ import { AttendeesPage } from '../shared/event/attendees/attendees.page';
],
exports: [
- BtnSeguintePage,
+ /* BtnSeguintePage, */
BtnModalDismissPage,
- BtnCriarPage,
- BtnAdicionarPage,
//NewEventPage,
//EditEventPage,
diff --git a/src/app/pages/chat/edit-group/edit-group.module.ts b/src/app/pages/chat/edit-group/edit-group.module.ts
index ba9c5fb3a..76bd8d362 100644
--- a/src/app/pages/chat/edit-group/edit-group.module.ts
+++ b/src/app/pages/chat/edit-group/edit-group.module.ts
@@ -9,6 +9,7 @@ import { EditGroupPageRoutingModule } from './edit-group-routing.module';
import { EditGroupPage } from './edit-group.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
+import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
@NgModule({
imports: [
@@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module';
FormsModule,
IonicModule,
ComponentsModule,
- EditGroupPageRoutingModule
+ EditGroupPageRoutingModule,
+ BtnSeguintePageModule,
],
declarations: [EditGroupPage]
})
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
index 589bc4509..e993e9da3 100644
--- 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
@@ -10,6 +10,7 @@ import { GroupContactsPage } from './group-contacts.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { PipesModule } from 'src/app/pipes/pipes.module';
import { ComponentsModule } from 'src/app/components/components.module';
+import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
@NgModule({
imports: [
@@ -18,7 +19,8 @@ import { ComponentsModule } from 'src/app/components/components.module';
IonicModule,
ComponentsModule,
PipesModule,
- GroupContactsPageRoutingModule
+ GroupContactsPageRoutingModule,
+ BtnSeguintePageModule,
],
declarations: [GroupContactsPage]
})
diff --git a/src/app/pages/chat/new-group/contacts/contacts.module.ts b/src/app/pages/chat/new-group/contacts/contacts.module.ts
index 92557bb61..942581b58 100644
--- a/src/app/pages/chat/new-group/contacts/contacts.module.ts
+++ b/src/app/pages/chat/new-group/contacts/contacts.module.ts
@@ -9,6 +9,7 @@ import { ContactsPageRoutingModule } from './contacts-routing.module';
import { ContactsPage } from './contacts.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
+import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
@NgModule({
imports: [
@@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module';
FormsModule,
IonicModule,
ComponentsModule,
- ContactsPageRoutingModule
+ ContactsPageRoutingModule,
+ BtnSeguintePageModule,
],
declarations: [ContactsPage]
})
diff --git a/src/app/pages/chat/new-group/group-chat/group-chat.module.ts b/src/app/pages/chat/new-group/group-chat/group-chat.module.ts
index e976a36ec..898b546d6 100644
--- a/src/app/pages/chat/new-group/group-chat/group-chat.module.ts
+++ b/src/app/pages/chat/new-group/group-chat/group-chat.module.ts
@@ -9,6 +9,7 @@ import { GroupChatPageRoutingModule } from './group-chat-routing.module';
import { GroupChatPage } from './group-chat.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
+import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
@NgModule({
imports: [
@@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module';
FormsModule,
IonicModule,
ComponentsModule,
- GroupChatPageRoutingModule
+ GroupChatPageRoutingModule,
+ BtnSeguintePageModule,
],
declarations: [GroupChatPage]
})
diff --git a/src/app/pages/chat/new-group/new-group.module.ts b/src/app/pages/chat/new-group/new-group.module.ts
index c72df1781..f96c28444 100644
--- a/src/app/pages/chat/new-group/new-group.module.ts
+++ b/src/app/pages/chat/new-group/new-group.module.ts
@@ -9,6 +9,7 @@ import { NewGroupPageRoutingModule } from './new-group-routing.module';
import { NewGroupPage } from './new-group.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
+import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
@NgModule({
imports: [
@@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module';
FormsModule,
IonicModule,
ComponentsModule,
- NewGroupPageRoutingModule
+ NewGroupPageRoutingModule,
+ BtnSeguintePageModule,
],
declarations: [NewGroupPage]
})
diff --git a/src/app/shared/btn-seguinte/btn-seguinte.module.ts b/src/app/shared/btn-seguinte/btn-seguinte.module.ts
index 05ced1168..8bcb566c7 100644
--- a/src/app/shared/btn-seguinte/btn-seguinte.module.ts
+++ b/src/app/shared/btn-seguinte/btn-seguinte.module.ts
@@ -15,6 +15,7 @@ import { BtnSeguintePage } from './btn-seguinte.page';
IonicModule,
BtnSeguintePageRoutingModule
],
- declarations: []
+ exports: [BtnSeguintePage],
+ declarations: [BtnSeguintePage]
})
export class BtnSeguintePageModule {}
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
deleted file mode 100644
index b6f074394..000000000
--- a/src/app/shared/buttons/btn-adicionar/btn-adicionar-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index 70ea0e341..000000000
--- a/src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-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: []
-})
-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
deleted file mode 100644
index e53e30f5d..000000000
--- a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 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
deleted file mode 100644
index b7b93819b..000000000
--- a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.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
deleted file mode 100644
index 43026a2ac..000000000
--- a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 55d0d768f..000000000
--- a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 83df1196f..000000000
--- a/src/app/shared/buttons/btn-criar/btn-criar-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index b6a7b77d7..000000000
--- a/src/app/shared/buttons/btn-criar/btn-criar.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-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: []
-})
-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
deleted file mode 100644
index cf6ccee57..000000000
--- a/src/app/shared/buttons/btn-criar/btn-criar.page.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 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
deleted file mode 100644
index b7b93819b..000000000
--- a/src/app/shared/buttons/btn-criar/btn-criar.page.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.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
deleted file mode 100644
index ce36f9653..000000000
--- a/src/app/shared/buttons/btn-criar/btn-criar.page.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 6afea0c23..000000000
--- a/src/app/shared/buttons/btn-criar/btn-criar.page.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-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/edit-group/edit-group.module.ts b/src/app/shared/chat/edit-group/edit-group.module.ts
index fcd33821f..62da945f7 100644
--- a/src/app/shared/chat/edit-group/edit-group.module.ts
+++ b/src/app/shared/chat/edit-group/edit-group.module.ts
@@ -9,6 +9,7 @@ import { EditGroupPageRoutingModule } from './edit-group-routing.module';
import { EditGroupPage } from './edit-group.page';
import { SharedModule } from '../../shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
+import { BtnSeguintePageModule } from '../../btn-seguinte/btn-seguinte.module';
@NgModule({
imports: [
@@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module';
FormsModule,
IonicModule,
ComponentsModule,
- EditGroupPageRoutingModule
+ EditGroupPageRoutingModule,
+ BtnSeguintePageModule,
],
exports: [EditGroupPage],
declarations: [EditGroupPage]
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 ae052752e..4cc223766 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
@@ -10,7 +10,11 @@
Contactos
-
+
+
+
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss
index a2f88e2f3..b28c08b5b 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss
@@ -41,6 +41,13 @@
float: left;
margin: 2.5px 0 0 5px;
}
+ .adicionar{
+ padding: 0!important;
+ float: right;
+ font-size: 15px;
+ color: #0782c9;
+ margin: 8px 5px 0 5px;
+ }
.title{
font-size: 25px;
}
diff --git a/src/app/shared/chat/new-group/contacts/contacts.module.ts b/src/app/shared/chat/new-group/contacts/contacts.module.ts
index 92557bb61..942581b58 100644
--- a/src/app/shared/chat/new-group/contacts/contacts.module.ts
+++ b/src/app/shared/chat/new-group/contacts/contacts.module.ts
@@ -9,6 +9,7 @@ import { ContactsPageRoutingModule } from './contacts-routing.module';
import { ContactsPage } from './contacts.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
+import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
@NgModule({
imports: [
@@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module';
FormsModule,
IonicModule,
ComponentsModule,
- ContactsPageRoutingModule
+ ContactsPageRoutingModule,
+ BtnSeguintePageModule,
],
declarations: [ContactsPage]
})
diff --git a/src/app/shared/chat/new-group/group-chat/group-chat.module.ts b/src/app/shared/chat/new-group/group-chat/group-chat.module.ts
index e976a36ec..898b546d6 100644
--- a/src/app/shared/chat/new-group/group-chat/group-chat.module.ts
+++ b/src/app/shared/chat/new-group/group-chat/group-chat.module.ts
@@ -9,6 +9,7 @@ import { GroupChatPageRoutingModule } from './group-chat-routing.module';
import { GroupChatPage } from './group-chat.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
+import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
@NgModule({
imports: [
@@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module';
FormsModule,
IonicModule,
ComponentsModule,
- GroupChatPageRoutingModule
+ GroupChatPageRoutingModule,
+ BtnSeguintePageModule,
],
declarations: [GroupChatPage]
})
diff --git a/src/app/shared/chat/new-group/new-group.page.html b/src/app/shared/chat/new-group/new-group.page.html
index 02dc25311..a8f9ccd2a 100644
--- a/src/app/shared/chat/new-group/new-group.page.html
+++ b/src/app/shared/chat/new-group/new-group.page.html
@@ -5,7 +5,11 @@
Novo Grupo
-
+
+
+
diff --git a/src/app/shared/chat/new-group/new-group.page.scss b/src/app/shared/chat/new-group/new-group.page.scss
index 025d3aedd..f7486d5fc 100644
--- a/src/app/shared/chat/new-group/new-group.page.scss
+++ b/src/app/shared/chat/new-group/new-group.page.scss
@@ -65,6 +65,13 @@ ion-content{
width: 221px;
//margin: 2.5px 0 0 5px;
}
+ .btn-criar{
+ padding: 0!important;
+ float: right;
+ font-size: 15px;
+ color: #0782c9;
+ margin: 8px 5px 0 5px;
+ }
.right{
padding: 0!important;
float: right;
diff --git a/src/app/shared/event/attendees/attendees.module.ts b/src/app/shared/event/attendees/attendees.module.ts
index 6bf3dcc62..35f3b4a2a 100644
--- a/src/app/shared/event/attendees/attendees.module.ts
+++ b/src/app/shared/event/attendees/attendees.module.ts
@@ -15,6 +15,7 @@ import { AttendeesPage } from './attendees.page';
IonicModule,
AttendeesPageRoutingModule
],
- declarations: []
+ exports: [AttendeesPage],
+ declarations: [AttendeesPage]
})
export class AttendeesPageModule {}