commit 628af6680b6791e0119b47bb918e01e5ec948dac
author Martin Gardyan <martin.gardyan@pta.de> Tue Dec 01 08:46:30 2020 +0100
committer Martin Gardyan <martin.gardyan@pta.de> Tue Dec 01 08:46:30 2020 +0100
tree 194771c0748045fffff5318af8675a89625d81ef
parent 539ee57cc5d3fa2ed119e20b07ec0db53589af6f

Routing adjusted

src/app/app-routing.module.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 6b980b2..5dce8d7 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -15,10 +15,16 @@
 import { PageNotFoundComponent } from '@shared/components/pageNotFound/pageNotFound.component';
 import { LogoutPageComponent } from '@pages/logout/logout/logout.component';
 import { LoggedoutPageComponent } from '@pages/logout/loggedout/loggedout.component';
+import { Globals } from './shared/constants/globals';
 
+const PATH = Globals.PATH;
 const appRoutes: Routes = [
   { path: '', redirectTo: '/overview', pathMatch: 'full' },
   {
+    path: PATH.COMPANY,
+    loadChildren: './pages/company/company.module#CompanyModule',
+  },
+  {
     path: 'admin',
     loadChildren: './pages/admin/admin.module#AdminModule',
   },

src/app/app.module.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 1f5a4b4..838fec4 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -108,9 +108,6 @@
     ContainersModule,
     ContactsModule,
     PersonsModule,
-    CompanyRoutingModule,
-    CompanyModule,
-    AdminModule,
     AppRoutingModule,
     NgbModalModule,
     LogoutModule,

src/app/pages/company/company.module.ts

diff --git a/src/app/pages/company/company.module.ts b/src/app/pages/company/company.module.ts
index 2a3e0e2..436a0b4 100644
--- a/src/app/pages/company/company.module.ts
+++ b/src/app/pages/company/company.module.ts
@@ -61,7 +61,7 @@
     StoreModule.forFeature('companyData', companyReducers),
     AgGridModule.withComponents([SetFilterComponent]),
     ContainersModule,
-
+    CompanyRoutingModule,
     EffectsModule.forFeature([CompanyEffect, ContactPersonEffect]),
   ],
   declarations: [

src/app/pages/company/company.routing.module.ts

diff --git a/src/app/pages/company/company.routing.module.ts b/src/app/pages/company/company.routing.module.ts
index a851609..d6b2f3f 100644
--- a/src/app/pages/company/company.routing.module.ts
+++ b/src/app/pages/company/company.routing.module.ts
@@ -22,7 +22,7 @@
 
 const editCompanyRoutes: Routes = [
   {
-    path: `${PATH.COMPANY}/:contactId`,
+    path: `:contactId`,
     component: CompanyDetailsComponent,
     resolve: {
       company: CompanyDetailsResolver,
@@ -32,7 +32,7 @@
 
 const addNewCompanyRoutes: Routes = [
   {
-    path: `${PATH.COMPANY}/${PATH.NEW}`,
+    path: `${PATH.NEW}`,
     component: CompanyDetailsComponent,
     resolve: {
       externalPerson: CompanyDetailsResolver,
@@ -42,7 +42,7 @@
 
 const contactPersonsRoutes: Routes = [
   {
-    path: `${PATH.COMPANY}/:contactId/${PATH.CONTACT_PERSON}/:contactPersonId`,
+    path: `:contactId/${PATH.CONTACT_PERSON}/:contactPersonId`,
     component: CompanyContactPersonDetailsComponent,
     resolve: {
       contactPersonsDetails: ContactPersonDetailsResolver,
@@ -51,7 +51,7 @@
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot([...addNewCompanyRoutes, ...editCompanyRoutes, ...contactPersonsRoutes])],
+  imports: [RouterModule.forChild([...addNewCompanyRoutes, ...editCompanyRoutes, ...contactPersonsRoutes])],
   exports: [RouterModule],
 })
 export class CompanyRoutingModule {}