Browse Source

Revert accidental cnesting of org routes (#1670)

pull/1674/head
Thomas Rittson 4 years ago committed by GitHub
parent
commit
888892b3e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/app/organizations/layouts/organization-layout.component.html
  2. 14
      src/app/oss-routing.module.ts

2
src/app/organizations/layouts/organization-layout.component.html

@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
<app-navbar></app-navbar>
<div class="org-nav" *ngIf="organization">
<div class="container d-flex">
<div class="d-flex flex-column">
@ -35,3 +36,4 @@ @@ -35,3 +36,4 @@
</div>
</div>
<router-outlet></router-outlet>
<app-footer></app-footer>

14
src/app/oss-routing.module.ts

@ -229,15 +229,15 @@ const routes: Routes = [ @@ -229,15 +229,15 @@ const routes: Routes = [
(await import("./reports/reports-routing.module")).ReportsRoutingModule,
},
{ path: "setup/families-for-enterprise", component: FamiliesForEnterpriseSetupComponent },
{
path: "organizations",
loadChildren: () =>
import("./organizations/organization-routing.module").then(
(m) => m.OrganizationsRoutingModule
),
},
],
},
{
path: "organizations",
loadChildren: () =>
import("./organizations/organization-routing.module").then(
(m) => m.OrganizationsRoutingModule
),
},
];
@NgModule({

Loading…
Cancel
Save