[incubator-dlab] 06/06: moved servise pages; separate service page module

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 1cd5653cbab71c268271dd1aded39eeb670a26b7
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Sep 13 11:20:52 2019 +0300

    moved servise pages; separate service page module
---
 .../main/resources/webapp/src/app/app.module.ts    | 38 ++++++++++------------
 .../resources/webapp/src/app/app.routing.module.ts |  4 +--
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/app/app.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.module.ts
index 0caf8eb..82629e4 100644
--- a/services/self-service/src/main/resources/webapp/src/app/app.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/app.module.ts
@@ -37,8 +37,7 @@ import { LoginModule } from './login/login.module';
 import { LayoutModule } from './layout/layout.module'
 
 import { GuidesModule } from './help';
-import { NotFoundModule } from './not-found/not-found.module';
-import { AccessDeniedModule } from './access-denied/access-denied.module';
+import { ServicePagesModule } from './service-pages/service-pages.module';
 import { ResourcesModule } from './resources/resources.module';
 
 import { ReportingModule } from './reporting/reporting.module';
@@ -58,8 +57,7 @@ import { CoreModule } from './core/core.module';
     LayoutModule,
     ResourcesModule,
     GuidesModule,
-    NotFoundModule,
-    AccessDeniedModule,
+    ServicePagesModule,
     ReportingModule,
     AdministrationModule,
     WebterminalModule,
@@ -69,22 +67,22 @@ import { CoreModule } from './core/core.module';
     ToastrModule.forRoot({ timeOut: 10000 })
   ],
   providers: [{
-      provide: LocationStrategy,
-      useClass: HashLocationStrategy,
-      useValue: '/'
-    }, {
-      provide: HTTP_INTERCEPTORS,
-      useClass: HttpTokenInterceptor,
-      multi: true
-    }, {
-      provide: HTTP_INTERCEPTORS,
-      useClass: NoCacheInterceptor,
-      multi: true,
-    }, {
-      provide: HTTP_INTERCEPTORS,
-      useClass: ErrorInterceptor,
-      multi: true,
-    }
+    provide: LocationStrategy,
+    useClass: HashLocationStrategy,
+    useValue: '/'
+  }, {
+    provide: HTTP_INTERCEPTORS,
+    useClass: HttpTokenInterceptor,
+    multi: true
+  }, {
+    provide: HTTP_INTERCEPTORS,
+    useClass: NoCacheInterceptor,
+    multi: true,
+  }, {
+    provide: HTTP_INTERCEPTORS,
+    useClass: ErrorInterceptor,
+    multi: true,
+  }
   ],
   bootstrap: [AppComponent]
 })
diff --git a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
index a608deb..091217d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
@@ -24,8 +24,8 @@ import { LoginComponent } from './login/login.module';
 import { LayoutComponent } from './layout/layout.component'
 import { ResourcesComponent } from './resources/resources.component';
 import { AccessNotebookGuideComponent, PublicKeyGuideComponent } from './help';
-import { NotFoundComponent } from './not-found/not-found.component';
-import { AccessDeniedComponent } from './access-denied/access-denied.component';
+import { NotFoundComponent } from './service-pages/not-found/not-found.component';
+import { AccessDeniedComponent } from './service-pages/access-denied/access-denied.component';
 import { ReportingComponent } from './reporting/reporting.component';
 import { WebterminalComponent } from './webterminal/webterminal.component';
 import { ManagementComponent } from './administration/management/management.component';


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org