Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0

ui-ngx/src/app/app.module.ts

@@ -36,8 +36,8 @@ import { DashboardRoutingModule } from '@modules/dashboard/dashboard-routing.mod
     AppRoutingModule,
     CoreModule,
     LoginModule,
-    HomeModule,
+    DashboardRoutingModule,
-    DashboardRoutingModule
+    HomeModule
   ],
   providers: [],
   bootstrap: [AppComponent]

ui-ngx/src/app/modules/home/pages/home-pages.module.ts

@@ -29,6 +29,20 @@ import {EntityViewModule} from '@modules/home/pages/entity-view/entity-view.modu
 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: [
@@ -44,7 +58,8 @@ import {DashboardModule} from '@modules/home/pages/dashboard/dashboard.module';
     WidgetLibraryModule,
     DashboardModule,
     AuditLogModule,
-    UserModule
+    UserModule,
+    PageNotFoundRoutingModule
   ]
 })
 export class HomePagesModule { }