diff --git a/apps/web/src/app/accounts/trial-initiation/confirmation-details.component.html b/apps/web/src/app/auth/trial-initiation/confirmation-details.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/confirmation-details.component.html rename to apps/web/src/app/auth/trial-initiation/confirmation-details.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/confirmation-details.component.ts b/apps/web/src/app/auth/trial-initiation/confirmation-details.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/confirmation-details.component.ts rename to apps/web/src/app/auth/trial-initiation/confirmation-details.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/abm-enterprise-content.component.html b/apps/web/src/app/auth/trial-initiation/content/abm-enterprise-content.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/abm-enterprise-content.component.html rename to apps/web/src/app/auth/trial-initiation/content/abm-enterprise-content.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/abm-enterprise-content.component.ts b/apps/web/src/app/auth/trial-initiation/content/abm-enterprise-content.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/abm-enterprise-content.component.ts rename to apps/web/src/app/auth/trial-initiation/content/abm-enterprise-content.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/abm-teams-content.component.html b/apps/web/src/app/auth/trial-initiation/content/abm-teams-content.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/abm-teams-content.component.html rename to apps/web/src/app/auth/trial-initiation/content/abm-teams-content.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/abm-teams-content.component.ts b/apps/web/src/app/auth/trial-initiation/content/abm-teams-content.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/abm-teams-content.component.ts rename to apps/web/src/app/auth/trial-initiation/content/abm-teams-content.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/cnet-enterprise-content.component.html b/apps/web/src/app/auth/trial-initiation/content/cnet-enterprise-content.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/cnet-enterprise-content.component.html rename to apps/web/src/app/auth/trial-initiation/content/cnet-enterprise-content.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/cnet-enterprise-content.component.ts b/apps/web/src/app/auth/trial-initiation/content/cnet-enterprise-content.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/cnet-enterprise-content.component.ts rename to apps/web/src/app/auth/trial-initiation/content/cnet-enterprise-content.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/cnet-individual-content.component.html b/apps/web/src/app/auth/trial-initiation/content/cnet-individual-content.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/cnet-individual-content.component.html rename to apps/web/src/app/auth/trial-initiation/content/cnet-individual-content.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/cnet-individual-content.component.ts b/apps/web/src/app/auth/trial-initiation/content/cnet-individual-content.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/cnet-individual-content.component.ts rename to apps/web/src/app/auth/trial-initiation/content/cnet-individual-content.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/cnet-teams-content.component.html b/apps/web/src/app/auth/trial-initiation/content/cnet-teams-content.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/cnet-teams-content.component.html rename to apps/web/src/app/auth/trial-initiation/content/cnet-teams-content.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/cnet-teams-content.component.ts b/apps/web/src/app/auth/trial-initiation/content/cnet-teams-content.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/cnet-teams-content.component.ts rename to apps/web/src/app/auth/trial-initiation/content/cnet-teams-content.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/default-content.component.html b/apps/web/src/app/auth/trial-initiation/content/default-content.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/default-content.component.html rename to apps/web/src/app/auth/trial-initiation/content/default-content.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/default-content.component.ts b/apps/web/src/app/auth/trial-initiation/content/default-content.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/default-content.component.ts rename to apps/web/src/app/auth/trial-initiation/content/default-content.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/enterprise-content.component.html b/apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/enterprise-content.component.html rename to apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/enterprise-content.component.ts b/apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/enterprise-content.component.ts rename to apps/web/src/app/auth/trial-initiation/content/enterprise-content.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/enterprise1-content.component.html b/apps/web/src/app/auth/trial-initiation/content/enterprise1-content.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/enterprise1-content.component.html rename to apps/web/src/app/auth/trial-initiation/content/enterprise1-content.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/enterprise1-content.component.ts b/apps/web/src/app/auth/trial-initiation/content/enterprise1-content.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/enterprise1-content.component.ts rename to apps/web/src/app/auth/trial-initiation/content/enterprise1-content.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/enterprise2-content.component.html b/apps/web/src/app/auth/trial-initiation/content/enterprise2-content.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/enterprise2-content.component.html rename to apps/web/src/app/auth/trial-initiation/content/enterprise2-content.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/enterprise2-content.component.ts b/apps/web/src/app/auth/trial-initiation/content/enterprise2-content.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/enterprise2-content.component.ts rename to apps/web/src/app/auth/trial-initiation/content/enterprise2-content.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/logo-cnet.component.html b/apps/web/src/app/auth/trial-initiation/content/logo-cnet.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/logo-cnet.component.html rename to apps/web/src/app/auth/trial-initiation/content/logo-cnet.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/logo-cnet.component.ts b/apps/web/src/app/auth/trial-initiation/content/logo-cnet.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/logo-cnet.component.ts rename to apps/web/src/app/auth/trial-initiation/content/logo-cnet.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/logo-forbes.component.html b/apps/web/src/app/auth/trial-initiation/content/logo-forbes.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/logo-forbes.component.html rename to apps/web/src/app/auth/trial-initiation/content/logo-forbes.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/logo-forbes.component.ts b/apps/web/src/app/auth/trial-initiation/content/logo-forbes.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/logo-forbes.component.ts rename to apps/web/src/app/auth/trial-initiation/content/logo-forbes.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/logo-us-news.component.html b/apps/web/src/app/auth/trial-initiation/content/logo-us-news.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/logo-us-news.component.html rename to apps/web/src/app/auth/trial-initiation/content/logo-us-news.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/logo-us-news.component.ts b/apps/web/src/app/auth/trial-initiation/content/logo-us-news.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/logo-us-news.component.ts rename to apps/web/src/app/auth/trial-initiation/content/logo-us-news.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/teams-content.component.html b/apps/web/src/app/auth/trial-initiation/content/teams-content.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/teams-content.component.html rename to apps/web/src/app/auth/trial-initiation/content/teams-content.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/teams-content.component.ts b/apps/web/src/app/auth/trial-initiation/content/teams-content.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/teams-content.component.ts rename to apps/web/src/app/auth/trial-initiation/content/teams-content.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/teams1-content.component.html b/apps/web/src/app/auth/trial-initiation/content/teams1-content.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/teams1-content.component.html rename to apps/web/src/app/auth/trial-initiation/content/teams1-content.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/teams1-content.component.ts b/apps/web/src/app/auth/trial-initiation/content/teams1-content.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/teams1-content.component.ts rename to apps/web/src/app/auth/trial-initiation/content/teams1-content.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/content/teams2-content.component.html b/apps/web/src/app/auth/trial-initiation/content/teams2-content.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/teams2-content.component.html rename to apps/web/src/app/auth/trial-initiation/content/teams2-content.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/content/teams2-content.component.ts b/apps/web/src/app/auth/trial-initiation/content/teams2-content.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/content/teams2-content.component.ts rename to apps/web/src/app/auth/trial-initiation/content/teams2-content.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.html b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html similarity index 90% rename from apps/web/src/app/accounts/trial-initiation/trial-initiation.component.html rename to apps/web/src/app/auth/trial-initiation/trial-initiation.component.html index 0989cecd74..70cb1b702c 100644 --- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.html +++ b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html @@ -58,10 +58,14 @@
-
-

