diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 6e197ae99..a4ecbee4b 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -41,6 +41,10 @@ const routes: Routes = [ path: 'chat-popover', loadChildren: () => import('./shared/popover/chat-popover/chat-popover.module').then( m => m.ChatPopoverPageModule) }, + { + path: 'chat-options-popover', + loadChildren: () => import('./shared/popover/chat-options-popover/chat-options-popover.module').then( m => m.ChatOptionsPopoverPageModule) + }, /* { diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 91a901d91..1fa8391bd 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -26,7 +26,7 @@ Pesquisa --> - + Chat diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 849dd49ca..397f20f6a 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -59,7 +59,23 @@ Podemos marcar reunião para amanha - + + + + + + + + + Secretário para o Sector Produtivo + + Ontem + + + Viva! + + + diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index faa8987b7..e075abaa5 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -24,7 +24,8 @@ export class ChatPage implements OnInit { constructor( private chatService: ChatService, private modalController: ModalController, - private authService: AuthService) { } + private authService: AuthService + ) { } ngOnInit() { this.segment = "Contactos"; diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index a999b764c..09e809849 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -1,7 +1,7 @@ - + Grupo de Trabalho A @@ -10,36 +10,47 @@ + + + + + + + {{contact}} + + + - HHHHH + - + - - - - - + + + + + - - + + - + - - - - + + + + + diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss index f02b586d7..bd9519c4e 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.scss +++ b/src/app/pages/chat/group-messages/group-messages.page.scss @@ -14,7 +14,7 @@ color:#000; transform: translate3d(0, 1px, 0); - .title-content{ + .header-top{ width: 360px; margin: 0px auto; overflow: auto; @@ -34,6 +34,30 @@ margin: 5px 0 0 0; } } + .header-bottom{ + width: 310px; + overflow: auto; + margin: 0 auto; + + .header-bottom-icon{ + width: 30px; + font-size: 25px; + float: left; + padding: 2px; + + } + .header-bottom-contacts{ + width: 275px; + font-size: 15px; + color: #797979; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + float: left; + padding: 5px; + margin: 1px; + } + } .title{ font-size: 25px; @@ -50,4 +74,32 @@ padding-left: 20px; } } + } + + + ion-footer{ + .row{ + width: 380px; + margin: 0 auto; + } + ion-col{ +/* border: 1px solid red; */ + } + .chat-icon-options{ + display:block !important; + font-size: 25px; + float: right !important; + margin-top: 10px; + } + .chat-icon-send{ + font-size: 45px; + margin: 0 auto; + margin-top: 4px; + } + + ion-col .type-message{ + border: 1px solid #ebebeb; + border-radius: 25px; + padding-left: 15px; + } } \ No newline at end of file diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 2cfa68310..5399545da 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -1,6 +1,9 @@ import { Component, OnInit } from '@angular/core'; -import { ActionSheetController, MenuController, PopoverController } from '@ionic/angular'; +import { ActionSheetController, MenuController, ModalController, PopoverController } from '@ionic/angular'; +import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page'; import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popover.page'; +import { ContactsPage } from '../new-group/contacts/contacts.page'; +import { NewGroupPage } from '../new-group/new-group.page'; @Component({ selector: 'app-group-messages', @@ -10,9 +13,11 @@ import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popove export class GroupMessagesPage implements OnInit { message:any; + contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"]; constructor( private menu: MenuController, + private modalController: ModalController, private actionSheetController: ActionSheetController, public popoverController: PopoverController, ) { } @@ -53,6 +58,27 @@ export class GroupMessagesPage implements OnInit { }); return await popover.present(); } + async openChatOptions(ev: any) { + const popover = await this.popoverController.create({ + component: ChatOptionsPopoverPage, + cssClass: 'chat-options-popover', + event: ev, + translucent: true + }); + return await popover.present(); + } + async addContacts(){ + const modal = await this.modalController.create({ + component: ContactsPage, + componentProps: {}, + cssClass: 'contacts', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss(); + } } diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover-routing.module.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover-routing.module.ts new file mode 100644 index 000000000..8e189ed7f --- /dev/null +++ b/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 {} diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.module.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.module.ts new file mode 100644 index 000000000..d6e7129d9 --- /dev/null +++ b/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 {} diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html new file mode 100644 index 000000000..b4e99495b --- /dev/null +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html @@ -0,0 +1,23 @@ + + + + Tirar Fotografia + + + Digitalizar Documento + + + Anexar Fotografia + + + Anexar Documento + + + + + Cancelar + + + + + diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss new file mode 100644 index 000000000..1e44f4b3d --- /dev/null +++ b/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; + + } \ No newline at end of file diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.spec.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.spec.ts new file mode 100644 index 000000000..a720defb5 --- /dev/null +++ b/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; + + 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(); + }); +}); diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts new file mode 100644 index 000000000..c18cb04e9 --- /dev/null +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-chat-options-popover', + templateUrl: './chat-options-popover.page.html', + styleUrls: ['./chat-options-popover.page.scss'], +}) +export class ChatOptionsPopoverPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index 69938a705..f6003bb0e 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -1,4 +1,4 @@ - + + + + + + Sair do Grupo + + + Alterar nome do grupo + + + + + Apagar grupo + + + + + diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.scss b/src/app/shared/popover/chat-popover/chat-popover.page.scss index cb6972c78..0171ad1d0 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.scss +++ b/src/app/shared/popover/chat-popover/chat-popover.page.scss @@ -1,49 +1,15 @@ -.buttons{ - overflow: auto; - padding-top: 10px; - padding-bottom: 10px; +ion-row{ + padding: 10px 10px 5px 10px; } -.btn-item{ - padding: 2px; - margin: 10px 20px 10px 20px !important; - overflow: auto; +.border-top{ + padding-top: 5px !important; + border-top: 1px solid #ebebeb; } -.btn-ok, .btn-cancel, .btn-delete{ +/* ion-col{ + border: 1px solid red; +} */ + +/* .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; - } \ No newline at end of file +} */ diff --git a/src/assets/icon/icons-chat-mic.svg b/src/assets/icon/icons-chat-mic.svg new file mode 100644 index 000000000..6ee4201ff --- /dev/null +++ b/src/assets/icon/icons-chat-mic.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/assets/icon/icons-chat-options.svg b/src/assets/icon/icons-chat-options.svg new file mode 100644 index 000000000..0823c7065 --- /dev/null +++ b/src/assets/icon/icons-chat-options.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-chat-send.svg b/src/assets/icon/icons-chat-send.svg similarity index 100% rename from src/assets/images/icons-chat-send.svg rename to src/assets/icon/icons-chat-send.svg diff --git a/src/assets/icon/icons-user.svg b/src/assets/icon/icons-user.svg new file mode 100644 index 000000000..74a4a034b --- /dev/null +++ b/src/assets/icon/icons-user.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-chat-contacts-list.svg b/src/assets/images/icons-chat-contacts-list.svg new file mode 100644 index 000000000..74a4a034b --- /dev/null +++ b/src/assets/images/icons-chat-contacts-list.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 877420d58..d668e1cf4 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -281,6 +281,15 @@ max-height: 160px; min-height: 160px; } +.chat-options-popover .popover-content{ + width: 100% !important; + left: 0 !important; + bottom: 0 !important; + right: 0 !important; + top: calc(100% - 210px) !important; + max-height: 210px; + min-height: 210px; +} /* .event-actions-popover ion-list{ } */ @@ -381,10 +390,10 @@ --background: #fff; } .btn-ok{ - width: 160px !important; + width: 170px !important; height: 45px !important; - margin: 0 auto; - padding: 10px 15px; + margin: 0 auto !important; + padding:0 !important; border-radius: 22.5px; background-color: #42b9fe; color: #ffffff !important; @@ -398,22 +407,24 @@ color: #ffffff !important; } .btn-delete{ + display: block; width: 170px !important; height: 45px !important; - margin: 0 auto; + margin: 0 auto !important; padding:0 !important; border-radius: 22.5px; background-color: #ffe0e0; color: #d30a0a !important; } .btn-cancel{ - width: 160px !important; + display: block; + width: 170px !important; height: 45px !important; - margin: 0 auto; padding:0 !important; border-radius: 22.5px; background-color: #e0e9ee; color: #061b52 !important; + margin: 0 auto !important; } .bg-blue{ --background:#0782c9;
Podemos marcar reunião para amanha
Viva!
HHHHH