diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index ab499bd43..e5b626f5d 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -33,6 +33,10 @@ const routes: Routes = [ path: 'btn-seguinte', loadChildren: () => import('./shared/btn-seguinte/btn-seguinte.module').then( m => m.BtnSeguintePageModule) }, + { + path: 'btn-modal-dismiss', + loadChildren: () => import('./shared/btn-modal-dismiss/btn-modal-dismiss.module').then( m => m.BtnModalDismissPageModule) + }, /* { 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 ce7159f5d..03231b252 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.page.html +++ b/src/app/pages/chat/new-group/contacts/contacts.page.html @@ -8,7 +8,7 @@
Contactos
- + 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 18f4eb99a..21c38f71b 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.page.ts +++ b/src/app/pages/chat/new-group/contacts/contacts.page.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; +import { GroupChatPage } from '../group-chat/group-chat.page'; @Component({ selector: 'app-contacts', @@ -31,5 +32,17 @@ export class ContactsPage implements OnInit { console.log('clicked'); } + async groupChat(){ + const modal = await this.modalController.create({ + component: GroupChatPage, + componentProps: {}, + cssClass: 'contacts', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss(); + } } diff --git a/src/app/pages/chat/new-group/group-chat/group-chat-routing.module.ts b/src/app/pages/chat/new-group/group-chat/group-chat-routing.module.ts new file mode 100644 index 000000000..d88c349d7 --- /dev/null +++ b/src/app/pages/chat/new-group/group-chat/group-chat-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { GroupChatPage } from './group-chat.page'; + +const routes: Routes = [ + { + path: '', + component: GroupChatPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class GroupChatPageRoutingModule {} 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 new file mode 100644 index 000000000..a86458890 --- /dev/null +++ b/src/app/pages/chat/new-group/group-chat/group-chat.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 { GroupChatPageRoutingModule } from './group-chat-routing.module'; + +import { GroupChatPage } from './group-chat.page'; +import { SharedModule } from 'src/app/shared/shared.module'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + SharedModule, + GroupChatPageRoutingModule + ], + declarations: [GroupChatPage] +}) +export class GroupChatPageModule {} diff --git a/src/app/pages/chat/new-group/group-chat/group-chat.page.html b/src/app/pages/chat/new-group/group-chat/group-chat.page.html new file mode 100644 index 000000000..4dfad122a --- /dev/null +++ b/src/app/pages/chat/new-group/group-chat/group-chat.page.html @@ -0,0 +1,17 @@ + + +
+
+ +
+ Novo Grupo +
+ +
+
+
+
+ + + + diff --git a/src/app/pages/chat/new-group/group-chat/group-chat.page.scss b/src/app/pages/chat/new-group/group-chat/group-chat.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/pages/chat/new-group/group-chat/group-chat.page.spec.ts b/src/app/pages/chat/new-group/group-chat/group-chat.page.spec.ts new file mode 100644 index 000000000..641898e82 --- /dev/null +++ b/src/app/pages/chat/new-group/group-chat/group-chat.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { GroupChatPage } from './group-chat.page'; + +describe('GroupChatPage', () => { + let component: GroupChatPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ GroupChatPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(GroupChatPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/chat/new-group/group-chat/group-chat.page.ts b/src/app/pages/chat/new-group/group-chat/group-chat.page.ts new file mode 100644 index 000000000..c34b5eec7 --- /dev/null +++ b/src/app/pages/chat/new-group/group-chat/group-chat.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-group-chat', + templateUrl: './group-chat.page.html', + styleUrls: ['./group-chat.page.scss'], +}) +export class GroupChatPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/pages/chat/new-group/new-group-routing.module.ts b/src/app/pages/chat/new-group/new-group-routing.module.ts index 7800e505c..42b9b7e24 100644 --- a/src/app/pages/chat/new-group/new-group-routing.module.ts +++ b/src/app/pages/chat/new-group/new-group-routing.module.ts @@ -11,6 +11,10 @@ const routes: Routes = [ { path: 'contacts', loadChildren: () => import('./contacts/contacts.module').then( m => m.ContactsPageModule) + }, + { + path: 'group-chat', + loadChildren: () => import('./group-chat/group-chat.module').then( m => m.GroupChatPageModule) } ]; 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 b4b8302bf..8b6d4b772 100644 --- a/src/app/pages/chat/new-group/new-group.page.html +++ b/src/app/pages/chat/new-group/new-group.page.html @@ -8,9 +8,6 @@
Novo Grupo
- diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss-routing.module.ts b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss-routing.module.ts new file mode 100644 index 000000000..ed1fb491c --- /dev/null +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { BtnModalDismissPage } from './btn-modal-dismiss.page'; + +const routes: Routes = [ + { + path: '', + component: BtnModalDismissPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class BtnModalDismissPageRoutingModule {} diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module.ts b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module.ts new file mode 100644 index 000000000..de1bb2d5b --- /dev/null +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.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 { BtnModalDismissPageRoutingModule } from './btn-modal-dismiss-routing.module'; + +import { BtnModalDismissPage } from './btn-modal-dismiss.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + BtnModalDismissPageRoutingModule + ], + declarations: [BtnModalDismissPage] +}) +export class BtnModalDismissPageModule {} diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html new file mode 100644 index 000000000..563f30337 --- /dev/null +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.scss b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.scss new file mode 100644 index 000000000..710f88b66 --- /dev/null +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.scss @@ -0,0 +1,6 @@ +.left{ + width: 37px; + float: left; + font-size: 35px; + overflow: auto; +} \ No newline at end of file diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.spec.ts b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.spec.ts new file mode 100644 index 000000000..c15360e1c --- /dev/null +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { BtnModalDismissPage } from './btn-modal-dismiss.page'; + +describe('BtnModalDismissPage', () => { + let component: BtnModalDismissPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ BtnModalDismissPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(BtnModalDismissPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.ts b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.ts new file mode 100644 index 000000000..f8d5f8507 --- /dev/null +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.ts @@ -0,0 +1,24 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; + +@Component({ + selector: 'app-btn-modal-dismiss', + templateUrl: './btn-modal-dismiss.page.html', + styleUrls: ['./btn-modal-dismiss.page.scss'], +}) +export class BtnModalDismissPage implements OnInit { + + constructor( + private modalController: ModalController, + ) { + + } + + ngOnInit() { + + } + close(){ + this.modalController.dismiss(); + } + +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index b0cb11e60..dec50e8ce 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -5,6 +5,7 @@ import { IonicModule } from '@ionic/angular'; import { HeaderPage } from './header/header.page'; import { HeaderPrPage } from './header-pr/header-pr.page'; import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page'; +import { BtnModalDismissPage } from './btn-modal-dismiss/btn-modal-dismiss.page'; @NgModule({ imports: [ @@ -16,11 +17,13 @@ import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page'; HeaderPage, HeaderPrPage, BtnSeguintePage, + BtnModalDismissPage, ], entryComponents:[], declarations: [HeaderPage, HeaderPrPage, BtnSeguintePage, + BtnModalDismissPage, ] }) export class SharedModule {} \ No newline at end of file