From 09bcca908e573ae916ebde35baeaeb27454c4474 Mon Sep 17 00:00:00 2001 From: richard-loafle <44828666+richard-loafle@users.noreply.github.com> Date: Wed, 8 Apr 2020 08:46:30 +0900 Subject: [PATCH] bug fixed --- src/app/app-routing.module.ts | 26 ++++++++++++++----- .../pages/chat/chat-routing.page.module.ts | 2 +- .../components/index.page.component.spec.ts | 2 +- .../chat/components/index.page.component.ts | 2 +- .../components/index.page.component.html | 4 ++- .../group/components/index.page.component.ts | 2 +- 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index dbfc571..3e978b4 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -13,7 +13,7 @@ const routes: Routes = [ component: NoNaviLayoutComponent, loadChildren: () => import('./pages/account/account.page.module').then( - m => m.AppAccountPageModule + (m) => m.AppAccountPageModule ) }, { @@ -21,7 +21,7 @@ const routes: Routes = [ component: NoNaviLayoutComponent, loadChildren: () => import('./pages/common/common.page.module').then( - m => m.AppCommonPageModule + (m) => m.AppCommonPageModule ) }, { @@ -37,31 +37,43 @@ const routes: Routes = [ path: 'organization', loadChildren: () => import('./pages/organization/organization.page.module').then( - m => m.AppOrganizationPageModule + (m) => m.AppOrganizationPageModule ) }, { path: 'group', loadChildren: () => import('./pages/group/group.page.module').then( - m => m.AppGroupPageModule + (m) => m.AppGroupPageModule + ) + }, + { + path: 'group', + outlet: 'subContent', + loadChildren: () => + import('./pages/group/group.page.module').then( + (m) => m.AppGroupPageModule ) }, { path: 'chat', loadChildren: () => - import('./pages/chat/chat.page.module').then(m => m.AppChatPageModule) + import('./pages/chat/chat.page.module').then( + (m) => m.AppChatPageModule + ) }, { path: 'call', loadChildren: () => - import('./pages/call/call.page.module').then(m => m.AppCallPageModule) + import('./pages/call/call.page.module').then( + (m) => m.AppCallPageModule + ) }, { path: 'message', loadChildren: () => import('./pages/message/message.page.module').then( - m => m.AppMessagePageModule + (m) => m.AppMessagePageModule ) } ] diff --git a/src/app/pages/chat/chat-routing.page.module.ts b/src/app/pages/chat/chat-routing.page.module.ts index 970c908..22cb304 100644 --- a/src/app/pages/chat/chat-routing.page.module.ts +++ b/src/app/pages/chat/chat-routing.page.module.ts @@ -5,7 +5,7 @@ import { IndexPageComponent } from './components/index.page.component'; const routes: Routes = [ { - path: '', + path: '**', component: IndexPageComponent } ]; diff --git a/src/app/pages/chat/components/index.page.component.spec.ts b/src/app/pages/chat/components/index.page.component.spec.ts index 6e0c244..30686fe 100644 --- a/src/app/pages/chat/components/index.page.component.spec.ts +++ b/src/app/pages/chat/components/index.page.component.spec.ts @@ -2,7 +2,7 @@ import { TestBed, async } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { IndexPageComponent } from './index.page.component'; -describe('app::pages::organization::IndexPageComponent', () => { +describe('app::pages::chat::IndexPageComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [RouterTestingModule], diff --git a/src/app/pages/chat/components/index.page.component.ts b/src/app/pages/chat/components/index.page.component.ts index 0b54496..71344f3 100644 --- a/src/app/pages/chat/components/index.page.component.ts +++ b/src/app/pages/chat/components/index.page.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app-pages-organization-index', + selector: 'app-pages-chat-index', templateUrl: './index.page.component.html', styleUrls: ['./index.page.component.scss'] }) diff --git a/src/app/pages/group/components/index.page.component.html b/src/app/pages/group/components/index.page.component.html index 9cb0d04..8066cea 100644 --- a/src/app/pages/group/components/index.page.component.html +++ b/src/app/pages/group/components/index.page.component.html @@ -1 +1,3 @@ -Index page of group is works! +
+ index of group +
diff --git a/src/app/pages/group/components/index.page.component.ts b/src/app/pages/group/components/index.page.component.ts index a2b2546..032b6c8 100644 --- a/src/app/pages/group/components/index.page.component.ts +++ b/src/app/pages/group/components/index.page.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { Store } from '@ngrx/store'; @Component({ - selector: 'app-pages-organization-index', + selector: 'app-pages-group-index', templateUrl: './index.page.component.html', styleUrls: ['./index.page.component.scss'] })