dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Artem Halushko 2020-03-23 19:23:03 +02:00
commit 76b995d10c
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/app.module.ts
View File

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

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

@ -23,12 +23,26 @@ import { TenantModule } from '@modules/home/pages/tenant/tenant.module';
import { CustomerModule } from '@modules/home/pages/customer/customer.module'; import { CustomerModule } from '@modules/home/pages/customer/customer.module';
import { AuditLogModule } from '@modules/home/pages/audit-log/audit-log.module'; import { AuditLogModule } from '@modules/home/pages/audit-log/audit-log.module';
import { UserModule } from '@modules/home/pages/user/user.module'; import { UserModule } from '@modules/home/pages/user/user.module';
import {DeviceModule} from '@modules/home/pages/device/device.module'; import { DeviceModule } from '@modules/home/pages/device/device.module';
import {AssetModule} from '@modules/home/pages/asset/asset.module'; import { AssetModule } from '@modules/home/pages/asset/asset.module';
import {EntityViewModule} from '@modules/home/pages/entity-view/entity-view.module'; import { EntityViewModule } from '@modules/home/pages/entity-view/entity-view.module';
import {RuleChainModule} from '@modules/home/pages/rulechain/rulechain.module'; import { RuleChainModule } from '@modules/home/pages/rulechain/rulechain.module';
import {WidgetLibraryModule} from '@modules/home/pages/widget/widget-library.module'; import { WidgetLibraryModule } from '@modules/home/pages/widget/widget-library.module';
import {DashboardModule} from '@modules/home/pages/dashboard/dashboard.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({ @NgModule({
exports: [ exports: [
@ -44,7 +58,8 @@ import {DashboardModule} from '@modules/home/pages/dashboard/dashboard.module';
WidgetLibraryModule, WidgetLibraryModule,
DashboardModule, DashboardModule,
AuditLogModule, AuditLogModule,
UserModule UserModule,
PageNotFoundRoutingModule
] ]
}) })
export class HomePagesModule { } export class HomePagesModule { }