1
0
mirror of https://github.com/bitwarden/browser synced 2026-02-08 20:50:28 +00:00

feat(billing): Add upgrade from free account dialog

This commit is contained in:
Stephon Brown
2025-09-17 18:31:14 -04:00
parent 403410b619
commit d3a8690578
3 changed files with 210 additions and 0 deletions

View File

@@ -0,0 +1,48 @@
<bit-dialog dialogSize="large">
<div bitDialogContent>
<header class="tw-flex tw-text-center tw-flex-col">
<h1 class="tw-font-semibold">{{ "individualUpgradeWelcomeMessage" | i18n }}</h1>
<p bitTypography="body1" class="tw-text-muted">
{{ "individualUpgradeDescriptionMessage" | i18n }}
</p>
</header>
<div class="tw-flex tw-flex-col lg:tw-flex-row tw-gap-6">
@if (premiumCardDetails) {
<billing-pricing-card
class="tw-flex-1 tw-basis-0"
[tagline]="premiumCardDetails.tagline"
[price]="premiumCardDetails.price"
[button]="premiumCardDetails.button"
[features]="premiumCardDetails.features"
(buttonClick)="onProceedClick(premiumPlanType)"
>
<h3 slot="title" class="tw-m-0" bitTypography="h3">
{{ premiumCardDetails.title }}
</h3>
</billing-pricing-card>
}
@if (familiesCardDetails) {
<billing-pricing-card
class="tw-flex-1 tw-basis-0"
[tagline]="familiesCardDetails.tagline"
[price]="familiesCardDetails.price"
[button]="familiesCardDetails.button"
[features]="familiesCardDetails.features"
(buttonClick)="onProceedClick(familiesPlanType)"
>
<h3 slot="title" class="tw-m-0" bitTypography="h3">
{{ familiesCardDetails.title }}
</h3>
</billing-pricing-card>
}
</div>
</div>
<footer bitDialogFooter class="tw-text-center tw-w-full">
<p bitTypography="helper" class="tw-text-muted tw-italic">
{{ "individualUpgradeTaxInformationMessage" | i18n }}
</p>
</footer>
</bit-dialog>

View File

@@ -0,0 +1,22 @@
import { ComponentFixture, TestBed } from "@angular/core/testing";
import { UpgradeAccountDialogComponent } from "./upgrade-account-dialog.component";
describe("UpgradeAccountDialogComponent", () => {
let component: UpgradeAccountDialogComponent;
let fixture: ComponentFixture<UpgradeAccountDialogComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [UpgradeAccountDialogComponent],
}).compileComponents();
fixture = TestBed.createComponent(UpgradeAccountDialogComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it("should create", () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,140 @@
import { Component, DestroyRef, OnInit, OnDestroy } from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { Subject } from "rxjs";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
import { ButtonType, DialogModule, DialogRef, DialogService } from "@bitwarden/components";
import { PricingCardComponent } from "@bitwarden/pricing";
import { SharedModule } from "../../../../shared";
import { BillingServicesModule } from "../../../services";
import { SubscriptionPricingService } from "../../../services/subscription-pricing.service";
import {
PersonalSubscriptionPricingTier,
PersonalSubscriptionPricingTierId,
PersonalSubscriptionPricingTierIds,
} from "../../../types/subscription-pricing-tier";
export const UpgradeAccountDialogStatus = {
Closed: "closed",
ProceededToPayment: "proceeded-to-payment",
} as const;
export type UpgradeAccountDialogStatus = UnionOfValues<typeof UpgradeAccountDialogStatus>;
export type UpgradeAccountDialogResult = {
status: UpgradeAccountDialogStatus;
plan: PersonalSubscriptionPricingTierId | null;
};
type CardDetails = {
title: string;
tagline: string;
price: { amount: number; cadence: "monthly" | "annually" };
button: { text: string; type: ButtonType };
features: string[];
};
@Component({
selector: "app-upgrade-account-dialog",
imports: [DialogModule, SharedModule, BillingServicesModule, PricingCardComponent],
templateUrl: "./upgrade-account-dialog.component.html",
})
export class UpgradeAccountDialogComponent implements OnInit, OnDestroy {
protected premiumCardDetails!: CardDetails;
protected familiesCardDetails!: CardDetails;
protected familiesPlanType = PersonalSubscriptionPricingTierIds.Families;
protected premiumPlanType = PersonalSubscriptionPricingTierIds.Premium;
private destroy$ = new Subject<void>();
constructor(
private dialogRef: DialogRef<UpgradeAccountDialogResult>,
private i18nService: I18nService,
private subscriptionPricingService: SubscriptionPricingService,
private destroyRef: DestroyRef,
) {}
ngOnInit(): void {
this.subscriptionPricingService
.getPersonalSubscriptionPricingTiers$()
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe((plans) => {
this.setupCardDetails(plans);
});
}
/** Setup card details for the pricing tiers.
* This can be extended in the future for business plans, etc.
*/
private setupCardDetails(plans: PersonalSubscriptionPricingTier[]): void {
const premiumTier = plans.find(
(tier) => tier.id === PersonalSubscriptionPricingTierIds.Premium,
);
const familiesTier = plans.find(
(tier) => tier.id === PersonalSubscriptionPricingTierIds.Families,
);
if (premiumTier) {
this.premiumCardDetails = this.createCardDetails(premiumTier, "primary");
}
if (familiesTier) {
this.familiesCardDetails = this.createCardDetails(familiesTier, "secondary");
}
}
private createCardDetails(
tier: PersonalSubscriptionPricingTier,
buttonType: ButtonType,
): CardDetails {
return {
title: tier.name,
tagline: tier.description,
price: {
amount: tier.passwordManager.annualPrice / 12,
cadence: "monthly",
},
button: {
text: this.i18nService.t(
this.isFamiliesPlan(tier.id) ? "upgradeToFamilies" : "upgradeToPremium",
),
type: buttonType,
},
features: tier.passwordManager.features.map((f: any) => f.value),
};
}
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
}
protected onProceedClick(plan: PersonalSubscriptionPricingTierId): void {
this.close({
status: UpgradeAccountDialogStatus.ProceededToPayment,
plan,
});
}
private isFamiliesPlan(plan: PersonalSubscriptionPricingTierId): boolean {
return plan === PersonalSubscriptionPricingTierIds.Families;
}
protected onCloseClick(): void {
this.close({
status: UpgradeAccountDialogStatus.Closed,
plan: null,
});
}
private close(result: UpgradeAccountDialogResult): void {
this.dialogRef.close(result);
}
static open(dialogService: DialogService): DialogRef<UpgradeAccountDialogResult> {
return dialogService.open<UpgradeAccountDialogResult>(UpgradeAccountDialogComponent);
}
}