Skip to content

Commit d38a1a8

Browse files
committed
Remove appmodule import from root module.
1 parent 860cebf commit d38a1a8

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

angular/obj/Debug/TypeScriptCompilerOutput.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,3 +222,7 @@ D:\Repositories\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.po
222222
D:\Repositories\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.po.js.map
223223
D:\Repositories\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.e2e-spec.js
224224
D:\Repositories\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.e2e-spec.js.map
225+
D:\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.po.js
226+
D:\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.po.js.map
227+
D:\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.e2e-spec.js
228+
D:\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.e2e-spec.js.map

angular/src/app/app.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ import { SharedModule } from '@shared/common/shared.module';
1616
import { API_BASE_URL } from '@shared/service-proxies/service-proxies';
1717
import { AppConsts } from '@shared/AppConsts';
1818

19-
import { AppSessionService } from '@shared/common/session/app-session.service';
20-
2119
import { HomeComponent } from '@app/home/home.component';
2220

2321
@NgModule({

angular/src/root.module.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { NgModule, Injector, APP_INITIALIZER } from '@angular/core';
33

44
import { AbpModule, ABP_HTTP_PROVIDER } from '@abp/abp.module';
55

6-
import { AppModule } from './app/app.module';
76
import { SharedModule } from '@shared/common/shared.module';
87
import { ServiceProxyModule } from '@shared/service-proxies/service-proxy.module';
98
import { RootRoutingModule } from './root-routing.module';
@@ -17,11 +16,11 @@ import { AppPreBootstrap } from './AppPreBootstrap';
1716

1817
export function appInitializerFactory(injector: Injector) {
1918
return () => {
19+
console.log("appInitializerFactory");
2020
abp.ui.setBusy();
2121
return new Promise<boolean>((resolve, reject) => {
2222
AppPreBootstrap.run(() => {
2323
var appSessionService: AppSessionService = injector.get(AppSessionService);
24-
2524
appSessionService.init().then(
2625
(result) => {
2726
abp.ui.clearBusy();
@@ -46,7 +45,6 @@ export function getRemoteServiceBaseUrl(): string {
4645
@NgModule({
4746
imports: [
4847
BrowserModule,
49-
AppModule,
5048
SharedModule.forRoot(),
5149
AbpModule,
5250
ServiceProxyModule,

angular/src/shared/common/auth/auth-route-guard.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export class AppRouteGuard implements CanActivate, CanActivateChild {
2121
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
2222
console.log("can activate ?");
2323
if (!this._sessionService.user) {
24+
console.log("no session");
2425
this._router.navigate(['/account/login']);
2526
return false;
2627
}

angular/src/shared/common/session/app-session.service.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export class AppSessionService {
1212
constructor(
1313
private _sessionService: SessionServiceProxy,
1414
private _abpMultiTenancyService: AbpMultiTenancyService) {
15+
console.log('created AppSessionService');
1516
}
1617

1718
get application(): ApplicationInfoDto {
@@ -49,6 +50,7 @@ export class AppSessionService {
4950
this._application = result.application;
5051
this._user = result.user;
5152
this._tenant = result.tenant;
53+
console.log('session init set user');
5254
resolve(true);
5355
}, (err) => {
5456
reject(err);

0 commit comments

Comments
 (0)