diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 769eba328..32480604c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,271 +1,272 @@ -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) - }, { +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) }, @@ -296,26 +297,27 @@ const routes = [ { 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: 'chat', + component: ChatPage + } */ - - - /* - path: 'chat', - component: ChatPage - } */ - - /* - path: 'chat', - component: ChatPage - } */ - -]; -@NgModule({ - imports: [ - RouterModule.forRoot(routes, - { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule {} + /* + path: 'chat', + component: ChatPage + } */ + +]; +@NgModule({ + imports: [ + RouterModule.forRoot(routes, + { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/datasource/middleware/remote/middleware-remote-datasourcec.service.spec.ts b/src/app/datasource/middleware/remote/middleware-remote-datasourcec.service.spec.ts deleted file mode 100644 index 15fd47731..000000000 --- a/src/app/datasource/middleware/remote/middleware-remote-datasourcec.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MiddlewareRemoteDatasourcecService } from './middleware-remote-datasourcec.service'; - -describe('MiddlewareRemoteDatasourcecService', () => { - let service: MiddlewareRemoteDatasourcecService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MiddlewareRemoteDatasourcecService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/datasource/middleware/remote/middleware-remote-datasourcec.service.ts b/src/app/datasource/middleware/remote/middleware-remote-datasourcec.service.ts deleted file mode 100644 index 487ac3e30..000000000 --- a/src/app/datasource/middleware/remote/middleware-remote-datasourcec.service.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Injectable } from '@angular/core'; -import { SessionStore } from "src/app/store/session.service" -import { MiddlewareServiceService } from "src/app/shared/API/middleware/middleware-service.service" -@Injectable({ - providedIn: 'root' -}) -export class MiddlewareRemoteDatasourcecService { - - constructor( - private MiddlewareServiceService: MiddlewareServiceService, - ) {} - - refreshToken() { - const refreshToken = SessionStore.user.Authorization - return this.MiddlewareServiceService.refreshToken(refreshToken) - } -} diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 11b56d38d..53b16aa2f 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -414,7 +414,10 @@ const routes: Routes = [ }, - { path: '**', redirectTo: '/', pathMatch: 'full' }, + { + path: '**', + loadChildren: ()=> import('../pages/not-found/not-found.module').then(m => m.NotFoundPageModule), + }, ]; @NgModule({ diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 8c1b7c939..847a69cda 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -92,7 +92,7 @@ export class EventsPage implements OnInit { private changeProfileService: ChangeProfileService, public TaskService: TaskService ) { - + window['zipPhoneCallback'] = function (zipphone) { var frame = document.getElementById('home-iframe'); if(frame) { @@ -113,7 +113,7 @@ export class EventsPage implements OnInit { } ngAfterViewInit(): void { - + this.loadAllTask(); @@ -123,9 +123,9 @@ export class EventsPage implements OnInit { this.dynamicSearch() } }) - + this.dynamicSearch() - + } ngOnDestroy() { @@ -161,20 +161,20 @@ export class EventsPage implements OnInit { const ordinance = this.ordinance if(this.showSearch && this.searchSubject) { - + const AllProcess = this.TaskService.AllProcess.filter((task) => { let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject subject = subject.toLowerCase(); return subject.includes(this.searchSubject.toLowerCase()) }).filter( task => this.TaskService.filter(task, this.filterName)) - + if(ordinance == this.ordinance) { - this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess) + this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess) } } else { const AllProcess = this.TaskService.AllProcess - + if(ordinance == this.ordinance) { this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess) .filter( task => this.TaskService.filter(task, this.filterName)) @@ -205,7 +205,7 @@ export class EventsPage implements OnInit { } catch(error) {} }, 2000); } - + this.RefreshEvents(); this.LoadList(); this.loadAllTask(); @@ -218,7 +218,7 @@ export class EventsPage implements OnInit { async RefreshEvents() { - + this.currentEvent = ""; this.showLoader = true; this.showAgendaLoader = true; @@ -256,7 +256,7 @@ export class EventsPage implements OnInit { let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate(); this.storage.get('events').then((events: any[] = []) => { - // + // if(Array.isArray(events)) { this.listToPresent = events @@ -271,7 +271,7 @@ export class EventsPage implements OnInit { } catch (error) {} } - // + // }) @@ -299,19 +299,19 @@ export class EventsPage implements OnInit { changeProfile() { if (this.profile == "mdgpr") { - // + // this.profile = "pr"; this.RefreshEvents(); } else { - // + // this.profile = "mdgpr"; this.RefreshEvents(); } } async openEventDetail1(id: any) { - // + // const modal = await this.modalController.create({ component: EventDetailPage, @@ -328,7 +328,7 @@ export class EventsPage implements OnInit { } async openEventDetail(id: any) { - // + // const modal = await this.modalController.create({ component: ViewEventPage, @@ -338,7 +338,7 @@ export class EventsPage implements OnInit { cssClass: 'view-event', backdropDismiss: false }); - + modal.onDidDismiss(); await modal.present(); @@ -358,7 +358,7 @@ export class EventsPage implements OnInit { window['all-process-gabinete']() } - + } sortArrayISODate(myArray: any) { @@ -375,9 +375,9 @@ export class EventsPage implements OnInit { } goToAllTaskFilter(event: any) { - let navigationExtras: NavigationExtras = { queryParams: { + let navigationExtras: NavigationExtras = { queryParams: { filter: event, - processes: true + processes: true } } @@ -407,4 +407,4 @@ export class EventsPage implements OnInit { } } -} \ No newline at end of file +} diff --git a/src/app/pages/not-found/not-found-routing.module.ts b/src/app/pages/not-found/not-found-routing.module.ts new file mode 100644 index 000000000..6d73b581a --- /dev/null +++ b/src/app/pages/not-found/not-found-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { NotFoundPage } from './not-found.page'; + +const routes: Routes = [ + { + path: '', + component: NotFoundPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class NotFoundPageRoutingModule {} diff --git a/src/app/pages/not-found/not-found.module.ts b/src/app/pages/not-found/not-found.module.ts new file mode 100644 index 000000000..4dec837fa --- /dev/null +++ b/src/app/pages/not-found/not-found.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { NotFoundPageRoutingModule } from './not-found-routing.module'; + +import { NotFoundPage } from './not-found.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + NotFoundPageRoutingModule + ], + declarations: [NotFoundPage] +}) +export class NotFoundPageModule {} diff --git a/src/app/pages/not-found/not-found.page.html b/src/app/pages/not-found/not-found.page.html new file mode 100644 index 000000000..0859cd401 --- /dev/null +++ b/src/app/pages/not-found/not-found.page.html @@ -0,0 +1,9 @@ + + + + + A Reencaminhar a página + + + + diff --git a/src/app/pages/not-found/not-found.page.scss b/src/app/pages/not-found/not-found.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/pages/not-found/not-found.page.spec.ts b/src/app/pages/not-found/not-found.page.spec.ts new file mode 100644 index 000000000..e502e3640 --- /dev/null +++ b/src/app/pages/not-found/not-found.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { NotFoundPage } from './not-found.page'; + +describe('NotFoundPage', () => { + let component: NotFoundPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ NotFoundPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(NotFoundPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/not-found/not-found.page.ts b/src/app/pages/not-found/not-found.page.ts new file mode 100644 index 000000000..cc53adf67 --- /dev/null +++ b/src/app/pages/not-found/not-found.page.ts @@ -0,0 +1,22 @@ +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { ToastService } from 'src/app/services/toast.service'; + +@Component({ + selector: 'app-not-found', + templateUrl: './not-found.page.html', + styleUrls: ['./not-found.page.scss'], +}) +export class NotFoundPage implements OnInit { + + constructor( + private router: Router, + private toastService: ToastService, + ) { } + + ngOnInit() { + this.router.navigate(['/home/events']); + this.toastService._badRequest("Página não encontrada. Contacte o suporte técnico") + } + +} diff --git a/src/app/repository/middleWare/middleware-repository.service.spec.ts b/src/app/repository/middleWare/middleware-repository.service.spec.ts deleted file mode 100644 index b9ffd7e10..000000000 --- a/src/app/repository/middleWare/middleware-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MiddlewareRepositoryService } from './middleware-repository.service'; - -describe('MiddlewareRepositoryService', () => { - let service: MiddlewareRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MiddlewareRepositoryService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/repository/middleWare/middleware-repository.service.ts b/src/app/repository/middleWare/middleware-repository.service.ts deleted file mode 100644 index bf24fd68a..000000000 --- a/src/app/repository/middleWare/middleware-repository.service.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Injectable } from '@angular/core'; -import { MiddlewareRemoteDatasourcecService } from "src/app/datasource/middleware/remote/middleware-remote-datasourcec.service"; -@Injectable({ - providedIn: 'root' -}) -export class MiddlewareRepositoryService { - - constructor( - private MiddlewareRemoteDatasourcecService: MiddlewareRemoteDatasourcecService, - ) {} - - refreshToken() { - return this.MiddlewareRemoteDatasourcecService.refreshToken() - } - -} diff --git a/src/app/services/interceptor/token-interceptor.service.spec.ts b/src/app/services/interceptor/token-interceptor.service.spec.ts deleted file mode 100644 index b3ca21c33..000000000 --- a/src/app/services/interceptor/token-interceptor.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { TokenInterceptorService } from './token-interceptor.service'; - -describe('TokenInterceptorService', () => { - let service: TokenInterceptorService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(TokenInterceptorService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/services/interceptor/token-interceptor.service.ts b/src/app/services/interceptor/token-interceptor.service.ts deleted file mode 100644 index 497721f84..000000000 --- a/src/app/services/interceptor/token-interceptor.service.ts +++ /dev/null @@ -1,81 +0,0 @@ -import { Injectable } from "@angular/core"; -import { - HttpRequest, - HttpHandler, - HttpEvent, - HttpInterceptor, - HttpErrorResponse, - HTTP_INTERCEPTORS, -} from "@angular/common/http"; -import { Observable, throwError, BehaviorSubject } from "rxjs"; -import { catchError, filter, take, switchMap } from "rxjs/operators"; -import { SessionStore } from "src/app/store/session.service"; -import { MiddlewareRepositoryService } from "src/app/repository/middleWare/middleware-repository.service" - -@Injectable({ - providedIn: 'root' -}) -export class TokenInterceptorService { - - private isRefreshing = false; - private refreshTokenSubject: BehaviorSubject = new BehaviorSubject( - null - ); - - - constructor(private middlewareRepositoryService: MiddlewareRepositoryService) { - this.middlewareRepositoryService = middlewareRepositoryService - } - - intercept( - request: HttpRequest, - next: HttpHandler - ): Observable> { - if (SessionStore.user.Authorization) { - request = this.addToken(request, SessionStore.user.Authorization); - } - - return next.handle(request).pipe( - catchError((error) => { - if (error instanceof HttpErrorResponse && error.status === 401) { - return this.handle401Error(request, next); - } else { - return throwError(error); - } - }) - ) as any - } - - private addToken(request: HttpRequest, token: string) { - return request.clone({ - setHeaders: { - Authorization: `Bearer ${token}`, - }, - }); - } - - private handle401Error(request: HttpRequest, next: HttpHandler) { - if (!this.isRefreshing) { - this.isRefreshing = true; - this.refreshTokenSubject.next(null); - - - - return this.middlewareRepositoryService.refreshToken().pipe( - switchMap((token: any) => { - this.isRefreshing = false; - this.refreshTokenSubject.next(token['result'].accessToken); - return next.handle(this.addToken(request, token['result'].accessToken)); - }) - ); - } else { - return this.refreshTokenSubject.pipe( - filter((token) => token != null), - take(1), - switchMap((jwt) => { - return next.handle(this.addToken(request, jwt)); - }) - ); - } - } -} diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index 9814ce419..8bed6de4b 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -56,7 +56,7 @@ - + diff --git a/web.config b/web.config index 166d482b4..1c8a36c6e 100644 --- a/web.config +++ b/web.config @@ -27,7 +27,7 @@ - +