Fixe merge conflit

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 {}

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 {}

src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html

@@ -0,0 +1,3 @@
+<div class="left">
+  <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+</div>

src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.scss

@@ -0,0 +1,6 @@
+.left{
+    width: 37px;
+    float: left;
+    font-size: 35px;
+    overflow: hidden;
+}

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<BtnModalDismissPage>;
+
+  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();
+  });
+});

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();
+  }
+
+}

src/app/shared/btn-seguinte/btn-seguinte-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { BtnSeguintePage } from './btn-seguinte.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: BtnSeguintePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class BtnSeguintePageRoutingModule {}

src/app/shared/btn-seguinte/btn-seguinte.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 { BtnSeguintePageRoutingModule } from './btn-seguinte-routing.module';
+
+import { BtnSeguintePage } from './btn-seguinte.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    BtnSeguintePageRoutingModule
+  ],
+  declarations: [BtnSeguintePage]
+})
+export class BtnSeguintePageModule {}

src/app/shared/btn-seguinte/btn-seguinte.page.html

@@ -0,0 +1,3 @@
+<div class="right">
+  <ion-label>Seguinte</ion-label>
+</div>

src/app/shared/btn-seguinte/btn-seguinte.page.scss

@@ -0,0 +1,7 @@
+.right{
+    padding: 0!important;
+    float: right;
+    font-size: 15px;
+    color: #0782c9;
+    margin: 8px 0 0 5px;
+  }

src/app/shared/btn-seguinte/btn-seguinte.page.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { BtnSeguintePage } from './btn-seguinte.page';
+
+describe('BtnSeguintePage', () => {
+  let component: BtnSeguintePage;
+  let fixture: ComponentFixture<BtnSeguintePage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BtnSeguintePage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(BtnSeguintePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/shared/btn-seguinte/btn-seguinte.page.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-btn-seguinte',
+  templateUrl: './btn-seguinte.page.html',
+  styleUrls: ['./btn-seguinte.page.scss'],
+})
+export class BtnSeguintePage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

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 {}

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 {}

src/app/shared/popover/chat-options-popover/chat-options-popover.page.html

@@ -0,0 +1,23 @@
+<ion-content>
+  <ion-row>
+    <ion-col>
+      <button full class="btn-ok" shape="round" >Tirar Fotografia</button>
+    </ion-col>
+    <ion-col>
+      <button class="btn-ok" shape="round" >Digitalizar Documento</button>
+    </ion-col>
+    <ion-col>
+      <button full class="btn-ok" shape="round" >Anexar Fotografia</button>
+    </ion-col>
+    <ion-col>
+      <button class="btn-ok" shape="round" >Anexar Documento</button>
+    </ion-col>
+  </ion-row>
+  <ion-row class="border-top">
+    <ion-col>
+      <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
+    </ion-col>
+    <ion-col>
+    </ion-col>
+  </ion-row>
+</ion-content>

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;
+
+  }

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<ChatOptionsPopoverPage>;
+
+  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();
+  });
+});

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();
+  }
+
+}

src/app/shared/popover/chat-popover/chat-popover-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ChatPopoverPage } from './chat-popover.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ChatPopoverPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ChatPopoverPageRoutingModule {}

src/app/shared/popover/chat-popover/chat-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 { ChatPopoverPageRoutingModule } from './chat-popover-routing.module';
+
+import { ChatPopoverPage } from './chat-popover.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    ChatPopoverPageRoutingModule
+  ],
+  declarations: [ChatPopoverPage]
+})
+export class ChatPopoverPageModule {}

src/app/shared/popover/chat-popover/chat-popover.page.html

@@ -0,0 +1,18 @@
+<ion-content>
+  <ion-row>
+    <ion-col>
+      <button class="btn-cancel" shape="round" >Sair do Grupo</button>
+    </ion-col>
+    <ion-col>
+      <button class="btn-ok" shape="round" >Alterar nome do grupo</button>
+    </ion-col>
+  </ion-row>
+  <ion-row class="border-top">
+    <ion-col>
+      <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
+    </ion-col>
+    <ion-col>
+      <button  class="btn-delete" shape="round">Apagar grupo</button>
+    </ion-col>
+  </ion-row>
+</ion-content>

