This commit is contained in:
tiago.kayaya
2020-12-28 10:11:00 +01:00
parent eabccde7a2
commit 6fe09821e4
25 changed files with 445 additions and 12 deletions
+4
View File
@@ -37,6 +37,10 @@ const routes: Routes = [
{
path: 'btn-modal-dismiss',
loadChildren: () => import('./shared/btn-modal-dismiss/btn-modal-dismiss.module').then( m => m.BtnModalDismissPageModule)
},
{
path: 'chat-popover',
loadChildren: () => import('./shared/popover/chat-popover/chat-popover.module').then( m => m.ChatPopoverPageModule)
},
@@ -18,6 +18,10 @@ const routes: Routes = [
},
{
path: 'new-group',
loadChildren: () => import('./new-group/new-group.module').then( m => m.NewGroupPageModule)
},
{
path: 'group-messages',
loadChildren: () => import('./group-messages/group-messages.module').then( m => m.GroupMessagesPageModule)
}
+2 -1
View File
@@ -77,7 +77,7 @@
<div class="item-icon">
<ion-icon class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon>
</div>
<div class="item-content">
<div (click)="openGroupMessages()" class="item-content">
<div class="item-title-time">
<div class="item-title">
<ion-label>Secretário para o sector Produtivo</ion-label>
@@ -97,3 +97,4 @@
</div>
</ion-content>
+10
View File
@@ -3,6 +3,7 @@ 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 { NewGroupPage } from './new-group/new-group.page';
import { NewchatPage } from './newchat/newchat.page';
@@ -85,4 +86,13 @@ export class ChatPage implements OnInit {
await modal.present();
modal.onDidDismiss();
}
async openGroupMessages(){
const modal = await this.modalController.create({
component: GroupMessagesPage,
cssClass: 'group-messages',
backdropDismiss: false,
});
await modal.present();
modal.onDidDismiss();
}
}
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { GroupMessagesPage } from './group-messages.page';
const routes: Routes = [
{
path: '',
component: GroupMessagesPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class GroupMessagesPageRoutingModule {}
@@ -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 { GroupMessagesPageRoutingModule } from './group-messages-routing.module';
import { GroupMessagesPage } from './group-messages.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { PopoverModule } from 'src/app/shared/popover/chat-popover/popover.modules';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
SharedModule,
PopoverModule,
GroupMessagesPageRoutingModule
],
declarations: [GroupMessagesPage]
})
export class GroupMessagesPageModule {}
@@ -0,0 +1,46 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<div class="middle">
<ion-label class="title">Grupo de Trabalho A</ion-label>
</div>
<div class="right">
<ion-icon (click)="openOptions()" src="assets/images/icons-menu.svg"></ion-icon>
</div>
</div>
</div>
</ion-toolbar>
</ion-header>
<ion-content>
<p>HHHHH</p>
</ion-content>
<ion-footer class="ion-no-border">
<ion-toolbar>
<ion-row align-items-center>
<ion-col>
<ion-item button lines="none">
<img src="assets/images/icons-arrow-arrow-down-25.svg">
</ion-item>
</ion-col>
<ion-col>
<ion-item lines="none" class="div-message">
<ion-textarea placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
<ion-icon slot="end" name="mic-outline"></ion-icon>
</ion-item>
</ion-col>
<ion-col>
<ion-item button lines="none" [disabled]="message === ''">
<img src="assets/images/icons-chat-send.svg">
</ion-item>
</ion-col>
</ion-row>
</ion-toolbar>
</ion-footer>
@@ -0,0 +1,53 @@
.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);
.title-content{
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;
}
.right{
padding: 0!important;
float: right;
font-size: 25px;
color: #0782c9;
margin: 5px 0 0 0;
}
}
.title{
font-size: 25px;
}
.div-icon{
width: 40px;
float: right;
font-size: 35px;
overflow: auto;
padding: 1px;
}
.div-icon ion-icon{
float: right;
padding-left: 20px;
}
}
}
@@ -0,0 +1,24 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { GroupMessagesPage } from './group-messages.page';
describe('GroupMessagesPage', () => {
let component: GroupMessagesPage;
let fixture: ComponentFixture<GroupMessagesPage>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ GroupMessagesPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(GroupMessagesPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -0,0 +1,58 @@
import { Component, OnInit } from '@angular/core';
import { ActionSheetController, MenuController, PopoverController } from '@ionic/angular';
import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popover.page';
@Component({
selector: 'app-group-messages',
templateUrl: './group-messages.page.html',
styleUrls: ['./group-messages.page.scss'],
})
export class GroupMessagesPage implements OnInit {
message:any;
constructor(
private menu: MenuController,
private actionSheetController: ActionSheetController,
public popoverController: PopoverController,
) { }
ngOnInit() {
}
async actionSheet() {
const actionSheet = await this.actionSheetController.create({
cssClass: 'my-custom-class',
buttons: [{
text: 'Sair do grupo',
handler: () => {
console.log('Delete clicked');
}
}, {
text: 'Alterar nome do grupo',
handler: () => {
console.log('Share clicked');
}
}, {
text: 'Apagar o grupo',
handler: () => {
console.log('Play clicked');
}
},
]
});
await actionSheet.present();
}
async openOptions(ev: any) {
const popover = await this.popoverController.create({
component: ChatPopoverPage,
cssClass: 'chat-popover',
event: ev,
translucent: true
});
return await popover.present();
}
}
@@ -8,7 +8,7 @@
<div class="div-title">
<ion-label class="title">Contactos</ion-label>
</div>
<app-btn-seguinte (click)="groupChat()"></app-btn-seguinte>
<app-btn-seguinte (click)="groupMessages()"></app-btn-seguinte>
</div>
</div>
</ion-toolbar>
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { GroupChatPage } from '../group-chat/group-chat.page';
import { GroupMessagesPage } from '../../group-messages/group-messages.page';
@Component({
selector: 'app-contacts',
@@ -32,9 +32,9 @@ export class ContactsPage implements OnInit {
console.log('clicked');
}
async groupChat(){
async groupMessages(){
const modal = await this.modalController.create({
component: GroupChatPage,
component: GroupMessagesPage,
componentProps: {},
cssClass: 'contacts',
backdropDismiss: false
@@ -2,5 +2,5 @@
width: 37px;
float: left;
font-size: 35px;
overflow: auto;
overflow: hidden;
}
@@ -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 {}
@@ -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 {}
@@ -0,0 +1,16 @@
<div>
<ion-toolbar>
<div class="buttons">
<div class="btn-item">
<ion-button class="btn-cancel" shape="round" >Sair do Grupo</ion-button>.
<ion-button class="btn-ok" shape="round" >Alterar nome</ion-button>
</div>
<div class="btn-class">
<hr class="solid">
</div>
<div class="btn-item">
<ion-button class="btn-delete" shape="round">Apagar grupo</ion-button>
</div>
</div>
</ion-toolbar>
</div>
@@ -0,0 +1,49 @@
.buttons{
overflow: auto;
padding-top: 10px;
padding-bottom: 10px;
}
.btn-item{
padding: 2px;
margin: 10px 20px 10px 20px !important;
overflow: auto;
}
.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;
}
@@ -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();
});
});
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-chat-popover',
templateUrl: './chat-popover.page.html',
styleUrls: ['./chat-popover.page.scss'],
})
export class ChatPopoverPage implements OnInit {
constructor() { }
ngOnInit() {
}
}
@@ -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 {}
+3
View File
@@ -6,6 +6,7 @@ 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: [
@@ -18,12 +19,14 @@ import { BtnModalDismissPage } from './btn-modal-dismiss/btn-modal-dismiss.page'
HeaderPrPage,
BtnSeguintePage,
BtnModalDismissPage,
ChatPopoverPage,
],
entryComponents:[],
declarations: [HeaderPage,
HeaderPrPage,
BtnSeguintePage,
BtnModalDismissPage,
ChatPopoverPage,
]
})
export class SharedModule {}
+15
View File
@@ -0,0 +1,15 @@
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 25 25">
<g fill="none" fill-rule="evenodd">
<g fill="#42B9FE">
<g>
<g>
<g transform="translate(-355 -114) translate(0 84) translate(0 25) translate(355 5)">
<circle cx="12.5" cy="12.5" r="2.5"/>
<circle cx="12.5" cy="5.5" r="2.5"/>
<circle cx="12.5" cy="19.5" r="2.5"/>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 570 B

