From 2613debbfe3d78273761e91e688732183d5b2082 Mon Sep 17 00:00:00 2001 From: Shane Melton Date: Thu, 28 Jul 2022 15:22:59 -0700 Subject: [PATCH] [EC-8] Renamed user billing history component --- apps/web/src/app/modules/loose-components.module.ts | 6 +++--- .../src/app/organizations/organization-routing.module.ts | 4 ++-- ...istory.component.html => billing-history.component.html} | 0 ...ng-history.component.ts => billing-history.component.ts} | 6 +++--- apps/web/src/app/settings/subscription-routing.module.ts | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename apps/web/src/app/settings/{user-billing-history.component.html => billing-history.component.html} (100%) rename apps/web/src/app/settings/{user-billing-history.component.ts => billing-history.component.ts} (94%) diff --git a/apps/web/src/app/modules/loose-components.module.ts b/apps/web/src/app/modules/loose-components.module.ts index 48b3c06734..c8ca630662 100644 --- a/apps/web/src/app/modules/loose-components.module.ts +++ b/apps/web/src/app/modules/loose-components.module.ts @@ -94,6 +94,7 @@ import { AddCreditComponent } from "../settings/add-credit.component"; import { AdjustPaymentComponent } from "../settings/adjust-payment.component"; import { AdjustStorageComponent } from "../settings/adjust-storage.component"; import { ApiKeyComponent } from "../settings/api-key.component"; +import { BillingHistoryComponent } from "../settings/billing-history.component"; import { BillingSyncKeyComponent } from "../settings/billing-sync-key.component"; import { ChangeEmailComponent } from "../settings/change-email.component"; import { ChangeKdfComponent } from "../settings/change-kdf.component"; @@ -131,7 +132,6 @@ import { TwoFactorWebAuthnComponent } from "../settings/two-factor-webauthn.comp import { TwoFactorYubiKeyComponent } from "../settings/two-factor-yubikey.component"; import { UpdateKeyComponent } from "../settings/update-key.component"; import { UpdateLicenseComponent } from "../settings/update-license.component"; -import { UserBillingHistoryComponent } from "../settings/user-billing-history.component"; import { UserSubscriptionComponent } from "../settings/user-subscription.component"; import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.component"; import { VerifyEmailComponent } from "../settings/verify-email.component"; @@ -312,7 +312,7 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga UpdateLicenseComponent, UpdatePasswordComponent, UpdateTempPasswordComponent, - UserBillingHistoryComponent, + BillingHistoryComponent, UserLayoutComponent, UserSubscriptionComponent, UserVerificationComponent, @@ -462,7 +462,7 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga UpdateLicenseComponent, UpdatePasswordComponent, UpdateTempPasswordComponent, - UserBillingHistoryComponent, + BillingHistoryComponent, UserLayoutComponent, UserSubscriptionComponent, UserVerificationComponent, diff --git a/apps/web/src/app/organizations/organization-routing.module.ts b/apps/web/src/app/organizations/organization-routing.module.ts index d2b0dd9a85..09184ec6b5 100644 --- a/apps/web/src/app/organizations/organization-routing.module.ts +++ b/apps/web/src/app/organizations/organization-routing.module.ts @@ -10,8 +10,8 @@ import { OrganizationSubscriptionComponent } from "../modules/organizations/bill import { ReportListComponent } from "../modules/organizations/reporting/report-list.component"; import { ReportingComponent } from "../modules/organizations/reporting/reporting.component"; import { OrganizationVaultModule } from "../modules/vault/modules/organization-vault/organization-vault.module"; +import { BillingHistoryComponent } from "../settings/billing-history.component"; -import { UserBillingHistoryComponent } from "./../settings/user-billing-history.component"; import { PermissionsGuard } from "./guards/permissions.guard"; import { OrganizationLayoutComponent } from "./layouts/organization-layout.component"; import { EventsComponent } from "./manage/events.component"; @@ -168,7 +168,7 @@ const routes: Routes = [ }, { path: "history", - component: UserBillingHistoryComponent, + component: BillingHistoryComponent, canActivate: [PermissionsGuard], data: { titleId: "billingHistory", permissions: [Permissions.ManageBilling] }, }, diff --git a/apps/web/src/app/settings/user-billing-history.component.html b/apps/web/src/app/settings/billing-history.component.html similarity index 100% rename from apps/web/src/app/settings/user-billing-history.component.html rename to apps/web/src/app/settings/billing-history.component.html diff --git a/apps/web/src/app/settings/user-billing-history.component.ts b/apps/web/src/app/settings/billing-history.component.ts similarity index 94% rename from apps/web/src/app/settings/user-billing-history.component.ts rename to apps/web/src/app/settings/billing-history.component.ts index bce371200a..eba9e75483 100644 --- a/apps/web/src/app/settings/user-billing-history.component.ts +++ b/apps/web/src/app/settings/billing-history.component.ts @@ -9,10 +9,10 @@ import { TransactionType } from "@bitwarden/common/enums/transactionType"; import { BillingHistoryResponse } from "@bitwarden/common/models/response/billingHistoryResponse"; @Component({ - selector: "app-user-billing", - templateUrl: "user-billing-history.component.html", + selector: "app-billing-history", + templateUrl: "billing-history.component.html", }) -export class UserBillingHistoryComponent implements OnInit { +export class BillingHistoryComponent implements OnInit { loading = false; firstLoaded = false; billing: BillingHistoryResponse; diff --git a/apps/web/src/app/settings/subscription-routing.module.ts b/apps/web/src/app/settings/subscription-routing.module.ts index ae1e58cb16..874d5479c3 100644 --- a/apps/web/src/app/settings/subscription-routing.module.ts +++ b/apps/web/src/app/settings/subscription-routing.module.ts @@ -1,10 +1,10 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; +import { BillingHistoryComponent } from "./billing-history.component"; import { PaymentMethodComponent } from "./payment-method.component"; import { PremiumComponent } from "./premium.component"; import { SubscriptionComponent } from "./subscription.component"; -import { UserBillingHistoryComponent } from "./user-billing-history.component"; import { UserSubscriptionComponent } from "./user-subscription.component"; const routes: Routes = [ @@ -31,7 +31,7 @@ const routes: Routes = [ }, { path: "billing-history", - component: UserBillingHistoryComponent, + component: BillingHistoryComponent, data: { titleId: "billingHistory" }, }, ],