From a1347eb03e610c2d66b25b5580d326953ac2fef3 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Tue, 24 Mar 2020 19:47:08 +0200
Subject: [PATCH] UI: fix routing

---
 ui-ngx/src/app/app.module.ts                   | 18 +++++++++++++++++-
 .../modules/home/pages/home-pages.module.ts    | 17 +----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ui-ngx/src/app/app.module.ts b/ui-ngx/src/app/app.module.ts
index 4c7d0feca8..64ec2095a5 100644
--- a/ui-ngx/src/app/app.module.ts
+++ b/ui-ngx/src/app/app.module.ts
@@ -25,6 +25,21 @@ import { HomeModule } from '@home/home.module';
 
 import { AppComponent } from './app.component';
 import { DashboardRoutingModule } from '@modules/dashboard/dashboard-routing.module';
+import { RouterModule, Routes } from '@angular/router';
+
+const routes: Routes = [
+  { path: '**',
+    redirectTo: 'home'
+  }
+];
+
+@NgModule({
+  imports: [
+    RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class PageNotFoundRoutingModule { }
+
 
 @NgModule({
   declarations: [
@@ -36,8 +51,9 @@ import { DashboardRoutingModule } from '@modules/dashboard/dashboard-routing.mod
     AppRoutingModule,
     CoreModule,
     LoginModule,
+    HomeModule,
     DashboardRoutingModule,
-    HomeModule
+    PageNotFoundRoutingModule
   ],
   providers: [],
   bootstrap: [AppComponent]
diff --git a/ui-ngx/src/app/modules/home/pages/home-pages.module.ts b/ui-ngx/src/app/modules/home/pages/home-pages.module.ts
index 47eb131334..8ff4824c10 100644
--- a/ui-ngx/src/app/modules/home/pages/home-pages.module.ts
+++ b/ui-ngx/src/app/modules/home/pages/home-pages.module.ts
@@ -29,20 +29,6 @@ import { EntityViewModule } from '@modules/home/pages/entity-view/entity-view.mo
 import { RuleChainModule } from '@modules/home/pages/rulechain/rulechain.module';
 import { WidgetLibraryModule } from '@modules/home/pages/widget/widget-library.module';
 import { DashboardModule } from '@modules/home/pages/dashboard/dashboard.module';
-import { RouterModule, Routes } from '@angular/router';
-
-const routes: Routes = [
-  { path: '**',
-    redirectTo: 'home'
-  }
-];
-
-@NgModule({
-  imports: [
-    RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class PageNotFoundRoutingModule { }
 
 @NgModule({
   exports: [
@@ -58,8 +44,7 @@ export class PageNotFoundRoutingModule { }
     WidgetLibraryModule,
     DashboardModule,
     AuditLogModule,
-    UserModule,
-    PageNotFoundRoutingModule
+    UserModule
   ]
 })
 export class HomePagesModule { }