diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index f9f765e9c..5a5b1c31a 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -10,10 +10,6 @@ const routes = [ path: '', loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) }, - { - path: 'empty-chat', - loadChildren: () => import('./ui/chat/component/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) - }, { path: 'empty-container', loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) @@ -30,10 +26,6 @@ const routes = [ path: 'document-detail', loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) }, - { - path: 'edit-group', - loadChildren: () => import('./ui/chat/component/edit-group/edit-group.module').then( m => m.EditGroupPageModule) - }, { path: 'pedidos', loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) @@ -246,26 +238,10 @@ const routes = [ path: 'diplomas-gerar-options', loadChildren: () => import('./shared/popover/diplomas-gerar-options/diplomas-gerar-options.module').then( m => m.DiplomasGerarOptionsPageModule) }, - { - path: 'chat-debugging', - loadChildren: () => import('./shared/popover/chat-debugging/chat-debugging.module').then( m => m.ChatDebuggingPageModule) - }, - { - path: 'chat-message-debugging', - loadChildren: () => import('./shared/popover/chat-message-debugging/chat-message-debugging.module').then( m => m.ChatMessageDebuggingPageModule) - }, - { - path: 'add-user', - loadChildren: () => import('./ui/chat/component/add-user/add-user.module').then( m => m.AddUserPageModule) - }, { path: 'information', loadChildren: () => import('./modals/information/information.module').then( m => m.InformationPageModule) }, - { - path: 'chat-options-popover', - loadChildren:() => import('./shared/popover/chat-options-popover/chat-options-popover.module').then( m => m.ChatOptionsPopoverPageModule) - }, { path: 'task-listt-header', loadChildren: () => import('./shared/gabinete-digital/generic/task-listt-header/task-listt-header.module').then( m => m.TaskListtHeaderPageModule) diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index e3dcc04ff..39b260343 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -326,45 +326,6 @@ const routes: Routes = [ path:'', loadChildren: ()=> ChatPageModule }, - { - path:'messages', - children: [ - { - path:':roomId', - loadChildren: ()=> import('../ui/chat/modal/messages/messages.module').then(m => m.MessagesPageModule) - }, - { - path:'contacts', - loadChildren: ()=> import('../ui/chat/component/messages/contacts/contacts.module').then(m => m.ContactsPageModule) - }, - { - path:'contacts', - loadChildren: ()=> import('../ui/chat/modal/messages/contacts/contacts.module').then(m => m.ContactsPageModule) - }, - ] - }, - { - path:'group-messages', - children:[ - { - path:'', - loadChildren: ()=> import('../ui/chat/modal/group-messages/group-messages.module').then(m => m.GroupMessagesPageModule) - }, - { - path:'group-contacts', - loadChildren: ()=> import('../ui/chat/component/group-messages/group-contacts/group-contacts.module').then(m => m.GroupContactsPageModule) - }, - { - path:'group-contacts', - loadChildren: ()=> import('../ui/chat/modal/group-messages/group-contacts/group-contacts.module').then(m => m.GroupContactsPageModule) - }, - ] - }, - { - path:':eventId/:caller', - loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule), - }, - ], canActivate: [AuthGuard] diff --git a/src/app/infra/repository/dexie/dexie-repository.service.ts b/src/app/infra/repository/dexie/dexie-repository.service.ts index ac13f2a88..68ae8687b 100644 --- a/src/app/infra/repository/dexie/dexie-repository.service.ts +++ b/src/app/infra/repository/dexie/dexie-repository.service.ts @@ -1,11 +1,10 @@ -import { Result, ok, err, ResultAsync } from 'neverthrow'; -import { Dexie, EntityTable, liveQuery, Observable } from 'Dexie'; +import { Result, ok, err } from 'neverthrow'; +import { EntityTable } from 'Dexie'; import { ZodError, ZodObject, ZodSchema } from 'zod'; // Define a type for the Result of repository operations type RepositoryResult = Result>; - export class DexieRepository { private table: EntityTable; private ZodSchema: ZodSchema diff --git a/src/app/shared/agenda/view-event/view-event.module.ts b/src/app/shared/agenda/view-event/view-event.module.ts index c4cc69858..09d7e2b66 100644 --- a/src/app/shared/agenda/view-event/view-event.module.ts +++ b/src/app/shared/agenda/view-event/view-event.module.ts @@ -7,9 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { ViewEventPageRoutingModule } from './view-event-routing.module'; import { ViewEventPage } from './view-event.page'; -import { SharedModule } from 'src/app/shared/shared.module'; -import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page'; - @NgModule({ imports: [ diff --git a/src/app/ui/chat/chat-routing.module.ts b/src/app/ui/chat/chat-routing.module.ts index a3523e8aa..f0254109f 100644 --- a/src/app/ui/chat/chat-routing.module.ts +++ b/src/app/ui/chat/chat-routing.module.ts @@ -23,7 +23,31 @@ const routes: Routes = [ { path: 'edit-group', loadChildren: () => import('./modal/edit-group/edit-group.module').then( m => m.EditGroupPageModule) - } + }, + { + path: 'chat-options-popover', + loadChildren:() => import('./modal/chat-options-popover/chat-options-popover.module').then( m => m.ChatOptionsPopoverPageModule) + }, + { + path: 'chat-debugging', + loadChildren: () => import('./modal/chat-debugging/chat-debugging.module').then( m => m.ChatDebuggingPageModule) + }, + { + path: 'chat-message-debugging', + loadChildren: () => import('./modal/chat-message-debugging/chat-message-debugging.module').then( m => m.ChatMessageDebuggingPageModule) + }, + { + path: 'add-user', + loadChildren: () => import('./component/add-user/add-user.module').then( m => m.AddUserPageModule) + }, + { + path: 'empty-chat', + loadChildren: () => import('./component/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) + }, + { + path: 'edit-group', + loadChildren: () => import('./component/edit-group/edit-group.module').then( m => m.EditGroupPageModule) + }, ]; diff --git a/src/app/ui/chat/component/group-messages/group-messages.module.ts b/src/app/ui/chat/component/group-messages/group-messages.module.ts index 6cad5cfc1..f611624d6 100644 --- a/src/app/ui/chat/component/group-messages/group-messages.module.ts +++ b/src/app/ui/chat/component/group-messages/group-messages.module.ts @@ -14,7 +14,7 @@ import {MatMenuModule} from '@angular/material/menu'; import { LettersAvatarModule } from "ngx-letters-avatar"; import { PipesModule } from 'src/app/pipes/pipes.module'; import { SafehtmlPipe } from 'src/app/pipes/safehtml.pipe'; -import { ChatPopoverPageModule } from 'src/app/shared/popover/chat-popover/chat-popover.module'; +import { ChatPopoverPageModule } from '../../modal/chat-popover/chat-popover.module'; @NgModule({ imports: [ diff --git a/src/app/ui/chat/component/group-messages/group-messages.page.ts b/src/app/ui/chat/component/group-messages/group-messages.page.ts index a4cef0b2c..ac399f5de 100644 --- a/src/app/ui/chat/component/group-messages/group-messages.page.ts +++ b/src/app/ui/chat/component/group-messages/group-messages.page.ts @@ -2,7 +2,6 @@ import { Component, OnChanges, OnInit, Input, SimpleChanges, Output, EventEmitte import { AnimationController, ModalController, PopoverController, Platform } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { ChatService } from 'src/app/services/chat.service'; -import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popover.page'; import { GroupContactsPage } from './group-contacts/group-contacts.page'; import { ChatOptionsFeaturesPage } from 'src/app/modals/chat-options-features/chat-options-features.page'; import { TimeService } from 'src/app/services/functions/time.service'; @@ -29,7 +28,8 @@ import { SessionStore } from 'src/app/store/session.service'; import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page'; import { PermissionService } from 'src/app/services/permission.service'; import { FileValidatorService } from "src/app/services/file/file-validator.service" -import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page'; +import { ChatOptionsPopoverPage } from '../../modal/chat-options-popover/chat-options-popover.page'; +import { ChatPopoverPage } from '../../modal/chat-popover/chat-popover.page'; @Component({ selector: 'app-group-messages', templateUrl: './group-messages.page.html', diff --git a/src/app/ui/chat/component/messages/messages.page.ts b/src/app/ui/chat/component/messages/messages.page.ts index 928c18f6e..230701aa2 100644 --- a/src/app/ui/chat/component/messages/messages.page.ts +++ b/src/app/ui/chat/component/messages/messages.page.ts @@ -41,8 +41,8 @@ import { FilePickerWebService } from 'src/app/infra/file-picker/web/file-picker- import { FilePickerService } from 'src/app/infra/file-picker/file-picker.service' import { allowedDocExtension } from 'src/app/utils/allowedDocExtension'; import { SpeakerService, StartRecordingResultError, StopRecordingResultError } from 'src/app/infra/speaker/speaker.service' -import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popover.page'; import { compressImageBase64 } from 'src/app/utils/imageCompressore'; +import { ChatPopoverPage } from '../../modal/chat-popover/chat-popover.page'; @Component({ selector: 'app-messages', diff --git a/src/app/shared/popover/chat-debugging/chat-debugging-routing.module.ts b/src/app/ui/chat/modal/chat-debugging/chat-debugging-routing.module.ts similarity index 100% rename from src/app/shared/popover/chat-debugging/chat-debugging-routing.module.ts rename to src/app/ui/chat/modal/chat-debugging/chat-debugging-routing.module.ts diff --git a/src/app/shared/popover/chat-debugging/chat-debugging.module.ts b/src/app/ui/chat/modal/chat-debugging/chat-debugging.module.ts similarity index 100% rename from src/app/shared/popover/chat-debugging/chat-debugging.module.ts rename to src/app/ui/chat/modal/chat-debugging/chat-debugging.module.ts diff --git a/src/app/shared/popover/chat-debugging/chat-debugging.page.html b/src/app/ui/chat/modal/chat-debugging/chat-debugging.page.html similarity index 100% rename from src/app/shared/popover/chat-debugging/chat-debugging.page.html rename to src/app/ui/chat/modal/chat-debugging/chat-debugging.page.html diff --git a/src/app/shared/popover/chat-debugging/chat-debugging.page.scss b/src/app/ui/chat/modal/chat-debugging/chat-debugging.page.scss similarity index 100% rename from src/app/shared/popover/chat-debugging/chat-debugging.page.scss rename to src/app/ui/chat/modal/chat-debugging/chat-debugging.page.scss diff --git a/src/app/shared/popover/chat-debugging/chat-debugging.page.spec.ts b/src/app/ui/chat/modal/chat-debugging/chat-debugging.page.spec.ts similarity index 100% rename from src/app/shared/popover/chat-debugging/chat-debugging.page.spec.ts rename to src/app/ui/chat/modal/chat-debugging/chat-debugging.page.spec.ts diff --git a/src/app/shared/popover/chat-debugging/chat-debugging.page.ts b/src/app/ui/chat/modal/chat-debugging/chat-debugging.page.ts similarity index 100% rename from src/app/shared/popover/chat-debugging/chat-debugging.page.ts rename to src/app/ui/chat/modal/chat-debugging/chat-debugging.page.ts diff --git a/src/app/shared/popover/chat-message-debugging/chat-message-debugging-routing.module.ts b/src/app/ui/chat/modal/chat-message-debugging/chat-message-debugging-routing.module.ts similarity index 100% rename from src/app/shared/popover/chat-message-debugging/chat-message-debugging-routing.module.ts rename to src/app/ui/chat/modal/chat-message-debugging/chat-message-debugging-routing.module.ts diff --git a/src/app/shared/popover/chat-message-debugging/chat-message-debugging.module.ts b/src/app/ui/chat/modal/chat-message-debugging/chat-message-debugging.module.ts similarity index 100% rename from src/app/shared/popover/chat-message-debugging/chat-message-debugging.module.ts rename to src/app/ui/chat/modal/chat-message-debugging/chat-message-debugging.module.ts diff --git a/src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.html b/src/app/ui/chat/modal/chat-message-debugging/chat-message-debugging.page.html similarity index 100% rename from src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.html rename to src/app/ui/chat/modal/chat-message-debugging/chat-message-debugging.page.html diff --git a/src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.scss b/src/app/ui/chat/modal/chat-message-debugging/chat-message-debugging.page.scss similarity index 100% rename from src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.scss rename to src/app/ui/chat/modal/chat-message-debugging/chat-message-debugging.page.scss diff --git a/src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.spec.ts b/src/app/ui/chat/modal/chat-message-debugging/chat-message-debugging.page.spec.ts similarity index 100% rename from src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.spec.ts rename to src/app/ui/chat/modal/chat-message-debugging/chat-message-debugging.page.spec.ts diff --git a/src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.ts b/src/app/ui/chat/modal/chat-message-debugging/chat-message-debugging.page.ts similarity index 100% rename from src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.ts rename to src/app/ui/chat/modal/chat-message-debugging/chat-message-debugging.page.ts diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover-routing.module.ts b/src/app/ui/chat/modal/chat-options-popover/chat-options-popover-routing.module.ts similarity index 100% rename from src/app/shared/popover/chat-options-popover/chat-options-popover-routing.module.ts rename to src/app/ui/chat/modal/chat-options-popover/chat-options-popover-routing.module.ts diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.module.ts b/src/app/ui/chat/modal/chat-options-popover/chat-options-popover.module.ts similarity index 100% rename from src/app/shared/popover/chat-options-popover/chat-options-popover.module.ts rename to src/app/ui/chat/modal/chat-options-popover/chat-options-popover.module.ts diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/ui/chat/modal/chat-options-popover/chat-options-popover.page.html similarity index 100% rename from src/app/shared/popover/chat-options-popover/chat-options-popover.page.html rename to src/app/ui/chat/modal/chat-options-popover/chat-options-popover.page.html diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss b/src/app/ui/chat/modal/chat-options-popover/chat-options-popover.page.scss similarity index 100% rename from src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss rename to src/app/ui/chat/modal/chat-options-popover/chat-options-popover.page.scss diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.spec.ts b/src/app/ui/chat/modal/chat-options-popover/chat-options-popover.page.spec.ts similarity index 100% rename from src/app/shared/popover/chat-options-popover/chat-options-popover.page.spec.ts rename to src/app/ui/chat/modal/chat-options-popover/chat-options-popover.page.spec.ts diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/ui/chat/modal/chat-options-popover/chat-options-popover.page.ts similarity index 100% rename from src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts rename to src/app/ui/chat/modal/chat-options-popover/chat-options-popover.page.ts diff --git a/src/app/shared/popover/chat-popover/chat-popover-routing.module.ts b/src/app/ui/chat/modal/chat-popover/chat-popover-routing.module.ts similarity index 100% rename from src/app/shared/popover/chat-popover/chat-popover-routing.module.ts rename to src/app/ui/chat/modal/chat-popover/chat-popover-routing.module.ts diff --git a/src/app/shared/popover/chat-popover/chat-popover.module.ts b/src/app/ui/chat/modal/chat-popover/chat-popover.module.ts similarity index 100% rename from src/app/shared/popover/chat-popover/chat-popover.module.ts rename to src/app/ui/chat/modal/chat-popover/chat-popover.module.ts diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/ui/chat/modal/chat-popover/chat-popover.page.html similarity index 100% rename from src/app/shared/popover/chat-popover/chat-popover.page.html rename to src/app/ui/chat/modal/chat-popover/chat-popover.page.html diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.scss b/src/app/ui/chat/modal/chat-popover/chat-popover.page.scss similarity index 100% rename from src/app/shared/popover/chat-popover/chat-popover.page.scss rename to src/app/ui/chat/modal/chat-popover/chat-popover.page.scss diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.spec.ts b/src/app/ui/chat/modal/chat-popover/chat-popover.page.spec.ts similarity index 100% rename from src/app/shared/popover/chat-popover/chat-popover.page.spec.ts rename to src/app/ui/chat/modal/chat-popover/chat-popover.page.spec.ts diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/ui/chat/modal/chat-popover/chat-popover.page.ts similarity index 100% rename from src/app/shared/popover/chat-popover/chat-popover.page.ts rename to src/app/ui/chat/modal/chat-popover/chat-popover.page.ts diff --git a/src/app/ui/chat/modal/group-duration/group-duration-routing.module.ts b/src/app/ui/chat/modal/group-duration/group-duration-routing.module.ts new file mode 100644 index 000000000..fe80d4118 --- /dev/null +++ b/src/app/ui/chat/modal/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 {} diff --git a/src/app/ui/chat/modal/group-duration/group-duration.module.ts b/src/app/ui/chat/modal/group-duration/group-duration.module.ts new file mode 100644 index 000000000..eb4dd1468 --- /dev/null +++ b/src/app/ui/chat/modal/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 {} diff --git a/src/app/ui/chat/modal/group-duration/group-duration.page.html b/src/app/ui/chat/modal/group-duration/group-duration.page.html new file mode 100644 index 000000000..768a33230 --- /dev/null +++ b/src/app/ui/chat/modal/group-duration/group-duration.page.html @@ -0,0 +1,19 @@ + +
+

Duração

+
+
+ +
+
+ + + + + + + + +
+ + diff --git a/src/app/ui/chat/modal/group-duration/group-duration.page.scss b/src/app/ui/chat/modal/group-duration/group-duration.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/ui/chat/modal/group-duration/group-duration.page.spec.ts b/src/app/ui/chat/modal/group-duration/group-duration.page.spec.ts new file mode 100644 index 000000000..ba52f3ffa --- /dev/null +++ b/src/app/ui/chat/modal/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; + + 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(); + }); +}); diff --git a/src/app/ui/chat/modal/group-duration/group-duration.page.ts b/src/app/ui/chat/modal/group-duration/group-duration.page.ts new file mode 100644 index 000000000..7e095ff05 --- /dev/null +++ b/src/app/ui/chat/modal/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(); + } + +} diff --git a/src/app/ui/chat/modal/group-messages/group-messages.module.ts b/src/app/ui/chat/modal/group-messages/group-messages.module.ts index e101f8bb2..727bdf276 100644 --- a/src/app/ui/chat/modal/group-messages/group-messages.module.ts +++ b/src/app/ui/chat/modal/group-messages/group-messages.module.ts @@ -9,12 +9,12 @@ import { GroupMessagesPageRoutingModule } from './group-messages-routing.module' import { GroupMessagesPage } from './group-messages.page'; -import { ChatPopoverPageModule } from 'src/app/shared/popover/chat-popover/chat-popover.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { LettersAvatarModule } from "ngx-letters-avatar"; import { PipesModule } from 'src/app/pipes/pipes.module'; +import { ChatPopoverPageModule } from '../chat-popover/chat-popover.module'; @NgModule({ imports: [ diff --git a/src/app/ui/chat/modal/group-messages/group-messages.page.ts b/src/app/ui/chat/modal/group-messages/group-messages.page.ts index 9a12a97ae..dad76e49b 100644 --- a/src/app/ui/chat/modal/group-messages/group-messages.page.ts +++ b/src/app/ui/chat/modal/group-messages/group-messages.page.ts @@ -2,8 +2,6 @@ import { Component, ElementRef, OnInit, ViewChild, AfterViewInit, OnDestroy, Cha import { ModalController, NavParams, PopoverController, Platform } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { ChatService } from 'src/app/services/chat.service'; -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 { GroupContactsPage } from './group-contacts/group-contacts.page'; import { Router } from '@angular/router' import { EditGroupPage } from '../edit-group/edit-group.page'; @@ -36,6 +34,8 @@ import { sanitize } from "sanitize-filename-ts"; import { FilePicker } from '@capawesome/capacitor-file-picker'; import { ViewDocumentSecondOptionsPage } from 'src/app/modals/view-document-second-options/view-document-second-options.page'; import { NewEventPage } from 'src/app/pages/agenda/new-event/new-event.page'; +import { ChatPopoverPage } from '../chat-popover/chat-popover.page'; +import { ChatOptionsPopoverPage } from '../chat-options-popover/chat-options-popover.page'; @Component({ selector: 'app-group-messages', diff --git a/src/app/shared/popover/messages-options/messages-options-routing.module.ts b/src/app/ui/chat/modal/messages-options/messages-options-routing.module.ts similarity index 100% rename from src/app/shared/popover/messages-options/messages-options-routing.module.ts rename to src/app/ui/chat/modal/messages-options/messages-options-routing.module.ts diff --git a/src/app/shared/popover/messages-options/messages-options.module.ts b/src/app/ui/chat/modal/messages-options/messages-options.module.ts similarity index 100% rename from src/app/shared/popover/messages-options/messages-options.module.ts rename to src/app/ui/chat/modal/messages-options/messages-options.module.ts diff --git a/src/app/shared/popover/messages-options/messages-options.page.html b/src/app/ui/chat/modal/messages-options/messages-options.page.html similarity index 100% rename from src/app/shared/popover/messages-options/messages-options.page.html rename to src/app/ui/chat/modal/messages-options/messages-options.page.html diff --git a/src/app/shared/popover/messages-options/messages-options.page.scss b/src/app/ui/chat/modal/messages-options/messages-options.page.scss similarity index 100% rename from src/app/shared/popover/messages-options/messages-options.page.scss rename to src/app/ui/chat/modal/messages-options/messages-options.page.scss diff --git a/src/app/shared/popover/messages-options/messages-options.page.spec.ts b/src/app/ui/chat/modal/messages-options/messages-options.page.spec.ts similarity index 100% rename from src/app/shared/popover/messages-options/messages-options.page.spec.ts rename to src/app/ui/chat/modal/messages-options/messages-options.page.spec.ts diff --git a/src/app/shared/popover/messages-options/messages-options.page.ts b/src/app/ui/chat/modal/messages-options/messages-options.page.ts similarity index 100% rename from src/app/shared/popover/messages-options/messages-options.page.ts rename to src/app/ui/chat/modal/messages-options/messages-options.page.ts diff --git a/src/app/ui/chat/modal/messages/messages.page.ts b/src/app/ui/chat/modal/messages/messages.page.ts index 446fa2a3b..fe454378c 100644 --- a/src/app/ui/chat/modal/messages/messages.page.ts +++ b/src/app/ui/chat/modal/messages/messages.page.ts @@ -8,8 +8,6 @@ import { ContactsPage } from 'src/app/ui/chat/modal/messages/contacts/contacts.p import { AlertService } from 'src/app/services/alert.service'; import { FileService } from 'src/app/services/functions/file.service'; import { ToastService } from 'src/app/services/toast.service'; -import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page'; -import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page'; import { ChatMessageStore } from 'src/app/store/chat/chat-message.service'; import { ChatUserStorage } from 'src/app/store/chat/chat-user.service'; import { ThemeService } from 'src/app/services/theme.service' @@ -48,6 +46,8 @@ import { FilePickerService } from 'src/app/infra/file-picker/file-picker.service import { FilePickerMobileService } from 'src/app/infra/file-picker/mobile/file-picker-mobile.service' import { RecordingData } from 'capacitor-voice-recorder'; import { Logger } from 'src/app/services/logger/main/service'; +import { MessagesOptionsPage } from '../messages-options/messages-options.page'; +import { ChatOptionsPopoverPage } from '../chat-options-popover/chat-options-popover.page'; const IMAGE_DIR = 'stored-images';