bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-03 00:53:23 +00:00
Code Issues Releases Wiki Activity

[PM-8517] Create web specific layout (#9209)

Browse Source 
We currently duplicate some logic between our layouts. In an effort to streamline our experience I'm exploring if we can create a web specific layout that handles some of this.
This commit is contained in:
Oscar Hinton
2024-07-11 18:20:56 +02:00
committed by GitHub
parent 9a58b3b774
commit 39eed02904
16 changed files with 111 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
View File

@@ -1,5 +1,5 @@
<bit-layout>
<bit-side-nav variant="secondary" *ngIf="organization$ | async as organization">
<app-layout>
<app-side-nav variant="secondary" *ngIf="organization$ | async as organization">
<bit-nav-logo [openIcon]="logo" route="." [label]="'adminConsole' | i18n"></bit-nav-logo>
<org-switcher [filter]="orgFilter" [hideNewButton]="hideNewOrgButton$ | async"></org-switcher>
@@ -103,12 +103,7 @@
*ngIf="organization.canManageScim"
></bit-nav-item>
</bit-nav-group>
<ng-container slot="footer">
<navigation-product-switcher></navigation-product-switcher>
<app-toggle-width></app-toggle-width>
</ng-container>
</bit-side-nav>
</app-side-nav>
<ng-container *ngIf="organization$ | async as organization">
<bit-banner
@@ -118,10 +113,7 @@
>
{{ "accessingUsingProvider" | i18n: organization.providerName }}
</bit-banner>
<app-payment-method-warnings
*ngIf="showPaymentMethodWarningBanners$ | async"
></app-payment-method-warnings>
</ng-container>
<router-outlet></router-outlet>
</bit-layout>
</app-layout>

16
apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
View File

@@ -22,12 +22,10 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { BannerModule, IconModule, LayoutComponent, NavigationModule } from "@bitwarden/components";
import { BannerModule, IconModule } from "@bitwarden/components";
import { PaymentMethodWarningsModule } from "../../../billing/shared";
import { OrgSwitcherComponent } from "../../../layouts/org-switcher/org-switcher.component";
import { ProductSwitcherModule } from "../../../layouts/product-switcher/product-switcher.module";
import { ToggleWidthComponent } from "../../../layouts/toggle-width.component";
import { WebLayoutModule } from "../../../layouts/web-layout.module";
import { AdminConsoleLogo } from "../../icons/admin-console-logo";
@Component({
@@ -38,14 +36,10 @@ import { AdminConsoleLogo } from "../../icons/admin-console-logo";
CommonModule,
RouterModule,
JslibModule,
LayoutComponent,
WebLayoutModule,
IconModule,
NavigationModule,
OrgSwitcherComponent,
BannerModule,
PaymentMethodWarningsModule,
ToggleWidthComponent,
ProductSwitcherModule,
],
})
export class OrganizationLayoutComponent implements OnInit, OnDestroy {
@@ -64,10 +58,6 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy {
FeatureFlag.EnableConsolidatedBilling,
);
protected showPaymentMethodWarningBanners$ = this.configService.getFeatureFlag$(
FeatureFlag.ShowPaymentMethodWarningBanners,
);
constructor(
private route: ActivatedRoute,
private organizationService: OrganizationService,