From 6072a2456b0df3729f9d31d2807435d4a26871b6 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 16 Aug 2024 14:21:01 +0100 Subject: [PATCH] fix change folder path --- gabinete-digital-fo.code-workspace | 3 + src/app/app-routing.module.ts | 665 +++++++++--------- src/app/home/home-routing.module.ts | 14 +- .../dexie/dexie-repository.service.ts | 1 + .../chat/domain/mapper/messageMapper.ts | 4 +- .../message-create-use-case.service.ts | 10 +- src/app/pages/chat/chat-routing.module.ts | 37 - .../expediente-detail.page.ts | 2 +- .../pedidos/pedido/pedido.page.ts | 2 +- .../opts-expediente/opts-expediente.page.ts | 2 +- .../request-options/request-options.page.ts | 12 +- src/app/ui/chat/chat-routing.module.ts | 34 + src/app/{pages => ui}/chat/chat.module.ts | 15 +- src/app/{pages => ui}/chat/chat.page.html | 1 - src/app/{pages => ui}/chat/chat.page.scss | 0 src/app/{pages => ui}/chat/chat.page.spec.ts | 0 src/app/{pages => ui}/chat/chat.page.ts | 132 +--- .../add-user/add-user-routing.module.ts | 0 .../component}/add-user/add-user.module.ts | 0 .../component}/add-user/add-user.page.html | 0 .../component}/add-user/add-user.page.scss | 0 .../component}/add-user/add-user.page.spec.ts | 0 .../chat/component}/add-user/add-user.page.ts | 0 .../edit-group/edit-group-routing.module.ts | 0 .../edit-group/edit-group.module.ts | 4 +- .../edit-group/edit-group.page.html | 0 .../edit-group/edit-group.page.scss | 0 .../edit-group/edit-group.page.spec.ts | 0 .../component}/edit-group/edit-group.page.ts | 0 .../empty-chat/empty-chat-routing.module.ts | 0 .../empty-chat/empty-chat.module.ts | 0 .../empty-chat/empty-chat.page.html | 0 .../empty-chat/empty-chat.page.scss | 0 .../empty-chat/empty-chat.page.spec.ts | 0 .../component}/empty-chat/empty-chat.page.ts | 0 .../group-contacts-routing.module.ts | 0 .../group-contacts/group-contacts.module.ts | 0 .../group-contacts/group-contacts.page.html | 0 .../group-contacts/group-contacts.page.scss | 0 .../group-contacts.page.spec.ts | 0 .../group-contacts/group-contacts.page.ts | 0 .../group-messages-routing.module.ts | 0 .../group-messages/group-messages.module.ts | 5 +- .../group-messages/group-messages.page.html | 0 .../group-messages/group-messages.page.scss | 0 .../group-messages.page.spec.ts | 0 .../group-messages/group-messages.page.ts | 2 +- .../contacts/contacts-routing.module.ts | 0 .../messages/contacts/contacts.module.ts | 0 .../messages/contacts/contacts.page.html | 0 .../messages/contacts/contacts.page.scss | 0 .../messages/contacts/contacts.page.spec.ts | 0 .../messages/contacts/contacts.page.ts | 0 .../messages/messages-routing.module.ts | 0 .../component}/messages/messages.module.ts | 0 .../component}/messages/messages.page.html | 0 .../component}/messages/messages.page.scss | 0 .../component}/messages/messages.page.spec.ts | 0 .../chat/component}/messages/messages.page.ts | 4 +- .../contacts/contacts-routing.module.ts | 0 .../new-group/contacts/contacts.module.ts | 0 .../new-group/contacts/contacts.page.html | 0 .../new-group/contacts/contacts.page.scss | 0 .../new-group/contacts/contacts.page.spec.ts | 0 .../new-group/contacts/contacts.page.ts | 0 .../new-group/new-group-routing.module.ts | 0 .../component}/new-group/new-group.module.ts | 0 .../component}/new-group/new-group.page.html | 0 .../component}/new-group/new-group.page.scss | 0 .../new-group/new-group.page.spec.ts | 0 .../component}/new-group/new-group.page.ts | 0 .../edit-group/edit-group-routing.module.ts | 0 .../modal}/edit-group/edit-group.module.ts | 0 .../modal}/edit-group/edit-group.page.html | 0 .../modal}/edit-group/edit-group.page.scss | 0 .../modal}/edit-group/edit-group.page.spec.ts | 0 .../chat/modal}/edit-group/edit-group.page.ts | 0 .../group-contacts-routing.module.ts | 0 .../group-contacts/group-contacts.module.ts | 0 .../group-contacts/group-contacts.page.html | 0 .../group-contacts/group-contacts.page.scss | 0 .../group-contacts.page.spec.ts | 0 .../group-contacts/group-contacts.page.ts | 0 .../group-messages-routing.module.ts | 0 .../group-messages/group-messages.module.ts | 0 .../group-messages/group-messages.page.html | 0 .../group-messages/group-messages.page.scss | 0 .../group-messages.page.spec.ts | 0 .../group-messages/group-messages.page.ts | 2 +- .../contacts/contacts-routing.module.ts | 0 .../messages/contacts/contacts.module.ts | 0 .../messages/contacts/contacts.page.html | 0 .../messages/contacts/contacts.page.scss | 0 .../messages/contacts/contacts.page.spec.ts | 0 .../modal}/messages/contacts/contacts.page.ts | 0 .../messages/messages-routing.module.ts | 0 .../chat/modal}/messages/messages.module.ts | 0 .../chat/modal}/messages/messages.page.html | 0 .../chat/modal}/messages/messages.page.scss | 0 .../modal}/messages/messages.page.spec.ts | 0 .../chat/modal}/messages/messages.page.ts | 4 +- .../contacts/contacts-routing.module.ts | 0 .../new-group/contacts/contacts.module.ts | 0 .../new-group/contacts/contacts.page.html | 0 .../new-group/contacts/contacts.page.scss | 0 .../new-group/contacts/contacts.page.spec.ts | 0 .../new-group/contacts/contacts.page.ts | 0 .../new-group/new-group-routing.module.ts | 0 .../chat/modal}/new-group/new-group.module.ts | 0 .../chat/modal}/new-group/new-group.page.html | 0 .../chat/modal}/new-group/new-group.page.scss | 0 .../modal}/new-group/new-group.page.spec.ts | 0 .../chat/modal}/new-group/new-group.page.ts | 0 src/app/utils/stackTrace.ts | 4 + 114 files changed, 419 insertions(+), 540 deletions(-) delete mode 100644 src/app/pages/chat/chat-routing.module.ts create mode 100644 src/app/ui/chat/chat-routing.module.ts rename src/app/{pages => ui}/chat/chat.module.ts (66%) rename src/app/{pages => ui}/chat/chat.page.html (99%) rename src/app/{pages => ui}/chat/chat.page.scss (100%) rename src/app/{pages => ui}/chat/chat.page.spec.ts (100%) rename src/app/{pages => ui}/chat/chat.page.ts (75%) rename src/app/{shared/chat => ui/chat/component}/add-user/add-user-routing.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/add-user/add-user.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/add-user/add-user.page.html (100%) rename src/app/{shared/chat => ui/chat/component}/add-user/add-user.page.scss (100%) rename src/app/{shared/chat => ui/chat/component}/add-user/add-user.page.spec.ts (100%) rename src/app/{shared/chat => ui/chat/component}/add-user/add-user.page.ts (100%) rename src/app/{pages/chat => ui/chat/component}/edit-group/edit-group-routing.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/edit-group/edit-group.module.ts (80%) rename src/app/{shared/chat => ui/chat/component}/edit-group/edit-group.page.html (100%) rename src/app/{shared/chat => ui/chat/component}/edit-group/edit-group.page.scss (100%) rename src/app/{shared/chat => ui/chat/component}/edit-group/edit-group.page.spec.ts (100%) rename src/app/{shared/chat => ui/chat/component}/edit-group/edit-group.page.ts (100%) rename src/app/{shared/chat => ui/chat/component}/empty-chat/empty-chat-routing.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/empty-chat/empty-chat.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/empty-chat/empty-chat.page.html (100%) rename src/app/{shared/chat => ui/chat/component}/empty-chat/empty-chat.page.scss (100%) rename src/app/{shared/chat => ui/chat/component}/empty-chat/empty-chat.page.spec.ts (100%) rename src/app/{shared/chat => ui/chat/component}/empty-chat/empty-chat.page.ts (100%) rename src/app/{pages/chat => ui/chat/component}/group-messages/group-contacts/group-contacts-routing.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/group-messages/group-contacts/group-contacts.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/group-messages/group-contacts/group-contacts.page.html (100%) rename src/app/{shared/chat => ui/chat/component}/group-messages/group-contacts/group-contacts.page.scss (100%) rename src/app/{pages/chat => ui/chat/component}/group-messages/group-contacts/group-contacts.page.spec.ts (100%) rename src/app/{shared/chat => ui/chat/component}/group-messages/group-contacts/group-contacts.page.ts (100%) rename src/app/{pages/chat => ui/chat/component}/group-messages/group-messages-routing.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/group-messages/group-messages.module.ts (83%) rename src/app/{shared/chat => ui/chat/component}/group-messages/group-messages.page.html (100%) rename src/app/{shared/chat => ui/chat/component}/group-messages/group-messages.page.scss (100%) rename src/app/{pages/chat => ui/chat/component}/group-messages/group-messages.page.spec.ts (100%) rename src/app/{shared/chat => ui/chat/component}/group-messages/group-messages.page.ts (99%) rename src/app/{pages/chat => ui/chat/component}/messages/contacts/contacts-routing.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/messages/contacts/contacts.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/messages/contacts/contacts.page.html (100%) rename src/app/{shared/chat => ui/chat/component}/messages/contacts/contacts.page.scss (100%) rename src/app/{pages/chat => ui/chat/component}/messages/contacts/contacts.page.spec.ts (100%) rename src/app/{shared/chat => ui/chat/component}/messages/contacts/contacts.page.ts (100%) rename src/app/{pages/chat => ui/chat/component}/messages/messages-routing.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/messages/messages.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/messages/messages.page.html (100%) rename src/app/{shared/chat => ui/chat/component}/messages/messages.page.scss (100%) rename src/app/{pages/chat => ui/chat/component}/messages/messages.page.spec.ts (100%) rename src/app/{shared/chat => ui/chat/component}/messages/messages.page.ts (99%) rename src/app/{pages/chat => ui/chat/component}/new-group/contacts/contacts-routing.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/new-group/contacts/contacts.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/new-group/contacts/contacts.page.html (100%) rename src/app/{shared/chat => ui/chat/component}/new-group/contacts/contacts.page.scss (100%) rename src/app/{pages/chat => ui/chat/component}/new-group/contacts/contacts.page.spec.ts (100%) rename src/app/{shared/chat => ui/chat/component}/new-group/contacts/contacts.page.ts (100%) rename src/app/{pages/chat => ui/chat/component}/new-group/new-group-routing.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/new-group/new-group.module.ts (100%) rename src/app/{shared/chat => ui/chat/component}/new-group/new-group.page.html (100%) rename src/app/{shared/chat => ui/chat/component}/new-group/new-group.page.scss (100%) rename src/app/{pages/chat => ui/chat/component}/new-group/new-group.page.spec.ts (100%) rename src/app/{shared/chat => ui/chat/component}/new-group/new-group.page.ts (100%) rename src/app/{shared/chat => ui/chat/modal}/edit-group/edit-group-routing.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/edit-group/edit-group.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/edit-group/edit-group.page.html (100%) rename src/app/{pages/chat => ui/chat/modal}/edit-group/edit-group.page.scss (100%) rename src/app/{pages/chat => ui/chat/modal}/edit-group/edit-group.page.spec.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/edit-group/edit-group.page.ts (100%) rename src/app/{shared/chat => ui/chat/modal}/group-messages/group-contacts/group-contacts-routing.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/group-messages/group-contacts/group-contacts.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/group-messages/group-contacts/group-contacts.page.html (100%) rename src/app/{pages/chat => ui/chat/modal}/group-messages/group-contacts/group-contacts.page.scss (100%) rename src/app/{shared/chat => ui/chat/modal}/group-messages/group-contacts/group-contacts.page.spec.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/group-messages/group-contacts/group-contacts.page.ts (100%) rename src/app/{shared/chat => ui/chat/modal}/group-messages/group-messages-routing.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/group-messages/group-messages.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/group-messages/group-messages.page.html (100%) rename src/app/{pages/chat => ui/chat/modal}/group-messages/group-messages.page.scss (100%) rename src/app/{shared/chat => ui/chat/modal}/group-messages/group-messages.page.spec.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/group-messages/group-messages.page.ts (99%) rename src/app/{shared/chat => ui/chat/modal}/messages/contacts/contacts-routing.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/messages/contacts/contacts.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/messages/contacts/contacts.page.html (100%) rename src/app/{pages/chat => ui/chat/modal}/messages/contacts/contacts.page.scss (100%) rename src/app/{shared/chat => ui/chat/modal}/messages/contacts/contacts.page.spec.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/messages/contacts/contacts.page.ts (100%) rename src/app/{shared/chat => ui/chat/modal}/messages/messages-routing.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/messages/messages.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/messages/messages.page.html (100%) rename src/app/{pages/chat => ui/chat/modal}/messages/messages.page.scss (100%) rename src/app/{shared/chat => ui/chat/modal}/messages/messages.page.spec.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/messages/messages.page.ts (99%) rename src/app/{shared/chat => ui/chat/modal}/new-group/contacts/contacts-routing.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/new-group/contacts/contacts.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/new-group/contacts/contacts.page.html (100%) rename src/app/{pages/chat => ui/chat/modal}/new-group/contacts/contacts.page.scss (100%) rename src/app/{shared/chat => ui/chat/modal}/new-group/contacts/contacts.page.spec.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/new-group/contacts/contacts.page.ts (100%) rename src/app/{shared/chat => ui/chat/modal}/new-group/new-group-routing.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/new-group/new-group.module.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/new-group/new-group.page.html (100%) rename src/app/{pages/chat => ui/chat/modal}/new-group/new-group.page.scss (100%) rename src/app/{shared/chat => ui/chat/modal}/new-group/new-group.page.spec.ts (100%) rename src/app/{pages/chat => ui/chat/modal}/new-group/new-group.page.ts (100%) create mode 100644 src/app/utils/stackTrace.ts diff --git a/gabinete-digital-fo.code-workspace b/gabinete-digital-fo.code-workspace index 1911f5b96..b5a8239b8 100644 --- a/gabinete-digital-fo.code-workspace +++ b/gabinete-digital-fo.code-workspace @@ -25,6 +25,9 @@ }, { "path": "../sqlCliente" + }, + { + "path": "../sentry" } ], "settings": { diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 930f5c194..f9f765e9c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,336 +1,337 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; - -const routes = [ - { - path: '', - loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) - }, - { - path: '', - loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) - }, - { - path: 'empty-chat', - loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) - }, - { - path: 'empty-container', - loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) - }, - { - path: 'events-to-approve', - loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) - }, - { - path: 'expedients', - loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) - }, - { - path: 'document-detail', - loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) - }, - { - path: 'edit-group', - loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule) - }, - { - path: 'pedidos', - loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) - }, - { - path: 'event-list', - loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) - }, - { - path: 'despachos', - loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) - }, - { - path: 'create-process', - loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) - }, - { - path: 'pendentes', - loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) - }, - { - path: 'delegar', - loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) - }, - { - path: 'add-note', - loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) - }, - { - path: 'dar-parecer', - loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) - }, - { - path: 'opts-expediente', - loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) - }, - { - path: 'despachos-pr', - loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) - }, - { - path: 'diplomas', - loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) - }, - { - path: 'expedientes-pr', - loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) - }, - { - path: 'diplomas-assinar', - loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) - }, - { - path: 'opts-expediente-pr', - loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) - }, - { - path: 'despachos-options', - loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) - }, - { - path: 'despachos-pr-options', - loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) - }, - { - path: 'deploma-options', - loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) - }, - { - path: 'pin', - loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) - }, - { - path: 'fingerprint', - loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) - }, - { - path: 'new-event', - loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule) - }, - { - path: 'event-list', - loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule) - }, - { - path: 'approve-event', - loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule) - }, - { - path: 'bad-request', - loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule) - }, - { - path: 'success-message', - loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule) - }, - { - path: 'forward', - loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule) - }, - { - path: 'edit-event-to-approve', - loadChildren: () => import('./shared/agenda/edit-event-to-approve/edit-event-to-approve.module').then( m => m.EditEventToApprovePageModule) - }, - { - path: 'actions-options', - loadChildren: () => import('./shared/popover/actions-options/actions-options.module').then( m => m.ActionsOptionsPageModule) - }, - { - path: 'edit-action', - loadChildren: () => import('./shared/publication/edit-action/edit-action.module').then( m => m.EditActionPageModule) - }, - { - path: 'eliminate-event', - loadChildren: () => import('./modals/eliminate-event/eliminate-event.module').then( m => m.EliminateEventPageModule) - }, - { - path: 'inactivity', - loadChildren: () => import('./pages/inactivity/inactivity.module').then( m => m.InactivityPageModule) - }, - { - path: 'document-set-up-meeting', - loadChildren: () => import('./modals/document-set-up-meeting/document-set-up-meeting.module').then( m => m.DocumentSetUpMeetingPageModule) - }, - { - path: 'profile', - loadChildren: () => import('./modals/profile/profile.module').then( m => m.ProfilePageModule) - }, - { - path: 'all-processes', - loadChildren: () => import('./shared/gabinete-digital/all-processes/all-processes.module').then( m => m.AllProcessesPageModule) - }, - { - path: 'searched-document-options', - loadChildren: () => import('./shared/popover/searched-document-options/searched-document-options.module').then( m => m.SearchedDocumentOptionsPageModule) - }, - { - path: 'task-list', - loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule) - }, - { - path: 'task-list', - loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule) - }, - { - path: 'task-detailde', - loadChildren: () => import('./shared/gabinete-digital/generic/task-detailde/task-detailde.module').then( m => m.TaskDetaildePageModule) - }, - { - path: 'task-details', - loadChildren: () => import('./shared/gabinete-digital/generic/task-details/task-details.module').then( m => m.TaskDetailsPageModule) - }, - { - path: 'chat-options-features', - loadChildren: () => import('./modals/chat-options-features/chat-options-features.module').then( m => m.ChatOptionsFeaturesPageModule) - }, - { - path: 'document-viewer', - loadChildren: () => import('./modals/document-viewer/document-viewer.module').then( m => m.DocumentViewerPageModule) - }, - { - path: 'view-document', - loadChildren: () => import('./modals/view-document/view-document.module').then( m => m.ViewDocumentPageModule) - }, - { - path: 'event-details-documents-options', - loadChildren: () => import('./shared/popover/event-details-documents-options/event-details-documents-options.module').then( m => m.EventDetailsDocumentsOptionsPageModule) - }, - { - path: 'preview-camera', - loadChildren: () => import('./modals/preview-camera/preview-camera.module').then( m => m.PreviewCameraPageModule) - }, - { - path: 'group-icons', - loadChildren: () => import('./modals/group-icons/group-icons.module').then( m => m.GroupIconsPageModule) - }, - { - path: 'video-allowed', - loadChildren: () => import('./modals/video-allowed/video-allowed.module').then( m => m.VideoAllowedPageModule) - }, - { - path: 'preview-photo', - loadChildren: () => import('./modals/preview-photo/preview-photo.module').then( m => m.PreviewPhotoPageModule) - }, - { - path: 'custom-image-cache', - loadChildren: () => import('./services/file/custom-image-cache/custom-image-cache.module').then( m => m.CustomImageCachePageModule) - }, - { - path: 'view-media', - loadChildren: () => import('./modals/view-media/view-media.module').then( m => m.ViewMediaPageModule) - }, - { - path: 'view-event', - loadChildren: () => import('./modals/view-event/view-event.module').then( m => m.ViewEventPageModule) - }, - { - path: 'previewer', - loadChildren: () => import('./modals/previewer/previewer.module').then( m => m.PreviewerPageModule) - }, - { - path: 'set-room-owner', - loadChildren: () => import('./modals/set-room-owner/set-room-owner.module').then( m => m.SetRoomOwnerPageModule) - }, - { - path: 'diplomas-gerar', - loadChildren: () => import('./shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module').then( m => m.DiplomasGerarPageModule) - }, - { - 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('./shared/chat/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) - }, - { - path: 'task-list-header', - loadChildren: () => import('./shared/gabinete-digital/generic/task-list-header/task-list-header.module').then( m => m.TaskListHeaderPageModule) - }, - { - path: 'tiny-mce', - loadChildren: () => import('./tiny-mce/tiny-mce.module').then( m => m.TinyMCEPageModule) - }, - { - path: 'task-detail-content', - loadChildren: () => import('./shared/gabinete-digital/generic/task-detail-content/task-detail-content.module').then( m => m.TaskDetailContentPageModule) - }, - { - path: 'task-detail-header', - loadChildren: () => import('./shared/gabinete-digital/generic/task-detail-header/task-detail-header.module').then( m => m.TaskDetailHeaderPageModule) - }, - { - path: 'ask-modal', - loadChildren: () => import('./modals/ask-modal/ask-modal.module').then( m => m.AskModalPageModule) - }, - { - path: 'popup-question', - loadChildren: () => import('./modals/popup-question/popup-question.module').then( m => m.PopupQuestionPageModule) - }, - { - path: 'swiper', - loadChildren: () => import('./shared/swiper/swiper.module').then( m => m.SwiperPageModule) - }, - { - path: 'not-found', - loadChildren: () => import('./pages/not-found/not-found.module').then( m => m.NotFoundPageModule) - }, - { - path: 'view-document-second-options', - loadChildren: () => import('./modals/view-document-second-options/view-document-second-options.module').then( m => m.ViewDocumentSecondOptionsPageModule) - }, - { - path: 'crop-image', - loadChildren: () => import('./modals/crop-image/crop-image.module').then( m => m.CropImagePageModule) - }, { +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; + +const routes = [ + { + path: '', + loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) + }, + { + 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) + }, + { + path: 'events-to-approve', + loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) + }, + { + path: 'expedients', + loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) + }, + { + 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) + }, + { + path: 'event-list', + loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) + }, + { + path: 'despachos', + loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) + }, + { + path: 'create-process', + loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) + }, + { + path: 'pendentes', + loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) + }, + { + path: 'delegar', + loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) + }, + { + path: 'add-note', + loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) + }, + { + path: 'dar-parecer', + loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) + }, + { + path: 'opts-expediente', + loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) + }, + { + path: 'despachos-pr', + loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) + }, + { + path: 'diplomas', + loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) + }, + { + path: 'expedientes-pr', + loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) + }, + { + path: 'diplomas-assinar', + loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) + }, + { + path: 'opts-expediente-pr', + loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) + }, + { + path: 'despachos-options', + loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) + }, + { + path: 'despachos-pr-options', + loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) + }, + { + path: 'deploma-options', + loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) + }, + { + path: 'pin', + loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) + }, + { + path: 'fingerprint', + loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) + }, + { + path: 'new-event', + loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule) + }, + { + path: 'event-list', + loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule) + }, + { + path: 'approve-event', + loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule) + }, + { + path: 'bad-request', + loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule) + }, + { + path: 'success-message', + loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule) + }, + { + path: 'forward', + loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule) + }, + { + path: 'edit-event-to-approve', + loadChildren: () => import('./shared/agenda/edit-event-to-approve/edit-event-to-approve.module').then( m => m.EditEventToApprovePageModule) + }, + { + path: 'actions-options', + loadChildren: () => import('./shared/popover/actions-options/actions-options.module').then( m => m.ActionsOptionsPageModule) + }, + { + path: 'edit-action', + loadChildren: () => import('./shared/publication/edit-action/edit-action.module').then( m => m.EditActionPageModule) + }, + { + path: 'eliminate-event', + loadChildren: () => import('./modals/eliminate-event/eliminate-event.module').then( m => m.EliminateEventPageModule) + }, + { + path: 'inactivity', + loadChildren: () => import('./pages/inactivity/inactivity.module').then( m => m.InactivityPageModule) + }, + { + path: 'document-set-up-meeting', + loadChildren: () => import('./modals/document-set-up-meeting/document-set-up-meeting.module').then( m => m.DocumentSetUpMeetingPageModule) + }, + { + path: 'profile', + loadChildren: () => import('./modals/profile/profile.module').then( m => m.ProfilePageModule) + }, + { + path: 'all-processes', + loadChildren: () => import('./shared/gabinete-digital/all-processes/all-processes.module').then( m => m.AllProcessesPageModule) + }, + { + path: 'searched-document-options', + loadChildren: () => import('./shared/popover/searched-document-options/searched-document-options.module').then( m => m.SearchedDocumentOptionsPageModule) + }, + { + path: 'task-list', + loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule) + }, + { + path: 'task-list', + loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule) + }, + { + path: 'task-detailde', + loadChildren: () => import('./shared/gabinete-digital/generic/task-detailde/task-detailde.module').then( m => m.TaskDetaildePageModule) + }, + { + path: 'task-details', + loadChildren: () => import('./shared/gabinete-digital/generic/task-details/task-details.module').then( m => m.TaskDetailsPageModule) + }, + { + path: 'chat-options-features', + loadChildren: () => import('./modals/chat-options-features/chat-options-features.module').then( m => m.ChatOptionsFeaturesPageModule) + }, + { + path: 'document-viewer', + loadChildren: () => import('./modals/document-viewer/document-viewer.module').then( m => m.DocumentViewerPageModule) + }, + { + path: 'view-document', + loadChildren: () => import('./modals/view-document/view-document.module').then( m => m.ViewDocumentPageModule) + }, + { + path: 'event-details-documents-options', + loadChildren: () => import('./shared/popover/event-details-documents-options/event-details-documents-options.module').then( m => m.EventDetailsDocumentsOptionsPageModule) + }, + { + path: 'preview-camera', + loadChildren: () => import('./modals/preview-camera/preview-camera.module').then( m => m.PreviewCameraPageModule) + }, + { + path: 'group-icons', + loadChildren: () => import('./modals/group-icons/group-icons.module').then( m => m.GroupIconsPageModule) + }, + { + path: 'video-allowed', + loadChildren: () => import('./modals/video-allowed/video-allowed.module').then( m => m.VideoAllowedPageModule) + }, + { + path: 'preview-photo', + loadChildren: () => import('./modals/preview-photo/preview-photo.module').then( m => m.PreviewPhotoPageModule) + }, + { + path: 'custom-image-cache', + loadChildren: () => import('./services/file/custom-image-cache/custom-image-cache.module').then( m => m.CustomImageCachePageModule) + }, + { + path: 'view-media', + loadChildren: () => import('./modals/view-media/view-media.module').then( m => m.ViewMediaPageModule) + }, + { + path: 'view-event', + loadChildren: () => import('./modals/view-event/view-event.module').then( m => m.ViewEventPageModule) + }, + { + path: 'previewer', + loadChildren: () => import('./modals/previewer/previewer.module').then( m => m.PreviewerPageModule) + }, + { + path: 'set-room-owner', + loadChildren: () => import('./modals/set-room-owner/set-room-owner.module').then( m => m.SetRoomOwnerPageModule) + }, + { + path: 'diplomas-gerar', + loadChildren: () => import('./shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module').then( m => m.DiplomasGerarPageModule) + }, + { + 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) + }, + { + path: 'task-list-header', + loadChildren: () => import('./shared/gabinete-digital/generic/task-list-header/task-list-header.module').then( m => m.TaskListHeaderPageModule) + }, + { + path: 'tiny-mce', + loadChildren: () => import('./tiny-mce/tiny-mce.module').then( m => m.TinyMCEPageModule) + }, + { + path: 'task-detail-content', + loadChildren: () => import('./shared/gabinete-digital/generic/task-detail-content/task-detail-content.module').then( m => m.TaskDetailContentPageModule) + }, + { + path: 'task-detail-header', + loadChildren: () => import('./shared/gabinete-digital/generic/task-detail-header/task-detail-header.module').then( m => m.TaskDetailHeaderPageModule) + }, + { + path: 'ask-modal', + loadChildren: () => import('./modals/ask-modal/ask-modal.module').then( m => m.AskModalPageModule) + }, + { + path: 'popup-question', + loadChildren: () => import('./modals/popup-question/popup-question.module').then( m => m.PopupQuestionPageModule) + }, + { + path: 'swiper', + loadChildren: () => import('./shared/swiper/swiper.module').then( m => m.SwiperPageModule) + }, + { + path: 'not-found', + loadChildren: () => import('./pages/not-found/not-found.module').then( m => m.NotFoundPageModule) + }, + { + path: 'view-document-second-options', + loadChildren: () => import('./modals/view-document-second-options/view-document-second-options.module').then( m => m.ViewDocumentSecondOptionsPageModule) + }, + { + path: 'crop-image', + loadChildren: () => import('./modals/crop-image/crop-image.module').then( m => m.CropImagePageModule) + }, + { path: 'edit-message', loadChildren: () => import('./modals/edit-message/edit-message.module').then( m => m.EditMessagePageModule) } - - /* - path: 'chat', - component: ChatPage - } */ - - /* - path: 'chat', - component: ChatPage - } */ - -]; -@NgModule({ - imports: [ - RouterModule.forRoot(routes, - { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule {} + + /* + path: 'chat', + component: ChatPage + } */ + + /* + path: 'chat', + component: ChatPage + } */ + +]; +@NgModule({ + imports: [ + RouterModule.forRoot(routes, + { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 26bc914d7..e3dcc04ff 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -3,11 +3,11 @@ import { Routes, RouterModule } from '@angular/router'; import { AuthGuard } from '../guards/auth.guard'; import { InactivityGuard } from '../guards/inactivity.guard'; import { AgendaPageModule } from '../pages/agenda/agenda.module'; -import { ChatPageModule } from '../pages/chat/chat.module'; import { EventsPageModule } from '../pages/events/events.module'; import { GabineteDigitalPageModule } from '../pages/gabinete-digital/gabinete-digital.module'; import { PublicationsPageModule } from '../pages/publications/publications.module'; import { HomePage } from './home.page'; +import { ChatPageModule } from '../ui/chat/chat.module'; const routes: Routes = [ { @@ -331,15 +331,15 @@ const routes: Routes = [ children: [ { path:':roomId', - loadChildren: ()=> import('../pages/chat/messages/messages.module').then(m => m.MessagesPageModule) + loadChildren: ()=> import('../ui/chat/modal/messages/messages.module').then(m => m.MessagesPageModule) }, { path:'contacts', - loadChildren: ()=> import('../shared/chat/messages/contacts/contacts.module').then(m => m.ContactsPageModule) + loadChildren: ()=> import('../ui/chat/component/messages/contacts/contacts.module').then(m => m.ContactsPageModule) }, { path:'contacts', - loadChildren: ()=> import('../pages/chat/messages/contacts/contacts.module').then(m => m.ContactsPageModule) + loadChildren: ()=> import('../ui/chat/modal/messages/contacts/contacts.module').then(m => m.ContactsPageModule) }, ] }, @@ -348,15 +348,15 @@ const routes: Routes = [ children:[ { path:'', - loadChildren: ()=> import('../pages/chat/group-messages/group-messages.module').then(m => m.GroupMessagesPageModule) + loadChildren: ()=> import('../ui/chat/modal/group-messages/group-messages.module').then(m => m.GroupMessagesPageModule) }, { path:'group-contacts', - loadChildren: ()=> import('../shared/chat/group-messages/group-contacts/group-contacts.module').then(m => m.GroupContactsPageModule) + loadChildren: ()=> import('../ui/chat/component/group-messages/group-contacts/group-contacts.module').then(m => m.GroupContactsPageModule) }, { path:'group-contacts', - loadChildren: ()=> import('../pages/chat/group-messages/group-contacts/group-contacts.module').then(m => m.GroupContactsPageModule) + loadChildren: ()=> import('../ui/chat/modal/group-messages/group-contacts/group-contacts.module').then(m => m.GroupContactsPageModule) }, ] }, diff --git a/src/app/infra/repository/dexie/dexie-repository.service.ts b/src/app/infra/repository/dexie/dexie-repository.service.ts index 5a97c8fcb..ac13f2a88 100644 --- a/src/app/infra/repository/dexie/dexie-repository.service.ts +++ b/src/app/infra/repository/dexie/dexie-repository.service.ts @@ -99,6 +99,7 @@ export class DexieRepository { const document = await this.table.where(filter).first(); return ok(document); } catch (error) { + console.log(filter) return err(new Error('Failed to find document: ' + error.message)); } } diff --git a/src/app/module/chat/domain/mapper/messageMapper.ts b/src/app/module/chat/domain/mapper/messageMapper.ts index a9598c30e..d70f1ae93 100644 --- a/src/app/module/chat/domain/mapper/messageMapper.ts +++ b/src/app/module/chat/domain/mapper/messageMapper.ts @@ -23,8 +23,8 @@ export class MessageMapper { source: e.source, file: e.file, fileName: e.fileName, - applicationId: e.applicationId, - docId: Number(e.docId), + applicationId: e.applicationId || 0, + docId: Number(e.docId) || 0, mimeType: e.mimeType }))[0] diff --git a/src/app/module/chat/domain/use-case/message-create-use-case.service.ts b/src/app/module/chat/domain/use-case/message-create-use-case.service.ts index 9de7dcd4e..d3194d563 100644 --- a/src/app/module/chat/domain/use-case/message-create-use-case.service.ts +++ b/src/app/module/chat/domain/use-case/message-create-use-case.service.ts @@ -1,12 +1,11 @@ import { Injectable } from '@angular/core'; import { MessageEntity, MessageEntitySchema, } from '../entity/message'; -import { MessageRepositoryService } from "src/app/module/chat/data/repository/message-respository.service" -import { AttachmentRepositoryService } from "src/app/module/chat/data/repository/attachment-repository.service" -import { z, ZodError } from 'zod'; -import { v4 as uuidv4 } from 'uuid' +import { MessageRepositoryService } from "src/app/module/chat/data/repository/message-respository.service"; +import { AttachmentRepositoryService } from "src/app/module/chat/data/repository/attachment-repository.service"; +import { z } from 'zod'; +import { v4 as uuidv4 } from 'uuid'; import { InstanceId } from '../chat-service.service'; import { createDataURL } from 'src/app/utils/ToBase64'; -import { DomSanitizer } from '@angular/platform-browser'; import { zodSafeValidation } from 'src/app/utils/zodValidation'; import { Logger } from 'src/app/services/logger/main/service'; import { MessageAttachmentSource } from '../../data/dto/message/messageOutputDTO'; @@ -46,7 +45,6 @@ export class MessageCreateUseCaseService { for (const attachment of message.attachments) { - console.log(attachment) if(attachment.source != MessageAttachmentSource.Webtrix) { this.AttachmentRepositoryService.create({ diff --git a/src/app/pages/chat/chat-routing.module.ts b/src/app/pages/chat/chat-routing.module.ts deleted file mode 100644 index 4d1596c1b..000000000 --- a/src/app/pages/chat/chat-routing.module.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { ChatPage } from './chat.page'; -import { GroupMessagesPage } from './group-messages/group-messages.page'; -import { MessagesPage } from './messages/messages.page'; - -const routes: Routes = [ - { - path: '', - component: ChatPage, - }, - { - 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) - }, - { - path: 'messages', - outlet:'message', - loadChildren: () => import('./messages/messages.module').then( m => m.MessagesPageModule) - }, - { - path: 'edit-group', - loadChildren: () => import('./edit-group/edit-group.module').then( m => m.EditGroupPageModule) - } - -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class ChatPageRoutingModule {} diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 338a21563..b9661a1b8 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -22,7 +22,7 @@ import { ThemeService } from 'src/app/services/theme.service' import { EventTrigger } from 'src/app/services/eventTrigger.service'; import { Platform } from '@ionic/angular'; import { BackgroundService } from 'src/app/services/background.service'; -import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; +import { NewGroupPage } from 'src/app/ui/chat/modal/new-group/new-group.page'; import { DataService } from 'src/app/services/data.service'; import { RouteService } from 'src/app/services/route.service'; import { Storage } from '@ionic/storage'; diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 5b6e7f36c..d90913c4c 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -21,7 +21,7 @@ import { PermissionService } from 'src/app/services/permission.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; import { ThemeService } from 'src/app/services/theme.service' import { DataService } from 'src/app/services/data.service'; -import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; +import { NewGroupPage } from 'src/app/ui/chat/modal/new-group/new-group.page'; import { RouteService } from 'src/app/services/route.service'; import { SessionStore } from 'src/app/store/session.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 17ca22764..43edc9b50 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -15,7 +15,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { ExpedienteService } from 'src/app/Rules/expediente.service'; import { PermissionService } from 'src/app/services/permission.service'; import { ThemeService } from 'src/app/services/theme.service' -import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; +import { NewGroupPage } from 'src/app/ui/chat/modal/new-group/new-group.page'; import { RouteService } from 'src/app/services/route.service'; import { SessionStore } from 'src/app/store/session.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index 9a50c246a..4682c992e 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -10,7 +10,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; import { PedidoService } from 'src/app/Rules/pedido.service'; import { PermissionService } from 'src/app/services/permission.service'; -import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; +import { NewGroupPage } from 'src/app/ui/chat/modal/new-group/new-group.page'; import { ForwardPage } from 'src/app/modals/forward/forward.page'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; @@ -50,7 +50,7 @@ export class RequestOptionsPage implements OnInit { this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) { this.serialNumber = params["serialNumber"]; - // + // } }); @@ -67,7 +67,7 @@ export class RequestOptionsPage implements OnInit { } ngOnInit() { - + this.profile = "mdgpr"; window.onresize = (event) => { @@ -91,7 +91,7 @@ export class RequestOptionsPage implements OnInit { sendExpedienteToPending() { const loader = this.toastService.loading() this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ - + this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes') this.close(); loader.remove() @@ -187,9 +187,9 @@ export class RequestOptionsPage implements OnInit { }); modal.onDidDismiss().then(res=> { - + if(res['data']=='openDiscart') { - + } else { this.popoverController.dismiss('close') diff --git a/src/app/ui/chat/chat-routing.module.ts b/src/app/ui/chat/chat-routing.module.ts new file mode 100644 index 000000000..a3523e8aa --- /dev/null +++ b/src/app/ui/chat/chat-routing.module.ts @@ -0,0 +1,34 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ChatPage } from './chat.page'; +const routes: Routes = [ + { + path: '', + component: ChatPage, + }, + { + path: 'new-group', + loadChildren: () => import('./modal/new-group/new-group.module').then( m => m.NewGroupPageModule) + }, + { + path: 'group-messages', + loadChildren: () => import('./modal/group-messages/group-messages.module').then( m => m.GroupMessagesPageModule) + }, + { + path: 'messages', + outlet:'message', + loadChildren: () => import('./modal/messages/messages.module').then( m => m.MessagesPageModule) + }, + { + path: 'edit-group', + loadChildren: () => import('./modal/edit-group/edit-group.module').then( m => m.EditGroupPageModule) + } + +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ChatPageRoutingModule {} diff --git a/src/app/pages/chat/chat.module.ts b/src/app/ui/chat/chat.module.ts similarity index 66% rename from src/app/pages/chat/chat.module.ts rename to src/app/ui/chat/chat.module.ts index bbd84cba1..51add9843 100644 --- a/src/app/pages/chat/chat.module.ts +++ b/src/app/ui/chat/chat.module.ts @@ -9,18 +9,17 @@ import { ChatPageRoutingModule } from './chat-routing.module'; import { ChatPage } from './chat.page'; import { RouterModule } from '@angular/router'; import { PipesModule } from 'src/app/pipes/pipes.module'; - -import { ContactsPageModule } from 'src/app/shared/chat/messages/contacts/contacts.module'; -import { GroupMessagesPageModule } from 'src/app/shared/chat/group-messages/group-messages.module'; -import { NewGroupPageModule } from 'src/app/shared/chat/new-group/new-group.module'; -import { EditGroupPageModule } from 'src/app/shared/chat/edit-group/edit-group.module'; -import { GroupContactsPageModule } from 'src/app/shared/chat/group-messages/group-contacts/group-contacts.module'; -import { MessagesPageModule } from 'src/app/shared/chat/messages/messages.module'; -import { EmptyChatPageModule } from 'src/app/shared/chat/empty-chat/empty-chat.module'; import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.module'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { ImageCropperModule } from 'ngx-image-cropper'; +import { EmptyChatPageModule } from './component/empty-chat/empty-chat.module'; +import { EditGroupPageModule } from './component/edit-group/edit-group.module'; +import { GroupContactsPageModule } from './component/group-messages/group-contacts/group-contacts.module'; +import { GroupMessagesPageModule } from './component/group-messages/group-messages.module'; +import { MessagesPageModule } from './component/messages/messages.module'; +import { ContactsPageModule } from './component/new-group/contacts/contacts.module'; +import { NewGroupPageModule } from './component/new-group/new-group.module'; @NgModule({ imports: [ diff --git a/src/app/pages/chat/chat.page.html b/src/app/ui/chat/chat.page.html similarity index 99% rename from src/app/pages/chat/chat.page.html rename to src/app/ui/chat/chat.page.html index e06e6a283..c03347fd8 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/ui/chat/chat.page.html @@ -129,7 +129,6 @@ (closeAllDesktopComponents)="closeAllDesktopComponents()" (showEmptyContainer)="showEmptyContainer()" (showEmptyContainer)="showEmptyContainer()" - (openNewEventPage)="openNewEventPage($event)" (openGroupContacts)="openGroupContactsPage($event)" (openEditGroupPage)="openEditGroupPage($event)" diff --git a/src/app/pages/chat/chat.page.scss b/src/app/ui/chat/chat.page.scss similarity index 100% rename from src/app/pages/chat/chat.page.scss rename to src/app/ui/chat/chat.page.scss diff --git a/src/app/pages/chat/chat.page.spec.ts b/src/app/ui/chat/chat.page.spec.ts similarity index 100% rename from src/app/pages/chat/chat.page.spec.ts rename to src/app/ui/chat/chat.page.spec.ts diff --git a/src/app/pages/chat/chat.page.ts b/src/app/ui/chat/chat.page.ts similarity index 75% rename from src/app/pages/chat/chat.page.ts rename to src/app/ui/chat/chat.page.ts index f5b23acdb..21f44c978 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/ui/chat/chat.page.ts @@ -1,23 +1,15 @@ -import { HttpHeaders, HttpParams } from '@angular/common/http'; import { Component, OnInit, - ViewChild, - ViewContainerRef, - Output, } from '@angular/core'; import { ModalController } from '@ionic/angular'; import { ChatService } from 'src/app/services/chat.service'; -import { GroupMessagesPage } from './group-messages/group-messages.page'; -import { ContactsPage } from './messages/contacts/contacts.page'; -import { MessagesPage } from './messages/messages.page'; -import { NewGroupPage } from './new-group/new-group.page'; -import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page'; +import { GroupMessagesPage } from './modal/group-messages/group-messages.page'; +import { ContactsPage } from './modal/./messages/contacts/contacts.page'; +import { MessagesPage } from './modal/./messages/messages.page'; +import { NewGroupPage } from './modal/./new-group/new-group.page'; import { Observable, Subject } from "rxjs/Rx"; import { Router, NavigationEnd } from '@angular/router'; -import { EventPerson } from 'src/app/models/eventperson.model'; -import { removeDuplicate } from 'src/plugin/removeDuplicate.js' -import { environment } from 'src/environments/environment'; import { TimeService } from 'src/app/services/functions/time.service'; import { ThemeService } from 'src/app/services/theme.service' import { DataService } from 'src/app/services/data.service'; @@ -26,7 +18,7 @@ import { RoomRemoteDataSourceState } from 'src/app/module/chat/data/data-source/ import { RoomListOutPutDTO } from 'src/app/module/chat/data/dto/room/roomListOutputDTO'; import { RoomRepositoryService } from 'src/app/module/chat/data/repository/room-repository.service' import { Observable as DexieObservable } from 'Dexie'; -import { Logger } from 'src/app/services/logger/main/service'; +import { EditGroupPage } from './modal/edit-group/edit-group.page'; @Component({ selector: 'app-chat', @@ -36,34 +28,10 @@ import { Logger } from 'src/app/services/logger/main/service'; export class ChatPage implements OnInit { showLoader: boolean; - - headers: HttpHeaders; - options: any; - X_User_Id: any; - X_Auth_Token: any; - - loggedUser: any; segment: string = 'Grupos' - allGroups: any[]; - privateGroups: any[]; - userConnectedList: any[]; - userRooms: any[]; - userChannels: any[]; - userDirectMessages: any[]; - result: any; - dmUsers: any[] = []; idSelected: string; - desktopComponent: any = { - showMessages: false, - showGroupMessages: false, - } - - @ViewChild('messagecontainer', { read: ViewContainerRef }) entry: ViewContainerRef; - componentRef: any; - roomId: any; - task: any; groupRoomId: any; showEmptyComponent = true; showMessages = false; @@ -76,36 +44,15 @@ export class ChatPage implements OnInit { showAttendees = false; emptyTextDescription = 'Sem conversa selecionada'; - @Output() getRoomInfo; - - subject: any; public messages: Subject; - - message = { - "msg": "connect", - "version": "1", - "support": ["1"] - }; - - loggedUserChat: any; hideRefreshBtn = true; - taskParticipants: any = []; - taskParticipantsCc: any = []; - adding: "intervenient" | "CC" = "intervenient"; - profile: 'mdgpr' | 'pr'; - eventSelectedDate: Date = new Date(); - contacts: EventPerson[]; - showEventEditOrOpen: "edit" | "add" | "" | "eventoToApprove" = "" - socket: WebSocket; - receivedData: any; routerSubscription count$: Observable; items$!: DexieObservable; - constructor( private chatService: ChatService, private modalController: ModalController, @@ -117,7 +64,7 @@ export class ChatPage implements OnInit { private RoomRepositoryService: RoomRepositoryService, ) { - this.headers = new HttpHeaders(); + window.onresize = (event) => { if (window.innerWidth > 701) { this.modalController.dismiss(); @@ -367,65 +314,6 @@ export class ChatPage implements OnInit { } } - openNewEventPage(data?) { - - if (data) { - this.taskParticipants = data.members.map((val) => { - return { - Name: val.name, - EmailAddress: val.username + "@" + environment.domain, - IsRequired: "true", - } - }); - this.groupRoomId = data.roomId; - } - - this.closeAllDesktopComponents(); - if (window.innerWidth < 701) { - - } - else { - this.showNewEvent = true; - } - } - - async openAttendeesComponent(data) { - this.adding = data.type - this.closeAllDesktopComponents(); - this.showAttendees = true; - } - - async clearContact() { - this.contacts = []; - } - - async setContact(data: EventPerson[]) { - this.contacts = data; - } - - async setIntervenient(data) { - this.taskParticipants = removeDuplicate(data) - } - - async setIntervenientCC(data) { - this.taskParticipantsCc = removeDuplicate(data) - } - - async closeAttendeesComponent() { - this.closeAllDesktopComponents(); - this.showNewEvent = true; - } - - async closeNewEventComponent() { - this.closeAllDesktopComponents(); - this.showEmptyComponent = true; - this.idSelected = ""; - } - - async closeNewEventComponentAndOpenChat({ roomId }) { - this.closeAllDesktopComponents(); - - } doRefresh(event) { setTimeout(() => { @@ -435,14 +323,6 @@ export class ChatPage implements OnInit { }, 1000); } - customRoom() { - let params = new HttpParams(); - params = params.set("types", "c"); - this.chatService.customsRooms(params).subscribe(res => { - // - }); - } - showDateDuration(start: any) { return this.timeService.showDateDuration(start); diff --git a/src/app/shared/chat/add-user/add-user-routing.module.ts b/src/app/ui/chat/component/add-user/add-user-routing.module.ts similarity index 100% rename from src/app/shared/chat/add-user/add-user-routing.module.ts rename to src/app/ui/chat/component/add-user/add-user-routing.module.ts diff --git a/src/app/shared/chat/add-user/add-user.module.ts b/src/app/ui/chat/component/add-user/add-user.module.ts similarity index 100% rename from src/app/shared/chat/add-user/add-user.module.ts rename to src/app/ui/chat/component/add-user/add-user.module.ts diff --git a/src/app/shared/chat/add-user/add-user.page.html b/src/app/ui/chat/component/add-user/add-user.page.html similarity index 100% rename from src/app/shared/chat/add-user/add-user.page.html rename to src/app/ui/chat/component/add-user/add-user.page.html diff --git a/src/app/shared/chat/add-user/add-user.page.scss b/src/app/ui/chat/component/add-user/add-user.page.scss similarity index 100% rename from src/app/shared/chat/add-user/add-user.page.scss rename to src/app/ui/chat/component/add-user/add-user.page.scss diff --git a/src/app/shared/chat/add-user/add-user.page.spec.ts b/src/app/ui/chat/component/add-user/add-user.page.spec.ts similarity index 100% rename from src/app/shared/chat/add-user/add-user.page.spec.ts rename to src/app/ui/chat/component/add-user/add-user.page.spec.ts diff --git a/src/app/shared/chat/add-user/add-user.page.ts b/src/app/ui/chat/component/add-user/add-user.page.ts similarity index 100% rename from src/app/shared/chat/add-user/add-user.page.ts rename to src/app/ui/chat/component/add-user/add-user.page.ts diff --git a/src/app/pages/chat/edit-group/edit-group-routing.module.ts b/src/app/ui/chat/component/edit-group/edit-group-routing.module.ts similarity index 100% rename from src/app/pages/chat/edit-group/edit-group-routing.module.ts rename to src/app/ui/chat/component/edit-group/edit-group-routing.module.ts diff --git a/src/app/shared/chat/edit-group/edit-group.module.ts b/src/app/ui/chat/component/edit-group/edit-group.module.ts similarity index 80% rename from src/app/shared/chat/edit-group/edit-group.module.ts rename to src/app/ui/chat/component/edit-group/edit-group.module.ts index 7326f844f..c52b2527b 100644 --- a/src/app/shared/chat/edit-group/edit-group.module.ts +++ b/src/app/ui/chat/component/edit-group/edit-group.module.ts @@ -7,9 +7,7 @@ import { IonicModule } from '@ionic/angular'; import { EditGroupPageRoutingModule } from './edit-group-routing.module'; import { EditGroupPage } from './edit-group.page'; -import { SharedModule } from '../../shared.module'; - -import { BtnSeguintePageModule } from '../../btn-seguinte/btn-seguinte.module'; +import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module'; @NgModule({ imports: [ diff --git a/src/app/shared/chat/edit-group/edit-group.page.html b/src/app/ui/chat/component/edit-group/edit-group.page.html similarity index 100% rename from src/app/shared/chat/edit-group/edit-group.page.html rename to src/app/ui/chat/component/edit-group/edit-group.page.html diff --git a/src/app/shared/chat/edit-group/edit-group.page.scss b/src/app/ui/chat/component/edit-group/edit-group.page.scss similarity index 100% rename from src/app/shared/chat/edit-group/edit-group.page.scss rename to src/app/ui/chat/component/edit-group/edit-group.page.scss diff --git a/src/app/shared/chat/edit-group/edit-group.page.spec.ts b/src/app/ui/chat/component/edit-group/edit-group.page.spec.ts similarity index 100% rename from src/app/shared/chat/edit-group/edit-group.page.spec.ts rename to src/app/ui/chat/component/edit-group/edit-group.page.spec.ts diff --git a/src/app/shared/chat/edit-group/edit-group.page.ts b/src/app/ui/chat/component/edit-group/edit-group.page.ts similarity index 100% rename from src/app/shared/chat/edit-group/edit-group.page.ts rename to src/app/ui/chat/component/edit-group/edit-group.page.ts diff --git a/src/app/shared/chat/empty-chat/empty-chat-routing.module.ts b/src/app/ui/chat/component/empty-chat/empty-chat-routing.module.ts similarity index 100% rename from src/app/shared/chat/empty-chat/empty-chat-routing.module.ts rename to src/app/ui/chat/component/empty-chat/empty-chat-routing.module.ts diff --git a/src/app/shared/chat/empty-chat/empty-chat.module.ts b/src/app/ui/chat/component/empty-chat/empty-chat.module.ts similarity index 100% rename from src/app/shared/chat/empty-chat/empty-chat.module.ts rename to src/app/ui/chat/component/empty-chat/empty-chat.module.ts diff --git a/src/app/shared/chat/empty-chat/empty-chat.page.html b/src/app/ui/chat/component/empty-chat/empty-chat.page.html similarity index 100% rename from src/app/shared/chat/empty-chat/empty-chat.page.html rename to src/app/ui/chat/component/empty-chat/empty-chat.page.html diff --git a/src/app/shared/chat/empty-chat/empty-chat.page.scss b/src/app/ui/chat/component/empty-chat/empty-chat.page.scss similarity index 100% rename from src/app/shared/chat/empty-chat/empty-chat.page.scss rename to src/app/ui/chat/component/empty-chat/empty-chat.page.scss diff --git a/src/app/shared/chat/empty-chat/empty-chat.page.spec.ts b/src/app/ui/chat/component/empty-chat/empty-chat.page.spec.ts similarity index 100% rename from src/app/shared/chat/empty-chat/empty-chat.page.spec.ts rename to src/app/ui/chat/component/empty-chat/empty-chat.page.spec.ts diff --git a/src/app/shared/chat/empty-chat/empty-chat.page.ts b/src/app/ui/chat/component/empty-chat/empty-chat.page.ts similarity index 100% rename from src/app/shared/chat/empty-chat/empty-chat.page.ts rename to src/app/ui/chat/component/empty-chat/empty-chat.page.ts diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts b/src/app/ui/chat/component/group-messages/group-contacts/group-contacts-routing.module.ts similarity index 100% rename from src/app/pages/chat/group-messages/group-contacts/group-contacts-routing.module.ts rename to src/app/ui/chat/component/group-messages/group-contacts/group-contacts-routing.module.ts diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts b/src/app/ui/chat/component/group-messages/group-contacts/group-contacts.module.ts similarity index 100% rename from src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts rename to src/app/ui/chat/component/group-messages/group-contacts/group-contacts.module.ts diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/ui/chat/component/group-messages/group-contacts/group-contacts.page.html similarity index 100% rename from src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html rename to src/app/ui/chat/component/group-messages/group-contacts/group-contacts.page.html diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/ui/chat/component/group-messages/group-contacts/group-contacts.page.scss similarity index 100% rename from src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss rename to src/app/ui/chat/component/group-messages/group-contacts/group-contacts.page.scss diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.spec.ts b/src/app/ui/chat/component/group-messages/group-contacts/group-contacts.page.spec.ts similarity index 100% rename from src/app/pages/chat/group-messages/group-contacts/group-contacts.page.spec.ts rename to src/app/ui/chat/component/group-messages/group-contacts/group-contacts.page.spec.ts diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/ui/chat/component/group-messages/group-contacts/group-contacts.page.ts similarity index 100% rename from src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts rename to src/app/ui/chat/component/group-messages/group-contacts/group-contacts.page.ts diff --git a/src/app/pages/chat/group-messages/group-messages-routing.module.ts b/src/app/ui/chat/component/group-messages/group-messages-routing.module.ts similarity index 100% rename from src/app/pages/chat/group-messages/group-messages-routing.module.ts rename to src/app/ui/chat/component/group-messages/group-messages-routing.module.ts diff --git a/src/app/shared/chat/group-messages/group-messages.module.ts b/src/app/ui/chat/component/group-messages/group-messages.module.ts similarity index 83% rename from src/app/shared/chat/group-messages/group-messages.module.ts rename to src/app/ui/chat/component/group-messages/group-messages.module.ts index 929170a0d..6cad5cfc1 100644 --- a/src/app/shared/chat/group-messages/group-messages.module.ts +++ b/src/app/ui/chat/component/group-messages/group-messages.module.ts @@ -9,13 +9,12 @@ import { GroupMessagesPageRoutingModule } from './group-messages-routing.module' import { GroupMessagesPage } from './group-messages.page'; import { SharedModule } from 'src/app/shared/shared.module'; -import { ChatPopoverPageModule } from '../../popover/chat-popover/chat-popover.module'; -import { NewEventPageModule } from '../../agenda/new-event/new-event.module'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; 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'; @NgModule({ imports: [ @@ -34,4 +33,4 @@ import { SafehtmlPipe } from 'src/app/pipes/safehtml.pipe'; schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [GroupMessagesPage] }) -export class GroupMessagesPageModule {} \ No newline at end of file +export class GroupMessagesPageModule {} diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/ui/chat/component/group-messages/group-messages.page.html similarity index 100% rename from src/app/shared/chat/group-messages/group-messages.page.html rename to src/app/ui/chat/component/group-messages/group-messages.page.html diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/ui/chat/component/group-messages/group-messages.page.scss similarity index 100% rename from src/app/shared/chat/group-messages/group-messages.page.scss rename to src/app/ui/chat/component/group-messages/group-messages.page.scss diff --git a/src/app/pages/chat/group-messages/group-messages.page.spec.ts b/src/app/ui/chat/component/group-messages/group-messages.page.spec.ts similarity index 100% rename from src/app/pages/chat/group-messages/group-messages.page.spec.ts rename to src/app/ui/chat/component/group-messages/group-messages.page.spec.ts diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/ui/chat/component/group-messages/group-messages.page.ts similarity index 99% rename from src/app/shared/chat/group-messages/group-messages.page.ts rename to src/app/ui/chat/component/group-messages/group-messages.page.ts index f5588dc49..a4cef0b2c 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/ui/chat/component/group-messages/group-messages.page.ts @@ -4,7 +4,6 @@ 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 { ChatOptionsPopoverPage } from '../../popover/chat-options-popover/chat-options-popover.page'; import { ChatOptionsFeaturesPage } from 'src/app/modals/chat-options-features/chat-options-features.page'; import { TimeService } from 'src/app/services/functions/time.service'; import { SearchPage } from 'src/app/pages/search/search.page'; @@ -30,6 +29,7 @@ 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'; @Component({ selector: 'app-group-messages', templateUrl: './group-messages.page.html', diff --git a/src/app/pages/chat/messages/contacts/contacts-routing.module.ts b/src/app/ui/chat/component/messages/contacts/contacts-routing.module.ts similarity index 100% rename from src/app/pages/chat/messages/contacts/contacts-routing.module.ts rename to src/app/ui/chat/component/messages/contacts/contacts-routing.module.ts diff --git a/src/app/shared/chat/messages/contacts/contacts.module.ts b/src/app/ui/chat/component/messages/contacts/contacts.module.ts similarity index 100% rename from src/app/shared/chat/messages/contacts/contacts.module.ts rename to src/app/ui/chat/component/messages/contacts/contacts.module.ts diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/ui/chat/component/messages/contacts/contacts.page.html similarity index 100% rename from src/app/shared/chat/messages/contacts/contacts.page.html rename to src/app/ui/chat/component/messages/contacts/contacts.page.html diff --git a/src/app/shared/chat/messages/contacts/contacts.page.scss b/src/app/ui/chat/component/messages/contacts/contacts.page.scss similarity index 100% rename from src/app/shared/chat/messages/contacts/contacts.page.scss rename to src/app/ui/chat/component/messages/contacts/contacts.page.scss diff --git a/src/app/pages/chat/messages/contacts/contacts.page.spec.ts b/src/app/ui/chat/component/messages/contacts/contacts.page.spec.ts similarity index 100% rename from src/app/pages/chat/messages/contacts/contacts.page.spec.ts rename to src/app/ui/chat/component/messages/contacts/contacts.page.spec.ts diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/ui/chat/component/messages/contacts/contacts.page.ts similarity index 100% rename from src/app/shared/chat/messages/contacts/contacts.page.ts rename to src/app/ui/chat/component/messages/contacts/contacts.page.ts diff --git a/src/app/pages/chat/messages/messages-routing.module.ts b/src/app/ui/chat/component/messages/messages-routing.module.ts similarity index 100% rename from src/app/pages/chat/messages/messages-routing.module.ts rename to src/app/ui/chat/component/messages/messages-routing.module.ts diff --git a/src/app/shared/chat/messages/messages.module.ts b/src/app/ui/chat/component/messages/messages.module.ts similarity index 100% rename from src/app/shared/chat/messages/messages.module.ts rename to src/app/ui/chat/component/messages/messages.module.ts diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/ui/chat/component/messages/messages.page.html similarity index 100% rename from src/app/shared/chat/messages/messages.page.html rename to src/app/ui/chat/component/messages/messages.page.html diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/ui/chat/component/messages/messages.page.scss similarity index 100% rename from src/app/shared/chat/messages/messages.page.scss rename to src/app/ui/chat/component/messages/messages.page.scss diff --git a/src/app/pages/chat/messages/messages.page.spec.ts b/src/app/ui/chat/component/messages/messages.page.spec.ts similarity index 100% rename from src/app/pages/chat/messages/messages.page.spec.ts rename to src/app/ui/chat/component/messages/messages.page.spec.ts diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/ui/chat/component/messages/messages.page.ts similarity index 99% rename from src/app/shared/chat/messages/messages.page.ts rename to src/app/ui/chat/component/messages/messages.page.ts index 4f82695b2..b9bcb220e 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/ui/chat/component/messages/messages.page.ts @@ -22,7 +22,6 @@ import { SessionStore } from 'src/app/store/session.service'; import { Howl } from 'howler'; import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page'; import { PermissionService } from 'src/app/services/permission.service'; -import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page'; import { Observable as DexieObservable } from 'Dexie'; import { Subscription } from 'rxjs'; import { MessageRepositoryService } from 'src/app/module/chat/data/repository/message-respository.service' @@ -38,11 +37,12 @@ import { TypingTable } from 'src/app/module/chat/infra/database/dexie/schema/typ import { MessageAttachmentFileType, MessageAttachmentSource } from 'src/app/module/chat/data/dto/message/messageOutputDTO'; import { JSFileToDataUrl } from 'src/app/utils/ToBase64'; import { CameraService } from 'src/app/infra/camera/camera.service' -import { compressImageBase64 } from '../../../utils/imageCompressore'; import { FilePickerWebService } from 'src/app/infra/file-picker/web/file-picker-web.service' 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'; @Component({ selector: 'app-messages', diff --git a/src/app/pages/chat/new-group/contacts/contacts-routing.module.ts b/src/app/ui/chat/component/new-group/contacts/contacts-routing.module.ts similarity index 100% rename from src/app/pages/chat/new-group/contacts/contacts-routing.module.ts rename to src/app/ui/chat/component/new-group/contacts/contacts-routing.module.ts diff --git a/src/app/shared/chat/new-group/contacts/contacts.module.ts b/src/app/ui/chat/component/new-group/contacts/contacts.module.ts similarity index 100% rename from src/app/shared/chat/new-group/contacts/contacts.module.ts rename to src/app/ui/chat/component/new-group/contacts/contacts.module.ts diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.html b/src/app/ui/chat/component/new-group/contacts/contacts.page.html similarity index 100% rename from src/app/shared/chat/new-group/contacts/contacts.page.html rename to src/app/ui/chat/component/new-group/contacts/contacts.page.html diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.scss b/src/app/ui/chat/component/new-group/contacts/contacts.page.scss similarity index 100% rename from src/app/shared/chat/new-group/contacts/contacts.page.scss rename to src/app/ui/chat/component/new-group/contacts/contacts.page.scss diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.spec.ts b/src/app/ui/chat/component/new-group/contacts/contacts.page.spec.ts similarity index 100% rename from src/app/pages/chat/new-group/contacts/contacts.page.spec.ts rename to src/app/ui/chat/component/new-group/contacts/contacts.page.spec.ts diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.ts b/src/app/ui/chat/component/new-group/contacts/contacts.page.ts similarity index 100% rename from src/app/shared/chat/new-group/contacts/contacts.page.ts rename to src/app/ui/chat/component/new-group/contacts/contacts.page.ts diff --git a/src/app/pages/chat/new-group/new-group-routing.module.ts b/src/app/ui/chat/component/new-group/new-group-routing.module.ts similarity index 100% rename from src/app/pages/chat/new-group/new-group-routing.module.ts rename to src/app/ui/chat/component/new-group/new-group-routing.module.ts diff --git a/src/app/shared/chat/new-group/new-group.module.ts b/src/app/ui/chat/component/new-group/new-group.module.ts similarity index 100% rename from src/app/shared/chat/new-group/new-group.module.ts rename to src/app/ui/chat/component/new-group/new-group.module.ts diff --git a/src/app/shared/chat/new-group/new-group.page.html b/src/app/ui/chat/component/new-group/new-group.page.html similarity index 100% rename from src/app/shared/chat/new-group/new-group.page.html rename to src/app/ui/chat/component/new-group/new-group.page.html diff --git a/src/app/shared/chat/new-group/new-group.page.scss b/src/app/ui/chat/component/new-group/new-group.page.scss similarity index 100% rename from src/app/shared/chat/new-group/new-group.page.scss rename to src/app/ui/chat/component/new-group/new-group.page.scss diff --git a/src/app/pages/chat/new-group/new-group.page.spec.ts b/src/app/ui/chat/component/new-group/new-group.page.spec.ts similarity index 100% rename from src/app/pages/chat/new-group/new-group.page.spec.ts rename to src/app/ui/chat/component/new-group/new-group.page.spec.ts diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/ui/chat/component/new-group/new-group.page.ts similarity index 100% rename from src/app/shared/chat/new-group/new-group.page.ts rename to src/app/ui/chat/component/new-group/new-group.page.ts diff --git a/src/app/shared/chat/edit-group/edit-group-routing.module.ts b/src/app/ui/chat/modal/edit-group/edit-group-routing.module.ts similarity index 100% rename from src/app/shared/chat/edit-group/edit-group-routing.module.ts rename to src/app/ui/chat/modal/edit-group/edit-group-routing.module.ts diff --git a/src/app/pages/chat/edit-group/edit-group.module.ts b/src/app/ui/chat/modal/edit-group/edit-group.module.ts similarity index 100% rename from src/app/pages/chat/edit-group/edit-group.module.ts rename to src/app/ui/chat/modal/edit-group/edit-group.module.ts diff --git a/src/app/pages/chat/edit-group/edit-group.page.html b/src/app/ui/chat/modal/edit-group/edit-group.page.html similarity index 100% rename from src/app/pages/chat/edit-group/edit-group.page.html rename to src/app/ui/chat/modal/edit-group/edit-group.page.html diff --git a/src/app/pages/chat/edit-group/edit-group.page.scss b/src/app/ui/chat/modal/edit-group/edit-group.page.scss similarity index 100% rename from src/app/pages/chat/edit-group/edit-group.page.scss rename to src/app/ui/chat/modal/edit-group/edit-group.page.scss diff --git a/src/app/pages/chat/edit-group/edit-group.page.spec.ts b/src/app/ui/chat/modal/edit-group/edit-group.page.spec.ts similarity index 100% rename from src/app/pages/chat/edit-group/edit-group.page.spec.ts rename to src/app/ui/chat/modal/edit-group/edit-group.page.spec.ts diff --git a/src/app/pages/chat/edit-group/edit-group.page.ts b/src/app/ui/chat/modal/edit-group/edit-group.page.ts similarity index 100% rename from src/app/pages/chat/edit-group/edit-group.page.ts rename to src/app/ui/chat/modal/edit-group/edit-group.page.ts diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts-routing.module.ts b/src/app/ui/chat/modal/group-messages/group-contacts/group-contacts-routing.module.ts similarity index 100% rename from src/app/shared/chat/group-messages/group-contacts/group-contacts-routing.module.ts rename to src/app/ui/chat/modal/group-messages/group-contacts/group-contacts-routing.module.ts diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts b/src/app/ui/chat/modal/group-messages/group-contacts/group-contacts.module.ts similarity index 100% rename from src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts rename to src/app/ui/chat/modal/group-messages/group-contacts/group-contacts.module.ts diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/ui/chat/modal/group-messages/group-contacts/group-contacts.page.html similarity index 100% rename from src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html rename to src/app/ui/chat/modal/group-messages/group-contacts/group-contacts.page.html diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/ui/chat/modal/group-messages/group-contacts/group-contacts.page.scss similarity index 100% rename from src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss rename to src/app/ui/chat/modal/group-messages/group-contacts/group-contacts.page.scss diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.spec.ts b/src/app/ui/chat/modal/group-messages/group-contacts/group-contacts.page.spec.ts similarity index 100% rename from src/app/shared/chat/group-messages/group-contacts/group-contacts.page.spec.ts rename to src/app/ui/chat/modal/group-messages/group-contacts/group-contacts.page.spec.ts diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/ui/chat/modal/group-messages/group-contacts/group-contacts.page.ts similarity index 100% rename from src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts rename to src/app/ui/chat/modal/group-messages/group-contacts/group-contacts.page.ts diff --git a/src/app/shared/chat/group-messages/group-messages-routing.module.ts b/src/app/ui/chat/modal/group-messages/group-messages-routing.module.ts similarity index 100% rename from src/app/shared/chat/group-messages/group-messages-routing.module.ts rename to src/app/ui/chat/modal/group-messages/group-messages-routing.module.ts diff --git a/src/app/pages/chat/group-messages/group-messages.module.ts b/src/app/ui/chat/modal/group-messages/group-messages.module.ts similarity index 100% rename from src/app/pages/chat/group-messages/group-messages.module.ts rename to src/app/ui/chat/modal/group-messages/group-messages.module.ts diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/ui/chat/modal/group-messages/group-messages.page.html similarity index 100% rename from src/app/pages/chat/group-messages/group-messages.page.html rename to src/app/ui/chat/modal/group-messages/group-messages.page.html diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/ui/chat/modal/group-messages/group-messages.page.scss similarity index 100% rename from src/app/pages/chat/group-messages/group-messages.page.scss rename to src/app/ui/chat/modal/group-messages/group-messages.page.scss diff --git a/src/app/shared/chat/group-messages/group-messages.page.spec.ts b/src/app/ui/chat/modal/group-messages/group-messages.page.spec.ts similarity index 100% rename from src/app/shared/chat/group-messages/group-messages.page.spec.ts rename to src/app/ui/chat/modal/group-messages/group-messages.page.spec.ts diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/ui/chat/modal/group-messages/group-messages.page.ts similarity index 99% rename from src/app/pages/chat/group-messages/group-messages.page.ts rename to src/app/ui/chat/modal/group-messages/group-messages.page.ts index dc8c6b89a..9a12a97ae 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/ui/chat/modal/group-messages/group-messages.page.ts @@ -11,7 +11,6 @@ import { TimeService } from 'src/app/services/functions/time.service'; import { FileService } from 'src/app/services/functions/file.service'; import { ToastService } from 'src/app/services/toast.service'; import { environment } from 'src/environments/environment'; -import { NewEventPage } from '../../agenda/new-event/new-event.page'; import { EventPerson } from 'src/app/models/eventperson.model'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; import { ThemeService } from 'src/app/services/theme.service' @@ -36,6 +35,7 @@ import { FileValidatorService } from "src/app/services/file/file-validator.servi 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'; @Component({ selector: 'app-group-messages', diff --git a/src/app/shared/chat/messages/contacts/contacts-routing.module.ts b/src/app/ui/chat/modal/messages/contacts/contacts-routing.module.ts similarity index 100% rename from src/app/shared/chat/messages/contacts/contacts-routing.module.ts rename to src/app/ui/chat/modal/messages/contacts/contacts-routing.module.ts diff --git a/src/app/pages/chat/messages/contacts/contacts.module.ts b/src/app/ui/chat/modal/messages/contacts/contacts.module.ts similarity index 100% rename from src/app/pages/chat/messages/contacts/contacts.module.ts rename to src/app/ui/chat/modal/messages/contacts/contacts.module.ts diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/ui/chat/modal/messages/contacts/contacts.page.html similarity index 100% rename from src/app/pages/chat/messages/contacts/contacts.page.html rename to src/app/ui/chat/modal/messages/contacts/contacts.page.html diff --git a/src/app/pages/chat/messages/contacts/contacts.page.scss b/src/app/ui/chat/modal/messages/contacts/contacts.page.scss similarity index 100% rename from src/app/pages/chat/messages/contacts/contacts.page.scss rename to src/app/ui/chat/modal/messages/contacts/contacts.page.scss diff --git a/src/app/shared/chat/messages/contacts/contacts.page.spec.ts b/src/app/ui/chat/modal/messages/contacts/contacts.page.spec.ts similarity index 100% rename from src/app/shared/chat/messages/contacts/contacts.page.spec.ts rename to src/app/ui/chat/modal/messages/contacts/contacts.page.spec.ts diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/ui/chat/modal/messages/contacts/contacts.page.ts similarity index 100% rename from src/app/pages/chat/messages/contacts/contacts.page.ts rename to src/app/ui/chat/modal/messages/contacts/contacts.page.ts diff --git a/src/app/shared/chat/messages/messages-routing.module.ts b/src/app/ui/chat/modal/messages/messages-routing.module.ts similarity index 100% rename from src/app/shared/chat/messages/messages-routing.module.ts rename to src/app/ui/chat/modal/messages/messages-routing.module.ts diff --git a/src/app/pages/chat/messages/messages.module.ts b/src/app/ui/chat/modal/messages/messages.module.ts similarity index 100% rename from src/app/pages/chat/messages/messages.module.ts rename to src/app/ui/chat/modal/messages/messages.module.ts diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/ui/chat/modal/messages/messages.page.html similarity index 100% rename from src/app/pages/chat/messages/messages.page.html rename to src/app/ui/chat/modal/messages/messages.page.html diff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/ui/chat/modal/messages/messages.page.scss similarity index 100% rename from src/app/pages/chat/messages/messages.page.scss rename to src/app/ui/chat/modal/messages/messages.page.scss diff --git a/src/app/shared/chat/messages/messages.page.spec.ts b/src/app/ui/chat/modal/messages/messages.page.spec.ts similarity index 100% rename from src/app/shared/chat/messages/messages.page.spec.ts rename to src/app/ui/chat/modal/messages/messages.page.spec.ts diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/ui/chat/modal/messages/messages.page.ts similarity index 99% rename from src/app/pages/chat/messages/messages.page.ts rename to src/app/ui/chat/modal/messages/messages.page.ts index 040a76ac1..6d416b828 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/ui/chat/modal/messages/messages.page.ts @@ -4,7 +4,7 @@ import { GestureController, ModalController, NavParams, PopoverController, Platf import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; import { EventPerson } from 'src/app/models/eventperson.model'; import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage'; -import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page'; +import { ContactsPage } from 'src/app/ui/chat/modal/messages/contacts/contacts.page'; 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'; @@ -184,7 +184,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { this.roomMembers$ = this.roomRepositoryService.getRoomMemberByIdLive(this.roomId) as any this.roomStatus$ = this.roomRepositoryService.getRoomStatus(this.roomId) this.roomRepositoryService.getRoomById(this.roomId) - this.messageRepositoryService.listAllMessagesByRoomId(this.roomId) + // this.messageRepositoryService.listAllMessagesByRoomId(this.roomId) this.userTypingServiceRepository.getUserTypingLive().subscribe((e) => { const arrayNames = e.map(e => e.userName) diff --git a/src/app/shared/chat/new-group/contacts/contacts-routing.module.ts b/src/app/ui/chat/modal/new-group/contacts/contacts-routing.module.ts similarity index 100% rename from src/app/shared/chat/new-group/contacts/contacts-routing.module.ts rename to src/app/ui/chat/modal/new-group/contacts/contacts-routing.module.ts diff --git a/src/app/pages/chat/new-group/contacts/contacts.module.ts b/src/app/ui/chat/modal/new-group/contacts/contacts.module.ts similarity index 100% rename from src/app/pages/chat/new-group/contacts/contacts.module.ts rename to src/app/ui/chat/modal/new-group/contacts/contacts.module.ts diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.html b/src/app/ui/chat/modal/new-group/contacts/contacts.page.html similarity index 100% rename from src/app/pages/chat/new-group/contacts/contacts.page.html rename to src/app/ui/chat/modal/new-group/contacts/contacts.page.html diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.scss b/src/app/ui/chat/modal/new-group/contacts/contacts.page.scss similarity index 100% rename from src/app/pages/chat/new-group/contacts/contacts.page.scss rename to src/app/ui/chat/modal/new-group/contacts/contacts.page.scss diff --git a/src/app/shared/chat/new-group/contacts/contacts.page.spec.ts b/src/app/ui/chat/modal/new-group/contacts/contacts.page.spec.ts similarity index 100% rename from src/app/shared/chat/new-group/contacts/contacts.page.spec.ts rename to src/app/ui/chat/modal/new-group/contacts/contacts.page.spec.ts diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.ts b/src/app/ui/chat/modal/new-group/contacts/contacts.page.ts similarity index 100% rename from src/app/pages/chat/new-group/contacts/contacts.page.ts rename to src/app/ui/chat/modal/new-group/contacts/contacts.page.ts diff --git a/src/app/shared/chat/new-group/new-group-routing.module.ts b/src/app/ui/chat/modal/new-group/new-group-routing.module.ts similarity index 100% rename from src/app/shared/chat/new-group/new-group-routing.module.ts rename to src/app/ui/chat/modal/new-group/new-group-routing.module.ts diff --git a/src/app/pages/chat/new-group/new-group.module.ts b/src/app/ui/chat/modal/new-group/new-group.module.ts similarity index 100% rename from src/app/pages/chat/new-group/new-group.module.ts rename to src/app/ui/chat/modal/new-group/new-group.module.ts diff --git a/src/app/pages/chat/new-group/new-group.page.html b/src/app/ui/chat/modal/new-group/new-group.page.html similarity index 100% rename from src/app/pages/chat/new-group/new-group.page.html rename to src/app/ui/chat/modal/new-group/new-group.page.html diff --git a/src/app/pages/chat/new-group/new-group.page.scss b/src/app/ui/chat/modal/new-group/new-group.page.scss similarity index 100% rename from src/app/pages/chat/new-group/new-group.page.scss rename to src/app/ui/chat/modal/new-group/new-group.page.scss diff --git a/src/app/shared/chat/new-group/new-group.page.spec.ts b/src/app/ui/chat/modal/new-group/new-group.page.spec.ts similarity index 100% rename from src/app/shared/chat/new-group/new-group.page.spec.ts rename to src/app/ui/chat/modal/new-group/new-group.page.spec.ts diff --git a/src/app/pages/chat/new-group/new-group.page.ts b/src/app/ui/chat/modal/new-group/new-group.page.ts similarity index 100% rename from src/app/pages/chat/new-group/new-group.page.ts rename to src/app/ui/chat/modal/new-group/new-group.page.ts diff --git a/src/app/utils/stackTrace.ts b/src/app/utils/stackTrace.ts new file mode 100644 index 000000000..400393f54 --- /dev/null +++ b/src/app/utils/stackTrace.ts @@ -0,0 +1,4 @@ +export function getStackTrace() { + const error = new Error('trace'); + return error.stack; +}