+15 -4
View File
@@ -263,7 +263,7 @@
padding: 25px;
background: rgba(51, 51, 51, 0.3);
}
.newchat, .new-group, .contacts{
.newchat, .new-group, .contacts, .group-messages, .custom-modal{
padding-top: 73px;
--border-radius: 25px 25px 0 0;
--border-width:0px;
@@ -271,6 +271,17 @@
.capitalizeText{
text-transform: capitalize;
}
//POPOVER
.chat-popover .popover-content {
width: 100% !important;
left: 0 !important;
bottom: 0 !important;
right: 0 !important;
top: calc(100% - 160px) !important;
max-height: 160px;
min-height: 160px;
}
/* .event-actions-popover ion-list{
} */
.Rectangle {
@@ -381,7 +392,7 @@
.btn-ok-no-width{
height: 45px !important;
margin: 0 auto;
padding: 10px 15px;
padding:0 !important;
border-radius: 22.5px;
background-color: #42b9fe;
color: #ffffff !important;
@@ -390,7 +401,7 @@
width: 170px !important;
height: 45px !important;
margin: 0 auto;
padding: 10px 15px;
padding:0 !important;
border-radius: 22.5px;
background-color: #ffe0e0;
color: #d30a0a !important;
@@ -399,7 +410,7 @@
width: 160px !important;
height: 45px !important;
margin: 0 auto;
padding: 10px 15px;
padding:0 !important;
border-radius: 22.5px;
background-color: #e0e9ee;
color: #061b52 !important;