This commit is contained in:
tiago.kayaya
2021-07-27 00:21:30 +01:00
parent 41cefc05a3
commit 130fc886ea
3 changed files with 24 additions and 15 deletions
+13 -13
View File
@@ -52,7 +52,7 @@ const routes: Routes = [
},
],
},
{
path: 'attendees',
@@ -62,7 +62,7 @@ const routes: Routes = [
loadChildren: ()=> import('../pages/events/attendees/attendees.module').then(m => m.AttendeesPageModule)
},
],
},
{
path: 'attendees-modal',
@@ -72,7 +72,7 @@ const routes: Routes = [
loadChildren: ()=> import('../shared/event/attendee-modal/attendee-modal.module').then(m => m.AttendeeModalPageModule)
},
],
},
// {
// path: 'login',
@@ -83,7 +83,7 @@ const routes: Routes = [
// },
// ],
// canActivate: [LoginGuard]
// },
{
path: 'agenda',
@@ -131,7 +131,7 @@ const routes: Routes = [
]
},
],
},
{
path: 'gabinete-digital',
@@ -268,7 +268,7 @@ const routes: Routes = [
loadChildren: ()=> import('../pages/search/search.module').then(m => m.SearchPageModule)
}
],
},
{
path: 'publications',
@@ -288,7 +288,7 @@ const routes: Routes = [
path:':folderId/:publicationId',
loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)
},
]
]
},
{
path:'new-publication',
@@ -299,7 +299,7 @@ const routes: Routes = [
loadChildren: () => import('../shared/popover/request-options/request-options.module').then( m => m.RequestOptionsPageModule)
},
],
},
{
path: 'chat',
@@ -312,7 +312,7 @@ const routes: Routes = [
path:'messages',
children: [
{
path:'',
path:':roomId',
loadChildren: ()=> import('../pages/chat/messages/messages.module').then(m => m.MessagesPageModule)
},
{
@@ -344,7 +344,7 @@ const routes: Routes = [
},
],
},
{
path: 'document-detail',
@@ -354,7 +354,7 @@ const routes: Routes = [
loadChildren: ()=> import('../modals/document-detail/document-detail.module').then(m => m.DocumentDetailPageModule)
},
],
},
{
path: 'inactivity',
@@ -364,11 +364,11 @@ const routes: Routes = [
loadChildren: ()=> import('../pages/inactivity/inactivity.module').then(m => m.InactivityPageModule)
},
],
},
],
canActivate: [AuthGuard]
}
];
+3
View File
@@ -22,6 +22,7 @@ import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page';
import * as Rx from "rxjs/Rx";
import { Message } from 'src/app/models/message.model';
import { Observable, Subject } from "rxjs/Rx";
import { Router } from '@angular/router';
@Component({
selector: 'app-chat',
@@ -101,6 +102,7 @@ export class ChatPage implements OnInit {
private authService: AuthService,
private storage:Storage,
private resolver: ComponentFactoryResolver,
private router: Router,
){
this.loggedUserChat = authService.ValidatedUserChat['data'];
this.headers = new HttpHeaders();
@@ -181,6 +183,7 @@ hideRefreshButton(){
this.idSelected = rid;
if( window.innerWidth < 801){
this.openMessagesModal(rid);
//this.router.navigate(['/home/chat/messages',rid,]);
}
else{
this.closeAllDesktopComponents();
+8 -2
View File
@@ -1,5 +1,5 @@
import { AfterViewChecked, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import {Router} from '@angular/router'
import {ActivatedRoute, Router} from '@angular/router'
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { Status } from 'src/app/models/chat/status.model';
import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page';
@@ -38,8 +38,14 @@ export class MessagesPage implements OnInit, AfterViewChecked {
private authService: AuthService,
private alertService: AlertService,
private toastService: ToastService,
private route: Router
private route: Router,
private activatedRoute: ActivatedRoute,
) {
/* this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) {
this.roomId = params["params"].roomId;
}
}); */
this.loggedUser = authService.ValidatedUserChat['data'];
this.roomId = this.navParams.get('roomId');
}