Commit a1347eb03e610c2d66b25b5580d326953ac2fef3

Authored by Igor Kulikov
1 parent 07bbf3d7

UI: fix routing

... ... @@ -25,6 +25,21 @@ import { HomeModule } from '@home/home.module';
25 25
26 26 import { AppComponent } from './app.component';
27 27 import { DashboardRoutingModule } from '@modules/dashboard/dashboard-routing.module';
  28 +import { RouterModule, Routes } from '@angular/router';
  29 +
  30 +const routes: Routes = [
  31 + { path: '**',
  32 + redirectTo: 'home'
  33 + }
  34 +];
  35 +
  36 +@NgModule({
  37 + imports: [
  38 + RouterModule.forChild(routes)],
  39 + exports: [RouterModule]
  40 +})
  41 +export class PageNotFoundRoutingModule { }
  42 +
28 43
29 44 @NgModule({
30 45 declarations: [
... ... @@ -36,8 +51,9 @@ import { DashboardRoutingModule } from '@modules/dashboard/dashboard-routing.mod
36 51 AppRoutingModule,
37 52 CoreModule,
38 53 LoginModule,
  54 + HomeModule,
39 55 DashboardRoutingModule,
40   - HomeModule
  56 + PageNotFoundRoutingModule
41 57 ],
42 58 providers: [],
43 59 bootstrap: [AppComponent]
... ...
... ... @@ -29,20 +29,6 @@ import { EntityViewModule } from '@modules/home/pages/entity-view/entity-view.mo
29 29 import { RuleChainModule } from '@modules/home/pages/rulechain/rulechain.module';
30 30 import { WidgetLibraryModule } from '@modules/home/pages/widget/widget-library.module';
31 31 import { DashboardModule } from '@modules/home/pages/dashboard/dashboard.module';
32   -import { RouterModule, Routes } from '@angular/router';
33   -
34   -const routes: Routes = [
35   - { path: '**',
36   - redirectTo: 'home'
37   - }
38   -];
39   -
40   -@NgModule({
41   - imports: [
42   - RouterModule.forChild(routes)],
43   - exports: [RouterModule]
44   -})
45   -export class PageNotFoundRoutingModule { }
46 32
47 33 @NgModule({
48 34 exports: [
... ... @@ -58,8 +44,7 @@ export class PageNotFoundRoutingModule { }
58 44 WidgetLibraryModule,
59 45 DashboardModule,
60 46 AuditLogModule,
61   - UserModule,
62   - PageNotFoundRoutingModule
  47 + UserModule
63 48 ]
64 49 })
65 50 export class HomePagesModule { }
... ...