From 1b54da232ff86891b54219a58e2ee616a46fbe5f Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Mon, 2 Dec 2019 09:42:31 +0300 Subject: [PATCH] fix(module-template): organize home page #2265 --- .../angular/src/app/app-routing.module.ts | 26 ++++++++++++------- .../angular/src/app/home/home.component.html | 19 ++++---------- .../angular/src/app/home/home.component.ts | 2 +- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/templates/module/angular/src/app/app-routing.module.ts b/templates/module/angular/src/app/app-routing.module.ts index 1714a2e06e..89c1250496 100644 --- a/templates/module/angular/src/app/app-routing.module.ts +++ b/templates/module/angular/src/app/app-routing.module.ts @@ -8,31 +8,39 @@ const routes: Routes = [ loadChildren: () => import('./home/home.module').then(m => m.HomeModule), data: { routes: { - name: '::Menu:Home', + name: 'Home', + order: 1, } as ABP.Route, }, }, { - path: 'identity', - loadChildren: () => import('./lazy-libs/identity-wrapper.module').then(m => m.IdentityWrapperModule), + path: 'account', + loadChildren: () => + import('./lazy-libs/account-wrapper.module').then(m => m.AccountWrapperModule), }, { - path: 'tenant-management', + path: 'identity', loadChildren: () => - import('./lazy-libs/tenant-management-wrapper.module').then(m => m.TenantManagementWrapperModule), + import('./lazy-libs/identity-wrapper.module').then(m => m.IdentityWrapperModule), }, { - path: 'account', - loadChildren: () => import('./lazy-libs/account-wrapper.module').then(m => m.AccountWrapperModule), + path: 'tenant-management', + loadChildren: () => + import('./lazy-libs/tenant-management-wrapper.module').then( + m => m.TenantManagementWrapperModule, + ), }, { path: 'setting-management', loadChildren: () => - import('./lazy-libs/setting-management-wrapper.module').then(m => m.SettingManagementWrapperModule), + import('./lazy-libs/setting-management-wrapper.module').then( + m => m.SettingManagementWrapperModule, + ), }, { path: 'my-project-name', - loadChildren: () => import('./lazy-libs/my-project-name-wrapper.module').then(m => m.MyProjectNameWrapperModule), + loadChildren: () => + import('./lazy-libs/my-project-name-wrapper.module').then(m => m.MyProjectNameWrapperModule), }, ]; diff --git a/templates/module/angular/src/app/home/home.component.html b/templates/module/angular/src/app/home/home.component.html index 4fafc67398..54023b80a9 100644 --- a/templates/module/angular/src/app/home/home.component.html +++ b/templates/module/angular/src/app/home/home.component.html @@ -1,15 +1,6 @@ -
-
{{ '::Welcome' | abpLocalization }}
-
-

- {{ '::LongWelcomeMessage' | abpLocalization }} -

-

- {{ 'AbpIdentity::Login' | abpLocalization }} -

-
-

abp.io

-
+
+ diff --git a/templates/module/angular/src/app/home/home.component.ts b/templates/module/angular/src/app/home/home.component.ts index aa56d34131..a42b960493 100644 --- a/templates/module/angular/src/app/home/home.component.ts +++ b/templates/module/angular/src/app/home/home.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { OAuthService } from 'angular-oauth2-oidc'; @Component({ - selector: 'abp-home', + selector: 'app-home', templateUrl: './home.component.html', }) export class HomeComponent {