Upstream
/
bitwarden-browser
mirror of https://github.com/bitwarden/browser.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SM-451] Remove NavigationModule from SharedModule (#4510) 

* Remove NavigationModule from SharedModule

* Update apps/web/src/app/shared/shared.module.ts
This commit is contained in:
Oscar Hinton 2023-01-23 10:10:25 +01:00 committed by GitHub
parent 139826ffe6
commit 72ec05a3e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/web/src/app/shared/shared.module.ts
View File

@ -13,20 +13,19 @@ import {
BadgeListModule,
BadgeModule,
ButtonModule,
IconButtonModule,
CalloutModule,
CheckboxModule,
ColorPasswordModule,
DialogModule,
FormFieldModule,
IconButtonModule,
IconModule,
LinkModule,
MenuModule,
MultiSelectModule,
NavigationModule,
TableModule,
TabsModule,
ToggleGroupModule,
ColorPasswordModule,
} from "@bitwarden/components";
// Register the locales for the application
@ -50,14 +49,16 @@ import "./locales";
ToastrModule,
JslibModule,
// Component library
// Component library modules
// Only add components that are used almost everywhere in the application
AsyncActionsModule,
AvatarModule,
BadgeModule,
BadgeListModule,
BadgeModule,
ButtonModule,
CalloutModule,
CheckboxModule,
ColorPasswordModule,
DialogModule,
FormFieldModule,
IconButtonModule,
@ -65,12 +66,9 @@ import "./locales";
LinkModule,
MenuModule,
MultiSelectModule,
NavigationModule,
TableModule,
TabsModule,
ToggleGroupModule,
LinkModule,
ColorPasswordModule,
// Web specific
],
@ -87,11 +85,12 @@ import "./locales";
// Component library
AsyncActionsModule,
AvatarModule,
BadgeModule,
BadgeListModule,
BadgeModule,
ButtonModule,
CalloutModule,
CheckboxModule,
ColorPasswordModule,
DialogModule,
FormFieldModule,
IconButtonModule,
@ -99,12 +98,9 @@ import "./locales";
LinkModule,
MenuModule,
MultiSelectModule,
NavigationModule,
TableModule,
TabsModule,
ToggleGroupModule,
LinkModule,
ColorPasswordModule,
// Web specific
],

14
bitwarden_license/bit-web/src/app/secrets-manager/layout/layout.module.ts Normal file
View File

@ -0,0 +1,14 @@
import { NgModule } from "@angular/core";
import { NavigationModule } from "@bitwarden/components";
import { SharedModule } from "@bitwarden/web-vault/app/shared/shared.module";
import { LayoutComponent } from "./layout.component";
import { NavigationComponent } from "./navigation.component";
import { OrgSwitcherComponent } from "./org-switcher.component";
@NgModule({
imports: [SharedModule, NavigationModule],
declarations: [LayoutComponent, NavigationComponent, OrgSwitcherComponent],
})
export class LayoutModule {}

7
bitwarden_license/bit-web/src/app/secrets-manager/secrets-manager.module.ts
View File

@ -2,16 +2,13 @@ import { NgModule } from "@angular/core";
import { SharedModule } from "@bitwarden/web-vault/app/shared";
import { LayoutComponent } from "./layout/layout.component";
import { NavigationComponent } from "./layout/navigation.component";
import { OrgSwitcherComponent } from "./layout/org-switcher.component";
import { LayoutModule } from "./layout/layout.module";
import { SecretsManagerSharedModule } from "./shared/sm-shared.module";
import { SecretsManagerRoutingModule } from "./sm-routing.module";
import { SMGuard } from "./sm.guard";
@NgModule({
imports: [SharedModule, SecretsManagerSharedModule, SecretsManagerRoutingModule],
declarations: [LayoutComponent, NavigationComponent, OrgSwitcherComponent],
imports: [SharedModule, SecretsManagerSharedModule, SecretsManagerRoutingModule, LayoutModule],
providers: [SMGuard],
})
export class SecretsManagerModule {}