diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 7fd5e228a..8ea73ab47 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,5 +1,6 @@ import { NgModule } from '@angular/core'; import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; +import { ChatPage } from './pages/chat/chat.page'; import { MessagesPage } from './pages/chat/messages/messages.page'; const routes: Routes = [ @@ -11,9 +12,9 @@ const routes: Routes = [ path: '', loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) }, - /* { - path: 'messages', - component: MessagesPage + /* { + path: 'chat', + component: ChatPage } */ ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5048c8574..adaccc9db 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -28,11 +28,12 @@ import { FormsModule } from '@angular/forms'; import { CalendarModule, DateAdapter } from 'angular-calendar'; import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { MessagesPage } from './pages/chat/messages/messages.page'; @NgModule({ - declarations: [AppComponent], - entryComponents: [], + declarations: [AppComponent,MessagesPage,], + entryComponents: [MessagesPage], imports: [BrowserModule, CommonModule, FormsModule, diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 63aeaa50a..0818b3d90 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -3,7 +3,6 @@ import { Routes, RouterModule } from '@angular/router'; import { HomeGuard } from '../guards/home.guard'; import { GroupMessagesPage } from '../pages/chat/group-messages/group-messages.page'; import { MessagesPage } from '../pages/chat/messages/messages.page'; -import { TestPage } from '../pages/chat/test/test.page'; import { UserDataResolver } from '../resolvers/userData.resolver'; import { HomePage } from './home.page'; @@ -159,20 +158,21 @@ const routes: Routes = [ children: [ { path:'', - outlet:'message', - loadChildren: ()=> import('../pages/chat/messages/messages.module').then(m => m.MessagesPageModule) + /* outlet:'message', */ + component: MessagesPage + //loadChildren: ()=> import('../pages/chat/messages/messages.module').then(m => m.MessagesPageModule) }, ] }, - /* { + { path:'messages', outlet:'message', component: MessagesPage - }, */ + }, { - path:'test', - outlet:'test', - component: TestPage + path:'groups', + outlet:'group', + component: GroupMessagesPage }, ] diff --git a/src/app/pages/chat/chat-routing.module.ts b/src/app/pages/chat/chat-routing.module.ts index da6f2db29..6ed809178 100644 --- a/src/app/pages/chat/chat-routing.module.ts +++ b/src/app/pages/chat/chat-routing.module.ts @@ -9,20 +9,8 @@ const routes: Routes = [ { path: '', component: ChatPage, - children: [ - { - path:'messages', - outlet:'message', - component: MessagesPage - }, - { - path:'groups', - outlet:'group', - component: GroupMessagesPage - }, - ] }, - { + /* { path: 'conversation', loadChildren: () => import('./conversation/conversation.module').then( m => m.ConversationPageModule) }, @@ -40,6 +28,7 @@ const routes: Routes = [ }, { path: 'messages', + outlet:'message', loadChildren: () => import('./messages/messages.module').then( m => m.MessagesPageModule) }, { @@ -50,7 +39,7 @@ const routes: Routes = [ path: 'test', outlet:'test', loadChildren: () => import('./test/test.module').then( m => m.TestPageModule) - } + } */ ]; diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts index 7fcc73c71..0bcb62c12 100644 --- a/src/app/pages/chat/chat.module.ts +++ b/src/app/pages/chat/chat.module.ts @@ -9,6 +9,8 @@ import { ChatPageRoutingModule } from './chat-routing.module'; import { ChatPage } from './chat.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { RouterModule } from '@angular/router'; +import { MessagesPage } from './messages/messages.page'; +import { GroupMessagesPage } from './group-messages/group-messages.page'; @NgModule({ imports: [ @@ -19,7 +21,12 @@ import { RouterModule } from '@angular/router'; ChatPageRoutingModule, RouterModule, ], - declarations: [ChatPage], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + declarations: [ + ChatPage, + MessagesPage, + GroupMessagesPage, + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + entryComponents: [MessagesPage, GroupMessagesPage] }) export class ChatPageModule {} diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 446951486..aec4ab243 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -40,7 +40,7 @@
-