src/app/shared/popover/chat-popover/chat-popover.page.scss

@@ -0,0 +1,15 @@
+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-ok, .btn-cancel, .btn-delete{
+    font-size: 13px;
+    padding:0 !important;
+} */

src/app/shared/popover/chat-popover/chat-popover.page.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ChatPopoverPage } from './chat-popover.page';
+
+describe('ChatPopoverPage', () => {
+  let component: ChatPopoverPage;
+  let fixture: ComponentFixture<ChatPopoverPage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ChatPopoverPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ChatPopoverPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -0,0 +1,21 @@
+import { Component, OnInit } from '@angular/core';
+import { PopoverController } from '@ionic/angular';
+
+@Component({
+  selector: 'app-chat-popover',
+  templateUrl: './chat-popover.page.html',
+  styleUrls: ['./chat-popover.page.scss'],
+})
+export class ChatPopoverPage implements OnInit {
+
+  constructor(
+    private popoverController: PopoverController,
+  ) { }
+
+  ngOnInit() {
+  }
+  close(){
+    this.popoverController.dismiss();
+  }
+
+}

src/app/shared/popover/chat-popover/popover.modules.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 { ChatPopoverPage } from './chat-popover.page';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+  ],
+  exports: [
+    ChatPopoverPage,
+  ],
+  entryComponents:[],
+  declarations: [
+    ChatPopoverPage,
+  ]
+})
+export class PopoverModule {}

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 {}

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 {}

src/app/shared/popover/group-duration/group-duration.page.html

@@ -0,0 +1,19 @@
+<ion-content>
+  <div class="p-header">
+    <h3>Duração</h3>
+  </div>
+  <div class="picker">
+
+  </div>
+  <div class="p-buttons">
+    <ion-row>
+      <ion-col>
+        <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
+      </ion-col>
+      <ion-col>
+        <button class="btn-ok" shape="round" >Ok</button>
+      </ion-col>
+    </ion-row>
+  </div>
+
+</ion-content>

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<GroupDurationPage>;
+
+  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();
+  });
+});

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();
+  }
+
+}

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 {}

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 {}

src/app/shared/popover/messages-options/messages-options.page.html

@@ -0,0 +1,10 @@
+<ion-content>
+  <ion-row class="border-top">
+    <ion-col>
+      <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
+    </ion-col>
+    <ion-col>
+      <button (click)="closeChatRoom()" full class="btn-delete" shape="round" >Apagar conversa</button>
+    </ion-col>
+  </ion-row>
+</ion-content>

src/app/shared/popover/messages-options/messages-options.page.scss

@@ -0,0 +1,3 @@
+ion-row{
+    padding: 10px 10px 5px 10px;
+}

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<MessagesOptionsPage>;
+
+  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();
+  });
+});

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();
+  }
+
+}

src/app/shared/shared.module.ts

@@ -4,6 +4,9 @@ import { FormsModule } from '@angular/forms';
 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';
+import { ChatPopoverPage } from './popover/chat-popover/chat-popover.page';
 
 @NgModule({
   imports: [
@@ -11,8 +14,17 @@ import { HeaderPrPage } from './header-pr/header-pr.page';
     FormsModule,
     IonicModule,
   ],
-  exports: [HeaderPage, HeaderPrPage],
+  exports: [
+    HeaderPage, 
+    HeaderPrPage, 
+    BtnSeguintePage,
+    BtnModalDismissPage,
+  ],
   entryComponents:[],
-  declarations: [HeaderPage, HeaderPrPage]
+  declarations: [HeaderPage, 
+    HeaderPrPage, 
+    BtnSeguintePage,
+    BtnModalDismissPage,
+  ]
 })
 export class SharedModule {}