feature(ng-template): sync changes

pull/1557/head
mehmet-erim 6 years ago
parent ee4101e967
commit 5185ca9505

@ -1,2 +1 @@
@abp:registry=http://192.168.1.45:4873/
@volo:registry=http://192.168.1.45:4873/

@ -5,16 +5,18 @@
"ng": "ng",
"start": "ng serve",
"start:hmr": "ng serve --configuration hmr",
"build": "ng build --configuration production",
"build": "ng build",
"build:prod": "ng build --configuration production",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
},
"private": true,
"dependencies": {
"@abp/ng.account": "^1.1.6",
"@abp/ng.identity": "^1.1.7",
"@abp/ng.theme.basic": "^1.1.6",
"@abp/ng.account": "^0.7.6",
"@abp/ng.identity": "^0.7.6",
"@abp/ng.tenant-management": "^0.7.6",
"@abp/ng.theme.basic": "^0.7.6",
"@angular/animations": "~8.1.2",
"@angular/common": "~8.1.2",
"@angular/compiler": "~8.1.2",

@ -3,6 +3,7 @@ import { ACCOUNT_ROUTES } from '@abp/ng.account';
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { ABP } from '@abp/ng.core';
import { TENANT_MANAGEMENT_ROUTES } from '@abp/ng.tenant-management';
const routes: Routes = [
{ path: '', redirectTo: '/home', pathMatch: 'full' },
@ -25,6 +26,12 @@ const routes: Routes = [
loadChildren: () => import('./lazy-libs/identity-wrapper.module').then(m => m.IdentityWrapperModule),
data: { routes: IDENTITY_ROUTES },
},
{
path: 'tenant-management',
loadChildren: () =>
import('./lazy-libs/tenant-management-wrapper.module').then(m => m.TenantManagementWrapperModule),
data: { routes: TENANT_MANAGEMENT_ROUTES },
},
];
@NgModule({

@ -0,0 +1,7 @@
import { NgModule } from '@angular/core';
import { TenantManagementModule } from '@abp/ng.tenant-management';
@NgModule({
imports: [TenantManagementModule],
})
export class TenantManagementWrapperModule {}

@ -3,9 +3,9 @@ export const environment = {
hmr: true,
oAuthConfig: {
issuer: 'http://localhost:44392',
clientId: 'MyAbpProject_ConsoleTestApp',
clientId: 'MyProjectName_ConsoleTestApp',
dummyClientSecret: '1q2w3e*',
scope: 'MyAbpProject',
scope: 'MyProjectName',
showDebugInformation: true,
oidc: false,
requireHttps: false,
@ -16,6 +16,6 @@ export const environment = {
},
},
localization: {
defaultResourceName: 'MyAbpProject',
defaultResourceName: 'MyProjectName',
},
};

@ -3,9 +3,9 @@ export const environment = {
hmr: false,
oAuthConfig: {
issuer: 'http://localhost:44392',
clientId: 'MyAbpProject_ConsoleTestApp',
clientId: 'MyProjectName_ConsoleTestApp',
dummyClientSecret: '1q2w3e*',
scope: 'MyAbpProject',
scope: 'MyProjectName',
showDebugInformation: true,
oidc: false,
requireHttps: false,
@ -16,6 +16,6 @@ export const environment = {
},
},
localization: {
defaultResourceName: 'MyAbpProject',
defaultResourceName: 'MyProjectName',
},
};

@ -3,9 +3,9 @@ export const environment = {
hmr: false,
oAuthConfig: {
issuer: 'http://localhost:44392',
clientId: 'MyAbpProject_ConsoleTestApp',
clientId: 'MyProjectName_ConsoleTestApp',
dummyClientSecret: '1q2w3e*',
scope: 'MyAbpProject',
scope: 'MyProjectName',
showDebugInformation: true,
oidc: false,
requireHttps: false,
@ -16,6 +16,6 @@ export const environment = {
},
},
localization: {
defaultResourceName: 'MyAbpProject',
defaultResourceName: 'MyProjectName',
},
};

Loading…
Cancel
Save