From 26a0594056134ae86bca4dbb70a7f5b929415ce1 Mon Sep 17 00:00:00 2001 From: Conner Turnbull <133619638+cturnbull-bitwarden@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:17:00 -0500 Subject: [PATCH] [PM-17655] Billing Code Ownership Updates (#13105) * Moved has-premium.guard under billing * Moved free-trial.ts to billing * Moved premium directives to billing * Moved families-policy.service.ts to billing * Moved trial initiation from auth to billing --- .../{ => billing}/services/families-policy.service.spec.ts | 0 .../src/{ => billing}/services/families-policy.service.ts | 0 .../about-page/more-from-bitwarden-page-v2.component.ts | 2 +- .../src/app/{core => billing}/guards/has-premium.guard.ts | 0 .../payment-method/organization-payment-method.component.ts | 2 +- apps/web/src/app/billing/services/trial-flow.service.ts | 2 +- apps/web/src/app/billing/shared/payment-method.component.ts | 2 +- .../complete-trial-initiation.component.html | 0 .../complete-trial-initiation.component.ts | 2 +- .../resolver/free-trial-text.resolver.spec.ts | 0 .../resolver/free-trial-text.resolver.ts | 0 .../trial-initiation/confirmation-details.component.html | 0 .../trial-initiation/confirmation-details.component.ts | 0 .../content/abm-enterprise-content.component.html | 0 .../content/abm-enterprise-content.component.ts | 0 .../content/abm-teams-content.component.html | 0 .../trial-initiation/content/abm-teams-content.component.ts | 0 .../content/cnet-enterprise-content.component.html | 0 .../content/cnet-enterprise-content.component.ts | 0 .../content/cnet-individual-content.component.html | 0 .../content/cnet-individual-content.component.ts | 0 .../content/cnet-teams-content.component.html | 0 .../content/cnet-teams-content.component.ts | 0 .../trial-initiation/content/default-content.component.html | 0 .../trial-initiation/content/default-content.component.ts | 0 .../content/enterprise-content.component.html | 0 .../content/enterprise-content.component.ts | 0 .../content/enterprise1-content.component.html | 0 .../content/enterprise1-content.component.ts | 0 .../content/enterprise2-content.component.html | 0 .../content/enterprise2-content.component.ts | 0 .../trial-initiation/content/logo-badges.component.html | 0 .../trial-initiation/content/logo-badges.component.ts | 0 .../content/logo-cnet-5-stars.component.html | 0 .../trial-initiation/content/logo-cnet-5-stars.component.ts | 0 .../trial-initiation/content/logo-cnet.component.html | 0 .../trial-initiation/content/logo-cnet.component.ts | 0 .../content/logo-company-testimonial.component.html | 0 .../content/logo-company-testimonial.component.ts | 0 .../trial-initiation/content/logo-forbes.component.html | 0 .../trial-initiation/content/logo-forbes.component.ts | 0 .../trial-initiation/content/logo-us-news.component.html | 0 .../trial-initiation/content/logo-us-news.component.ts | 0 .../trial-initiation/content/review-blurb.component.html | 0 .../trial-initiation/content/review-blurb.component.ts | 0 .../trial-initiation/content/review-logo.component.html | 0 .../trial-initiation/content/review-logo.component.ts | 0 .../content/secrets-manager-content.component.html | 0 .../content/secrets-manager-content.component.ts | 0 .../trial-initiation/content/teams-content.component.html | 0 .../trial-initiation/content/teams-content.component.ts | 0 .../trial-initiation/content/teams1-content.component.html | 0 .../trial-initiation/content/teams1-content.component.ts | 0 .../trial-initiation/content/teams2-content.component.html | 0 .../trial-initiation/content/teams2-content.component.ts | 0 .../trial-initiation/content/teams3-content.component.html | 0 .../trial-initiation/content/teams3-content.component.ts | 0 .../secrets-manager-trial-free-stepper.component.html | 0 .../secrets-manager-trial-free-stepper.component.ts | 0 .../secrets-manager-trial-paid-stepper.component.html | 0 .../secrets-manager-trial-paid-stepper.component.ts | 0 .../secrets-manager/secrets-manager-trial.component.html | 0 .../secrets-manager/secrets-manager-trial.component.ts | 0 .../trial-initiation/trial-initiation.component.html | 0 .../trial-initiation/trial-initiation.component.spec.ts | 4 ++-- .../trial-initiation/trial-initiation.component.ts | 4 ++-- .../trial-initiation/trial-initiation.module.ts | 6 +++--- .../vertical-stepper/vertical-step-content.component.html | 0 .../vertical-stepper/vertical-step-content.component.ts | 0 .../vertical-stepper/vertical-step.component.html | 0 .../vertical-stepper/vertical-step.component.ts | 0 .../vertical-stepper/vertical-stepper.component.html | 0 .../vertical-stepper/vertical-stepper.component.ts | 0 .../vertical-stepper/vertical-stepper.module.ts | 0 apps/web/src/app/{core => billing}/types/free-trial.ts | 0 apps/web/src/app/oss-routing.module.ts | 4 ++-- apps/web/src/app/oss.module.ts | 2 +- apps/web/src/app/tools/reports/reports-routing.module.ts | 2 +- .../vault-banners/vault-banners.component.ts | 2 +- apps/web/src/app/vault/individual-vault/vault.component.ts | 2 +- apps/web/src/app/vault/org-vault/vault.component.ts | 2 +- .../src/app/secrets-manager/overview/overview.component.ts | 2 +- .../src/{ => billing}/directives/not-premium.directive.ts | 0 .../src/{ => billing}/directives/premium.directive.ts | 0 libs/angular/src/jslib.module.ts | 2 +- 85 files changed, 21 insertions(+), 21 deletions(-) rename apps/browser/src/{ => billing}/services/families-policy.service.spec.ts (100%) rename apps/browser/src/{ => billing}/services/families-policy.service.ts (100%) rename apps/web/src/app/{core => billing}/guards/has-premium.guard.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts (99%) rename apps/web/src/app/{auth => billing}/trial-initiation/complete-trial-initiation/resolver/free-trial-text.resolver.spec.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/complete-trial-initiation/resolver/free-trial-text.resolver.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/confirmation-details.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/confirmation-details.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/abm-enterprise-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/abm-enterprise-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/abm-teams-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/abm-teams-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/cnet-enterprise-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/cnet-enterprise-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/cnet-individual-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/cnet-individual-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/cnet-teams-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/cnet-teams-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/default-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/default-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/enterprise-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/enterprise-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/enterprise1-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/enterprise1-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/enterprise2-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/enterprise2-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/logo-badges.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/logo-badges.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/logo-cnet-5-stars.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/logo-cnet-5-stars.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/logo-cnet.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/logo-cnet.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/logo-company-testimonial.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/logo-company-testimonial.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/logo-forbes.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/logo-forbes.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/logo-us-news.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/logo-us-news.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/review-blurb.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/review-blurb.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/review-logo.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/review-logo.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/secrets-manager-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/secrets-manager-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/teams-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/teams-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/teams1-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/teams1-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/teams2-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/teams2-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/teams3-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/content/teams3-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/secrets-manager/secrets-manager-trial.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/secrets-manager/secrets-manager-trial.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/trial-initiation.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/trial-initiation.component.spec.ts (98%) rename apps/web/src/app/{auth => billing}/trial-initiation/trial-initiation.component.ts (98%) rename apps/web/src/app/{auth => billing}/trial-initiation/trial-initiation.module.ts (90%) rename apps/web/src/app/{auth => billing}/trial-initiation/vertical-stepper/vertical-step-content.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/vertical-stepper/vertical-step-content.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/vertical-stepper/vertical-step.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/vertical-stepper/vertical-step.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/vertical-stepper/vertical-stepper.component.html (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/vertical-stepper/vertical-stepper.component.ts (100%) rename apps/web/src/app/{auth => billing}/trial-initiation/vertical-stepper/vertical-stepper.module.ts (100%) rename apps/web/src/app/{core => billing}/types/free-trial.ts (100%) rename libs/angular/src/{ => billing}/directives/not-premium.directive.ts (100%) rename libs/angular/src/{ => billing}/directives/premium.directive.ts (100%) diff --git a/apps/browser/src/services/families-policy.service.spec.ts b/apps/browser/src/billing/services/families-policy.service.spec.ts similarity index 100% rename from apps/browser/src/services/families-policy.service.spec.ts rename to apps/browser/src/billing/services/families-policy.service.spec.ts diff --git a/apps/browser/src/services/families-policy.service.ts b/apps/browser/src/billing/services/families-policy.service.ts similarity index 100% rename from apps/browser/src/services/families-policy.service.ts rename to apps/browser/src/billing/services/families-policy.service.ts diff --git a/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.ts b/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.ts index 20e5548f99..a3d1c55397 100644 --- a/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.ts +++ b/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.ts @@ -11,11 +11,11 @@ import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abs import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { DialogService, ItemModule } from "@bitwarden/components"; +import { FamiliesPolicyService } from "../../../../billing/services/families-policy.service"; import { BrowserApi } from "../../../../platform/browser/browser-api"; import { PopOutComponent } from "../../../../platform/popup/components/pop-out.component"; import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-header.component"; import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page.component"; -import { FamiliesPolicyService } from "../../../../services/families-policy.service"; @Component({ templateUrl: "more-from-bitwarden-page-v2.component.html", diff --git a/apps/web/src/app/core/guards/has-premium.guard.ts b/apps/web/src/app/billing/guards/has-premium.guard.ts similarity index 100% rename from apps/web/src/app/core/guards/has-premium.guard.ts rename to apps/web/src/app/billing/guards/has-premium.guard.ts diff --git a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts index 3fb2121b03..a8b2c7a46f 100644 --- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts +++ b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts @@ -23,7 +23,6 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl import { SyncService } from "@bitwarden/common/platform/sync"; import { DialogService, ToastService } from "@bitwarden/components"; -import { FreeTrial } from "../../../core/types/free-trial"; import { TrialFlowService } from "../../services/trial-flow.service"; import { AddCreditDialogResult, @@ -33,6 +32,7 @@ import { AdjustPaymentDialogComponent, AdjustPaymentDialogResultType, } from "../../shared/adjust-payment-dialog/adjust-payment-dialog.component"; +import { FreeTrial } from "../../types/free-trial"; @Component({ templateUrl: "./organization-payment-method.component.html", diff --git a/apps/web/src/app/billing/services/trial-flow.service.ts b/apps/web/src/app/billing/services/trial-flow.service.ts index a3a4ba6bba..eb08e5bd7a 100644 --- a/apps/web/src/app/billing/services/trial-flow.service.ts +++ b/apps/web/src/app/billing/services/trial-flow.service.ts @@ -16,11 +16,11 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { DialogService } from "@bitwarden/components"; -import { FreeTrial } from "../../core/types/free-trial"; import { ChangePlanDialogResultType, openChangePlanDialog, } from "../organizations/change-plan-dialog.component"; +import { FreeTrial } from "../types/free-trial"; @Injectable({ providedIn: "root" }) export class TrialFlowService { diff --git a/apps/web/src/app/billing/shared/payment-method.component.ts b/apps/web/src/app/billing/shared/payment-method.component.ts index c5ec942f8b..dc031ade42 100644 --- a/apps/web/src/app/billing/shared/payment-method.component.ts +++ b/apps/web/src/app/billing/shared/payment-method.component.ts @@ -24,8 +24,8 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl import { SyncService } from "@bitwarden/common/platform/sync"; import { DialogService, ToastService } from "@bitwarden/components"; -import { FreeTrial } from "../../core/types/free-trial"; import { TrialFlowService } from "../services/trial-flow.service"; +import { FreeTrial } from "../types/free-trial"; import { AddCreditDialogResult, openAddCreditDialog } from "./add-credit-dialog.component"; import { diff --git a/apps/web/src/app/auth/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html rename to apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.html diff --git a/apps/web/src/app/auth/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts similarity index 99% rename from apps/web/src/app/auth/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts rename to apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts index 96c50a8131..873ceea2ad 100644 --- a/apps/web/src/app/auth/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts +++ b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts @@ -25,13 +25,13 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service" import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service"; import { ToastService } from "@bitwarden/components"; +import { AcceptOrganizationInviteService } from "../../../auth/organization-invite/accept-organization.service"; import { OrganizationCreatedEvent, SubscriptionProduct, TrialOrganizationType, } from "../../../billing/accounts/trial-initiation/trial-billing-step.component"; import { RouterService } from "../../../core/router.service"; -import { AcceptOrganizationInviteService } from "../../organization-invite/accept-organization.service"; import { VerticalStepperComponent } from "../vertical-stepper/vertical-stepper.component"; export type InitiationPath = diff --git a/apps/web/src/app/auth/trial-initiation/complete-trial-initiation/resolver/free-trial-text.resolver.spec.ts b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/resolver/free-trial-text.resolver.spec.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/complete-trial-initiation/resolver/free-trial-text.resolver.spec.ts rename to apps/web/src/app/billing/trial-initiation/complete-trial-initiation/resolver/free-trial-text.resolver.spec.ts diff --git a/apps/web/src/app/auth/trial-initiation/complete-trial-initiation/resolver/free-trial-text.resolver.ts b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/resolver/free-trial-text.resolver.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/complete-trial-initiation/resolver/free-trial-text.resolver.ts rename to apps/web/src/app/billing/trial-initiation/complete-trial-initiation/resolver/free-trial-text.resolver.ts diff --git a/apps/web/src/app/auth/trial-initiation/confirmation-details.component.html b/apps/web/src/app/billing/trial-initiation/confirmation-details.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/confirmation-details.component.html rename to apps/web/src/app/billing/trial-initiation/confirmation-details.component.html diff --git a/apps/web/src/app/auth/trial-initiation/confirmation-details.component.ts b/apps/web/src/app/billing/trial-initiation/confirmation-details.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/confirmation-details.component.ts rename to apps/web/src/app/billing/trial-initiation/confirmation-details.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/abm-enterprise-content.component.html b/apps/web/src/app/billing/trial-initiation/content/abm-enterprise-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/abm-enterprise-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/abm-enterprise-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/abm-enterprise-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/abm-enterprise-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/abm-enterprise-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/abm-enterprise-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/abm-teams-content.component.html b/apps/web/src/app/billing/trial-initiation/content/abm-teams-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/abm-teams-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/abm-teams-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/abm-teams-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/abm-teams-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/abm-teams-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/abm-teams-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/cnet-enterprise-content.component.html b/apps/web/src/app/billing/trial-initiation/content/cnet-enterprise-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/cnet-enterprise-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/cnet-enterprise-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/cnet-enterprise-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/cnet-enterprise-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/cnet-enterprise-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/cnet-enterprise-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/cnet-individual-content.component.html b/apps/web/src/app/billing/trial-initiation/content/cnet-individual-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/cnet-individual-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/cnet-individual-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/cnet-individual-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/cnet-individual-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/cnet-individual-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/cnet-individual-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/cnet-teams-content.component.html b/apps/web/src/app/billing/trial-initiation/content/cnet-teams-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/cnet-teams-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/cnet-teams-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/cnet-teams-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/cnet-teams-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/cnet-teams-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/cnet-teams-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/default-content.component.html b/apps/web/src/app/billing/trial-initiation/content/default-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/default-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/default-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/default-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/default-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/default-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/default-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.html b/apps/web/src/app/billing/trial-initiation/content/enterprise-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/enterprise-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/enterprise-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/enterprise-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/enterprise1-content.component.html b/apps/web/src/app/billing/trial-initiation/content/enterprise1-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/enterprise1-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/enterprise1-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/enterprise1-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/enterprise1-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/enterprise1-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/enterprise1-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/enterprise2-content.component.html b/apps/web/src/app/billing/trial-initiation/content/enterprise2-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/enterprise2-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/enterprise2-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/enterprise2-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/enterprise2-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/enterprise2-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/enterprise2-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.html b/apps/web/src/app/billing/trial-initiation/content/logo-badges.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/logo-badges.component.html rename to apps/web/src/app/billing/trial-initiation/content/logo-badges.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-badges.component.ts b/apps/web/src/app/billing/trial-initiation/content/logo-badges.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/logo-badges.component.ts rename to apps/web/src/app/billing/trial-initiation/content/logo-badges.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-cnet-5-stars.component.html b/apps/web/src/app/billing/trial-initiation/content/logo-cnet-5-stars.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/logo-cnet-5-stars.component.html rename to apps/web/src/app/billing/trial-initiation/content/logo-cnet-5-stars.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-cnet-5-stars.component.ts b/apps/web/src/app/billing/trial-initiation/content/logo-cnet-5-stars.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/logo-cnet-5-stars.component.ts rename to apps/web/src/app/billing/trial-initiation/content/logo-cnet-5-stars.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-cnet.component.html b/apps/web/src/app/billing/trial-initiation/content/logo-cnet.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/logo-cnet.component.html rename to apps/web/src/app/billing/trial-initiation/content/logo-cnet.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-cnet.component.ts b/apps/web/src/app/billing/trial-initiation/content/logo-cnet.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/logo-cnet.component.ts rename to apps/web/src/app/billing/trial-initiation/content/logo-cnet.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-company-testimonial.component.html b/apps/web/src/app/billing/trial-initiation/content/logo-company-testimonial.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/logo-company-testimonial.component.html rename to apps/web/src/app/billing/trial-initiation/content/logo-company-testimonial.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-company-testimonial.component.ts b/apps/web/src/app/billing/trial-initiation/content/logo-company-testimonial.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/logo-company-testimonial.component.ts rename to apps/web/src/app/billing/trial-initiation/content/logo-company-testimonial.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-forbes.component.html b/apps/web/src/app/billing/trial-initiation/content/logo-forbes.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/logo-forbes.component.html rename to apps/web/src/app/billing/trial-initiation/content/logo-forbes.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-forbes.component.ts b/apps/web/src/app/billing/trial-initiation/content/logo-forbes.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/logo-forbes.component.ts rename to apps/web/src/app/billing/trial-initiation/content/logo-forbes.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-us-news.component.html b/apps/web/src/app/billing/trial-initiation/content/logo-us-news.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/logo-us-news.component.html rename to apps/web/src/app/billing/trial-initiation/content/logo-us-news.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/logo-us-news.component.ts b/apps/web/src/app/billing/trial-initiation/content/logo-us-news.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/logo-us-news.component.ts rename to apps/web/src/app/billing/trial-initiation/content/logo-us-news.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/review-blurb.component.html b/apps/web/src/app/billing/trial-initiation/content/review-blurb.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/review-blurb.component.html rename to apps/web/src/app/billing/trial-initiation/content/review-blurb.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/review-blurb.component.ts b/apps/web/src/app/billing/trial-initiation/content/review-blurb.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/review-blurb.component.ts rename to apps/web/src/app/billing/trial-initiation/content/review-blurb.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/review-logo.component.html b/apps/web/src/app/billing/trial-initiation/content/review-logo.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/review-logo.component.html rename to apps/web/src/app/billing/trial-initiation/content/review-logo.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/review-logo.component.ts b/apps/web/src/app/billing/trial-initiation/content/review-logo.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/review-logo.component.ts rename to apps/web/src/app/billing/trial-initiation/content/review-logo.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/secrets-manager-content.component.html b/apps/web/src/app/billing/trial-initiation/content/secrets-manager-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/secrets-manager-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/secrets-manager-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/secrets-manager-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/secrets-manager-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/secrets-manager-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/secrets-manager-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/teams-content.component.html b/apps/web/src/app/billing/trial-initiation/content/teams-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/teams-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/teams-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/teams-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/teams-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/teams-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/teams-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/teams1-content.component.html b/apps/web/src/app/billing/trial-initiation/content/teams1-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/teams1-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/teams1-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/teams1-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/teams1-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/teams1-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/teams1-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/teams2-content.component.html b/apps/web/src/app/billing/trial-initiation/content/teams2-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/teams2-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/teams2-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/teams2-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/teams2-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/teams2-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/teams2-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/content/teams3-content.component.html b/apps/web/src/app/billing/trial-initiation/content/teams3-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/teams3-content.component.html rename to apps/web/src/app/billing/trial-initiation/content/teams3-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/content/teams3-content.component.ts b/apps/web/src/app/billing/trial-initiation/content/teams3-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/content/teams3-content.component.ts rename to apps/web/src/app/billing/trial-initiation/content/teams3-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html rename to apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.html diff --git a/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.ts b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.ts rename to apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html rename to apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.html diff --git a/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.ts b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.ts rename to apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial.component.html b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial.component.html rename to apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial.component.html diff --git a/apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial.component.ts b/apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/secrets-manager/secrets-manager-trial.component.ts rename to apps/web/src/app/billing/trial-initiation/secrets-manager/secrets-manager-trial.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html b/apps/web/src/app/billing/trial-initiation/trial-initiation.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/trial-initiation.component.html rename to apps/web/src/app/billing/trial-initiation/trial-initiation.component.html diff --git a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.spec.ts b/apps/web/src/app/billing/trial-initiation/trial-initiation.component.spec.ts similarity index 98% rename from apps/web/src/app/auth/trial-initiation/trial-initiation.component.spec.ts rename to apps/web/src/app/billing/trial-initiation/trial-initiation.component.spec.ts index 61fc7a6003..c8d4d35fb7 100644 --- a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.spec.ts +++ b/apps/web/src/app/billing/trial-initiation/trial-initiation.component.spec.ts @@ -22,10 +22,10 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { AcceptOrganizationInviteService } from "../../auth/organization-invite/accept-organization.service"; +import { OrganizationInvite } from "../../auth/organization-invite/organization-invite"; import { RouterService } from "../../core"; import { SharedModule } from "../../shared"; -import { AcceptOrganizationInviteService } from "../organization-invite/accept-organization.service"; -import { OrganizationInvite } from "../organization-invite/organization-invite"; import { TrialInitiationComponent } from "./trial-initiation.component"; import { VerticalStepperComponent } from "./vertical-stepper/vertical-stepper.component"; diff --git a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts b/apps/web/src/app/billing/trial-initiation/trial-initiation.component.ts similarity index 98% rename from apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts rename to apps/web/src/app/billing/trial-initiation/trial-initiation.component.ts index fbe3eb7aa6..2403c28d26 100644 --- a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts +++ b/apps/web/src/app/billing/trial-initiation/trial-initiation.component.ts @@ -23,13 +23,13 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { AcceptOrganizationInviteService } from "../../auth/organization-invite/accept-organization.service"; +import { OrganizationInvite } from "../../auth/organization-invite/organization-invite"; import { OrganizationCreatedEvent, SubscriptionProduct, TrialOrganizationType, } from "../../billing/accounts/trial-initiation/trial-billing-step.component"; -import { AcceptOrganizationInviteService } from "../organization-invite/accept-organization.service"; -import { OrganizationInvite } from "../organization-invite/organization-invite"; import { RouterService } from "./../../core/router.service"; import { VerticalStepperComponent } from "./vertical-stepper/vertical-stepper.component"; diff --git a/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts b/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts similarity index 90% rename from apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts rename to apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts index d49621222f..7b81f57e33 100644 --- a/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts +++ b/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts @@ -7,11 +7,11 @@ import { FormFieldModule } from "@bitwarden/components"; import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module"; import { RegisterFormModule } from "../../auth/register-form/register-form.module"; -import { SecretsManagerTrialFreeStepperComponent } from "../../auth/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component"; -import { SecretsManagerTrialPaidStepperComponent } from "../../auth/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component"; -import { SecretsManagerTrialComponent } from "../../auth/trial-initiation/secrets-manager/secrets-manager-trial.component"; import { TaxInfoComponent } from "../../billing"; import { TrialBillingStepComponent } from "../../billing/accounts/trial-initiation/trial-billing-step.component"; +import { SecretsManagerTrialFreeStepperComponent } from "../../billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component"; +import { SecretsManagerTrialPaidStepperComponent } from "../../billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component"; +import { SecretsManagerTrialComponent } from "../../billing/trial-initiation/secrets-manager/secrets-manager-trial.component"; import { EnvironmentSelectorModule } from "../../components/environment-selector/environment-selector.module"; import { SharedModule } from "../../shared"; diff --git a/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.html b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step-content.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.html rename to apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step-content.component.html diff --git a/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.ts b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step-content.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.ts rename to apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step-content.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.html b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.html rename to apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step.component.html diff --git a/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.ts b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.ts rename to apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-step.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-stepper.component.html b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-stepper.component.html similarity index 100% rename from apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-stepper.component.html rename to apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-stepper.component.html diff --git a/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-stepper.component.ts b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-stepper.component.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-stepper.component.ts rename to apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-stepper.component.ts diff --git a/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-stepper.module.ts b/apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-stepper.module.ts similarity index 100% rename from apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-stepper.module.ts rename to apps/web/src/app/billing/trial-initiation/vertical-stepper/vertical-stepper.module.ts diff --git a/apps/web/src/app/core/types/free-trial.ts b/apps/web/src/app/billing/types/free-trial.ts similarity index 100% rename from apps/web/src/app/core/types/free-trial.ts rename to apps/web/src/app/billing/types/free-trial.ts diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index d03548faf9..064e6f415a 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -72,8 +72,6 @@ import { EmergencyAccessComponent } from "./auth/settings/emergency-access/emerg import { EmergencyAccessViewComponent } from "./auth/settings/emergency-access/view/emergency-access-view.component"; import { SecurityRoutingModule } from "./auth/settings/security/security-routing.module"; import { SsoComponentV1 } from "./auth/sso-v1.component"; -import { CompleteTrialInitiationComponent } from "./auth/trial-initiation/complete-trial-initiation/complete-trial-initiation.component"; -import { freeTrialTextResolver } from "./auth/trial-initiation/complete-trial-initiation/resolver/free-trial-text.resolver"; import { TwoFactorAuthComponent } from "./auth/two-factor-auth.component"; import { TwoFactorComponent } from "./auth/two-factor.component"; import { UpdatePasswordComponent } from "./auth/update-password.component"; @@ -81,6 +79,8 @@ import { UpdateTempPasswordComponent } from "./auth/update-temp-password.compone import { VerifyEmailTokenComponent } from "./auth/verify-email-token.component"; import { VerifyRecoverDeleteComponent } from "./auth/verify-recover-delete.component"; import { SponsoredFamiliesComponent } from "./billing/settings/sponsored-families.component"; +import { CompleteTrialInitiationComponent } from "./billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component"; +import { freeTrialTextResolver } from "./billing/trial-initiation/complete-trial-initiation/resolver/free-trial-text.resolver"; import { EnvironmentSelectorComponent } from "./components/environment-selector/environment-selector.component"; import { RouteDataProperties } from "./core"; import { FrontendLayoutComponent } from "./layouts/frontend-layout.component"; diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts index 3f18440d23..0810a138de 100644 --- a/apps/web/src/app/oss.module.ts +++ b/apps/web/src/app/oss.module.ts @@ -2,7 +2,7 @@ import { NgModule } from "@angular/core"; import { AuthModule } from "./auth"; import { LoginModule } from "./auth/login/login.module"; -import { TrialInitiationModule } from "./auth/trial-initiation/trial-initiation.module"; +import { TrialInitiationModule } from "./billing/trial-initiation/trial-initiation.module"; import { LooseComponentsModule, SharedModule } from "./shared"; import { AccessComponent } from "./tools/send/access.component"; import { OrganizationBadgeModule } from "./vault/individual-vault/organization-badge/organization-badge.module"; diff --git a/apps/web/src/app/tools/reports/reports-routing.module.ts b/apps/web/src/app/tools/reports/reports-routing.module.ts index cad6586bb8..941e6eb7d3 100644 --- a/apps/web/src/app/tools/reports/reports-routing.module.ts +++ b/apps/web/src/app/tools/reports/reports-routing.module.ts @@ -3,7 +3,7 @@ import { RouterModule, Routes } from "@angular/router"; import { authGuard } from "@bitwarden/angular/auth/guards"; -import { hasPremiumGuard } from "../../core/guards/has-premium.guard"; +import { hasPremiumGuard } from "../../billing/guards/has-premium.guard"; import { BreachReportComponent } from "./pages/breach-report.component"; import { ExposedPasswordsReportComponent } from "./pages/exposed-passwords-report.component"; diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts index 161b2ccb7e..5a0c0a535b 100644 --- a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.ts @@ -9,7 +9,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { BannerModule } from "@bitwarden/components"; import { VerifyEmailComponent } from "../../../auth/settings/verify-email.component"; -import { FreeTrial } from "../../../core/types/free-trial"; +import { FreeTrial } from "../../../billing/types/free-trial"; import { SharedModule } from "../../../shared"; import { VaultBannersService, VisibleVaultBanner } from "./services/vault-banners.service"; diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts index 464d074d9d..7215c98020 100644 --- a/apps/web/src/app/vault/individual-vault/vault.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault.component.ts @@ -85,7 +85,7 @@ import { } from "@bitwarden/vault"; import { TrialFlowService } from "../../billing/services/trial-flow.service"; -import { FreeTrial } from "../../core/types/free-trial"; +import { FreeTrial } from "../../billing/types/free-trial"; import { SharedModule } from "../../shared/shared.module"; import { AssignCollectionsWebComponent } from "../components/assign-collections"; import { diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts index ca1d330ecf..fe76f9842e 100644 --- a/apps/web/src/app/vault/org-vault/vault.component.ts +++ b/apps/web/src/app/vault/org-vault/vault.component.ts @@ -92,7 +92,7 @@ import { ResellerWarningService, } from "../../billing/services/reseller-warning.service"; import { TrialFlowService } from "../../billing/services/trial-flow.service"; -import { FreeTrial } from "../../core/types/free-trial"; +import { FreeTrial } from "../../billing/types/free-trial"; import { SharedModule } from "../../shared"; import { VaultFilterService } from "../../vault/individual-vault/vault-filter/services/abstractions/vault-filter.service"; import { VaultFilter } from "../../vault/individual-vault/vault-filter/shared/models/vault-filter.model"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts index cb3f601676..7eb28b2bc2 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts @@ -33,7 +33,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service" import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { DialogService } from "@bitwarden/components"; import { TrialFlowService } from "@bitwarden/web-vault/app/billing/services/trial-flow.service"; -import { FreeTrial } from "@bitwarden/web-vault/app/core/types/free-trial"; +import { FreeTrial } from "@bitwarden/web-vault/app/billing/types/free-trial"; import { OrganizationCounts } from "../models/view/counts.view"; import { ProjectListView } from "../models/view/project-list.view"; diff --git a/libs/angular/src/directives/not-premium.directive.ts b/libs/angular/src/billing/directives/not-premium.directive.ts similarity index 100% rename from libs/angular/src/directives/not-premium.directive.ts rename to libs/angular/src/billing/directives/not-premium.directive.ts diff --git a/libs/angular/src/directives/premium.directive.ts b/libs/angular/src/billing/directives/premium.directive.ts similarity index 100% rename from libs/angular/src/directives/premium.directive.ts rename to libs/angular/src/billing/directives/premium.directive.ts diff --git a/libs/angular/src/jslib.module.ts b/libs/angular/src/jslib.module.ts index b06faacef1..6ef2cf1d4d 100644 --- a/libs/angular/src/jslib.module.ts +++ b/libs/angular/src/jslib.module.ts @@ -30,6 +30,7 @@ import { } from "@bitwarden/components"; import { TwoFactorIconComponent } from "./auth/components/two-factor-icon.component"; +import { NotPremiumDirective } from "./billing/directives/not-premium.directive"; import { DeprecatedCalloutComponent } from "./components/callout.component"; import { A11yInvalidDirective } from "./directives/a11y-invalid.directive"; import { ApiActionDirective } from "./directives/api-action.directive"; @@ -40,7 +41,6 @@ import { IfFeatureDirective } from "./directives/if-feature.directive"; import { InputStripSpacesDirective } from "./directives/input-strip-spaces.directive"; import { InputVerbatimDirective } from "./directives/input-verbatim.directive"; import { LaunchClickDirective } from "./directives/launch-click.directive"; -import { NotPremiumDirective } from "./directives/not-premium.directive"; import { StopClickDirective } from "./directives/stop-click.directive"; import { StopPropDirective } from "./directives/stop-prop.directive"; import { TextDragDirective } from "./directives/text-drag.directive";