devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Merge pull request #5106 from bitwarden/ac1202-org-module 

[AC-1202] Move organization module to admin-console
This commit is contained in:
Vincent Salucci 2023-03-29 11:53:05 -05:00 committed by GitHub
parent e238ea20a9 3bf9930642
commit 38ac227936
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/web/src/app/admin-console/organizations/organization.module.ts Normal file
View File

@ -0,0 +1,20 @@
import { NgModule } from "@angular/core";
import { CoreOrganizationModule } from "../../organizations/core";
import { SharedOrganizationModule } from "../../organizations/shared";
import { GroupAddEditComponent } from "./manage/group-add-edit.component";
import { GroupsComponent } from "./manage/groups.component";
import { OrganizationsRoutingModule } from "./organization-routing.module";
import { AccessSelectorModule } from "./shared/components/access-selector";
@NgModule({
imports: [
SharedOrganizationModule,
AccessSelectorModule,
CoreOrganizationModule,
OrganizationsRoutingModule,
],
declarations: [GroupsComponent, GroupAddEditComponent],
})
export class OrganizationModule {}

20
apps/web/src/app/organizations/organization.module.ts
View File

@ -1,20 +0,0 @@
import { NgModule } from "@angular/core";
import { GroupAddEditComponent } from "../admin-console/organizations/manage/group-add-edit.component";
import { GroupsComponent } from "../admin-console/organizations/manage/groups.component";
import { OrganizationsRoutingModule } from "../admin-console/organizations/organization-routing.module";
import { AccessSelectorModule } from "../admin-console/organizations/shared/components/access-selector";
import { CoreOrganizationModule } from "./core";
import { SharedOrganizationModule } from "./shared";
@NgModule({
imports: [
SharedOrganizationModule,
AccessSelectorModule,
CoreOrganizationModule,
OrganizationsRoutingModule,
],
declarations: [GroupsComponent, GroupAddEditComponent],
})
export class OrganizationModule {}

2
apps/web/src/app/oss-routing.module.ts
View File

@ -27,6 +27,7 @@ import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.comp
import { flagEnabled, Flags } from "../utils/flags";
import { TrialInitiationComponent } from "./accounts/trial-initiation/trial-initiation.component";
import { OrganizationModule } from "./admin-console/organizations/organization.module";
import { AcceptFamilySponsorshipComponent } from "./admin-console/organizations/sponsorships/accept-family-sponsorship.component";
import { FamiliesForEnterpriseSetupComponent } from "./admin-console/organizations/sponsorships/families-for-enterprise-setup.component";
import { CreateOrganizationComponent } from "./admin-console/settings/create-organization.component";
@ -34,7 +35,6 @@ import { SponsoredFamiliesComponent } from "./admin-console/settings/sponsored-f
import { HomeGuard } from "./guards/home.guard";
import { FrontendLayoutComponent } from "./layouts/frontend-layout.component";
import { UserLayoutComponent } from "./layouts/user-layout.component";
import { OrganizationModule } from "./organizations/organization.module";
import { ReportsModule } from "./reports";
import { AccountComponent } from "./settings/account.component";
import { DomainRulesComponent } from "./settings/domain-rules.component";