- Start your 7-Day free trial of Bitwarden for {{ org }} +
+

+ {{ "startYour7DayFreeTrialOfBitwardenFor" | i18n : org }}

+
@@ -80,7 +84,7 @@ [disabled]="orgInfoFormGroup.get('name').invalid" cdkStepperNext > - Next + {{ "next" | i18n }} @@ -100,7 +104,7 @@ >
diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.spec.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts rename to apps/web/src/app/auth/trial-initiation/trial-initiation.component.spec.ts diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts rename to apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts b/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts similarity index 95% rename from apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts rename to apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts index a67ea9cb4f..222ad94923 100644 --- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts +++ b/apps/web/src/app/auth/trial-initiation/trial-initiation.module.ts @@ -7,6 +7,7 @@ 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 { BillingComponent } from "../../billing/accounts/trial-initiation/billing.component"; +import { EnvironmentSelectorModule } from "../../components/environment-selector/environment-selector.module"; import { LooseComponentsModule, SharedModule } from "../../shared"; import { ConfirmationDetailsComponent } from "./confirmation-details.component"; @@ -37,6 +38,7 @@ import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.modul RegisterFormModule, OrganizationCreateModule, LooseComponentsModule, + EnvironmentSelectorModule, ], declarations: [ TrialInitiationComponent, diff --git a/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-step-content.component.html b/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-step-content.component.html rename to apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-step-content.component.ts b/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-step-content.component.ts rename to apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step-content.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-step.component.html b/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-step.component.html rename to apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-step.component.ts b/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-step.component.ts rename to apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-step.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.component.html b/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-stepper.component.html similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.component.html rename to apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-stepper.component.html diff --git a/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.component.ts b/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-stepper.component.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.component.ts rename to apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-stepper.component.ts diff --git a/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.module.ts b/apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-stepper.module.ts similarity index 100% rename from apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.module.ts rename to apps/web/src/app/auth/trial-initiation/vertical-stepper/vertical-stepper.module.ts diff --git a/apps/web/src/app/components/environment-selector/environment-selector.component.html b/apps/web/src/app/components/environment-selector/environment-selector.component.html new file mode 100644 index 0000000000..b7465a7ede --- /dev/null +++ b/apps/web/src/app/components/environment-selector/environment-selector.component.html @@ -0,0 +1,55 @@ +
+ + + + {{ 'usFlag' | i18n }} + {{ "us" | i18n }} + + + + {{ 'euFlag' | i18n }} + {{ "eu" | i18n }} + + + + + + {{ 'selectedRegionFlag' | i18n }} + + + +
diff --git a/apps/web/src/app/components/environment-selector/environment-selector.component.ts b/apps/web/src/app/components/environment-selector/environment-selector.component.ts new file mode 100644 index 0000000000..9f736a72e4 --- /dev/null +++ b/apps/web/src/app/components/environment-selector/environment-selector.component.ts @@ -0,0 +1,43 @@ +import { Component, Input, OnInit } from "@angular/core"; + +import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; +import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction"; +import { RegionDomain } from "@bitwarden/common/platform/abstractions/environment.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; + +@Component({ + selector: "environment-selector", + templateUrl: "environment-selector.component.html", +}) +export class EnvironmentSelectorComponent implements OnInit { + constructor( + private configService: ConfigServiceAbstraction, + private platformUtilsService: PlatformUtilsService + ) {} + @Input() hasFlags: boolean; + isEuServer: boolean; + isUsServer: boolean; + showRegionSelector = false; + euServerFlagEnabled: boolean; + selectedRegionImageName: string; + + async ngOnInit() { + this.euServerFlagEnabled = await this.configService.getFeatureFlagBool( + FeatureFlag.DisplayEuEnvironmentFlag + ); + const domain = Utils.getDomain(window.location.href); + this.isEuServer = domain.includes(RegionDomain.EU); + this.isUsServer = domain.includes(RegionDomain.US) || domain.includes(RegionDomain.USQA); + this.selectedRegionImageName = this.getRegionImage(); + this.showRegionSelector = !this.platformUtilsService.isSelfHost(); + } + + getRegionImage(): string { + if (this.isEuServer) { + return "eu_flag"; + } else { + return "us_flag"; + } + } +} diff --git a/apps/web/src/app/components/environment-selector/environment-selector.module.ts b/apps/web/src/app/components/environment-selector/environment-selector.module.ts new file mode 100644 index 0000000000..1326d4c9ca --- /dev/null +++ b/apps/web/src/app/components/environment-selector/environment-selector.module.ts @@ -0,0 +1,12 @@ +import { NgModule } from "@angular/core"; + +import { SharedModule } from "../../../app/shared"; + +import { EnvironmentSelectorComponent } from "./environment-selector.component"; + +@NgModule({ + imports: [SharedModule], + declarations: [EnvironmentSelectorComponent], + exports: [EnvironmentSelectorComponent], +}) +export class EnvironmentSelectorModule {} diff --git a/apps/web/src/app/layouts/frontend-layout.component.html b/apps/web/src/app/layouts/frontend-layout.component.html index 84608acff0..531e49dad4 100644 --- a/apps/web/src/app/layouts/frontend-layout.component.html +++ b/apps/web/src/app/layouts/frontend-layout.component.html @@ -1,34 +1,6 @@
-
- - - - - {{ "us" | i18n }} - - - - - {{ "eu" | i18n }} - - - {{ "region" | i18n }}: - - {{ isEuServer ? ("eu" | i18n) : ("us" | i18n) }} - -
-
- + © {{ year }} Bitwarden Inc.
{{ "versionNumber" | i18n : version }}
diff --git a/apps/web/src/app/layouts/frontend-layout.component.ts b/apps/web/src/app/layouts/frontend-layout.component.ts index 14867a289f..e4d947c1c6 100644 --- a/apps/web/src/app/layouts/frontend-layout.component.ts +++ b/apps/web/src/app/layouts/frontend-layout.component.ts @@ -1,9 +1,6 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; -import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; -import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { Utils } from "@bitwarden/common/platform/misc/utils"; @Component({ selector: "app-frontend-layout", @@ -11,24 +8,13 @@ import { Utils } from "@bitwarden/common/platform/misc/utils"; }) export class FrontendLayoutComponent implements OnInit, OnDestroy { version: string; - isSelfHosted: boolean; - euServerFlagEnabled: boolean; year = "2015"; - isEuServer = true; - constructor( - private platformUtilsService: PlatformUtilsService, - private configService: ConfigServiceAbstraction - ) {} + constructor(private platformUtilsService: PlatformUtilsService) {} async ngOnInit() { this.year = new Date().getFullYear().toString(); this.version = await this.platformUtilsService.getApplicationVersion(); - this.isSelfHosted = this.platformUtilsService.isSelfHost(); - this.euServerFlagEnabled = await this.configService.getFeatureFlagBool( - FeatureFlag.DisplayEuEnvironmentFlag - ); - this.isEuServer = Utils.getDomain(window.location.href).includes(".eu"); document.body.classList.add("layout_frontend"); } diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index 955e9b0da9..0f7a15b17a 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -8,7 +8,6 @@ import { UnauthGuard } from "@bitwarden/angular/auth/guards/unauth.guard"; import { SubscriptionRoutingModule } from "../app/billing/settings/subscription-routing.module"; import { flagEnabled, Flags } from "../utils/flags"; -import { TrialInitiationComponent } from "./accounts/trial-initiation/trial-initiation.component"; import { AcceptFamilySponsorshipComponent } from "./admin-console/organizations/sponsorships/accept-family-sponsorship.component"; import { FamiliesForEnterpriseSetupComponent } from "./admin-console/organizations/sponsorships/families-for-enterprise-setup.component"; import { CreateOrganizationComponent } from "./admin-console/settings/create-organization.component"; @@ -26,6 +25,7 @@ import { SetPasswordComponent } from "./auth/set-password.component"; import { EmergencyAccessViewComponent } from "./auth/settings/emergency-access/emergency-access-view.component"; import { EmergencyAccessComponent } from "./auth/settings/emergency-access/emergency-access.component"; import { SsoComponent } from "./auth/sso.component"; +import { TrialInitiationComponent } from "./auth/trial-initiation/trial-initiation.component"; import { TwoFactorComponent } from "./auth/two-factor.component"; import { UpdatePasswordComponent } from "./auth/update-password.component"; import { UpdateTempPasswordComponent } from "./auth/update-temp-password.component"; diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts index b4e40d446d..1428aaea19 100644 --- a/apps/web/src/app/oss.module.ts +++ b/apps/web/src/app/oss.module.ts @@ -1,10 +1,10 @@ import { NgModule } from "@angular/core"; -import { TrialInitiationModule } from "./accounts/trial-initiation/trial-initiation.module"; import { OrganizationCreateModule } from "./admin-console/organizations/create/organization-create.module"; import { OrganizationManageModule } from "./admin-console/organizations/manage/organization-manage.module"; import { OrganizationUserModule } from "./admin-console/organizations/users/organization-user.module"; import { LoginModule } from "./auth/login/login.module"; +import { TrialInitiationModule } from "./auth/trial-initiation/trial-initiation.module"; import { LooseComponentsModule, SharedModule } from "./shared"; import { OrganizationBadgeModule } from "./vault/individual-vault/organization-badge/organization-badge.module"; import { VaultFilterModule } from "./vault/individual-vault/vault-filter/vault-filter.module"; diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index 498f3af6d8..afbc047a32 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -108,6 +108,7 @@ import { AddEditComponent as OrgAddEditComponent } from "../vault/org-vault/add- import { AttachmentsComponent as OrgAttachmentsComponent } from "../vault/org-vault/attachments.component"; import { CollectionsComponent as OrgCollectionsComponent } from "../vault/org-vault/collections.component"; +import { EnvironmentSelectorModule } from "./../components/environment-selector/environment-selector.module"; import { AccountFingerprintComponent } from "./components/account-fingerprint/account-fingerprint.component"; import { SharedModule } from "./shared.module"; @@ -122,10 +123,10 @@ import { SharedModule } from "./shared.module"; UserVerificationModule, ChangeKdfModule, DynamicAvatarComponent, + EnvironmentSelectorModule, AccountFingerprintComponent, ], declarations: [ - PremiumBadgeComponent, AcceptEmergencyComponent, AcceptFamilySponsorshipComponent, AcceptOrganizationComponent, diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index 6f92b1ecca..3f7aab5a4d 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -6930,5 +6930,26 @@ }, "removeMembersWithoutMasterPasswordWarning": { "message": "Removing members who do not have master passwords without setting one for them may restrict access to their full account." + }, + "startYour7DayFreeTrialOfBitwardenFor": { + "message": "Start your 7-Day free trial of Bitwarden for $ORG$", + "placeholders": { + "org": { + "content": "$1", + "example": "Organization name" + } + } + }, + "next": { + "message": "Next" + }, + "usFlag": { + "message": "US flag" + }, + "euFlag": { + "message": "EU flag" + }, + "selectedRegionFlag": { + "message": "Selected region flag" } } diff --git a/libs/common/src/platform/abstractions/environment.service.ts b/libs/common/src/platform/abstractions/environment.service.ts index aa963baf0a..8d336084ba 100644 --- a/libs/common/src/platform/abstractions/environment.service.ts +++ b/libs/common/src/platform/abstractions/environment.service.ts @@ -23,6 +23,12 @@ export enum Region { SelfHosted = "Self-hosted", } +export enum RegionDomain { + US = "bitwarden.com", + EU = "bitwarden.eu", + USQA = "bitwarden.pw", +} + export abstract class EnvironmentService { urls: Observable; usUrls: Urls;