diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts index 6c7932c9cab..b5c06357cf0 100644 --- a/apps/desktop/src/app/app-routing.module.ts +++ b/apps/desktop/src/app/app-routing.module.ts @@ -15,6 +15,7 @@ import { AnonLayoutWrapperComponent, AnonLayoutWrapperData, LoginComponentV2, + LoginSecondaryContentComponent, RegistrationFinishComponent, RegistrationStartComponent, RegistrationStartSecondaryComponent, @@ -130,6 +131,7 @@ const routes: Routes = [ }, children: [ { path: "", component: LoginComponentV2 }, + { path: "", component: LoginSecondaryContentComponent, outlet: "secondary" }, { path: "", component: EnvironmentSelectorComponent, diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json index 43774a88b52..c0c44b4f0e0 100644 --- a/apps/desktop/src/locales/en/messages.json +++ b/apps/desktop/src/locales/en/messages.json @@ -499,6 +499,9 @@ "createAccount": { "message": "Create account" }, + "newToBitwarden": { + "message": "New to Bitwarden?" + }, "setAStrongPassword": { "message": "Set a strong password" }, diff --git a/libs/auth/src/angular/index.ts b/libs/auth/src/angular/index.ts index 569e7bb59f3..3ba0b8ef71b 100644 --- a/libs/auth/src/angular/index.ts +++ b/libs/auth/src/angular/index.ts @@ -20,6 +20,7 @@ export * from "./input-password/password-input-result"; // login export * from "./login/login.component"; +export * from "./login/login-secondary-content.component"; export * from "./login/login.service"; export * from "./login/default-login.service"; diff --git a/libs/auth/src/angular/login/login-secondary-content.component.ts b/libs/auth/src/angular/login/login-secondary-content.component.ts new file mode 100644 index 00000000000..f4d32533c6e --- /dev/null +++ b/libs/auth/src/angular/login/login-secondary-content.component.ts @@ -0,0 +1,16 @@ +import { Component } from "@angular/core"; +import { RouterModule } from "@angular/router"; + +import { JslibModule } from "@bitwarden/angular/jslib.module"; + +@Component({ + standalone: true, + imports: [JslibModule, RouterModule], + template: ` +
+ {{ "newToBitwarden" | i18n }} + {{ "createAccount" | i18n }} +
+ `, +}) +export class LoginSecondaryContentComponent {} diff --git a/libs/auth/src/angular/login/login.component.html b/libs/auth/src/angular/login/login.component.html index 092706d18a3..b32b2831d9c 100644 --- a/libs/auth/src/angular/login/login.component.html +++ b/libs/auth/src/angular/login/login.component.html @@ -1,4 +1,6 @@ - + + + +
@@ -83,9 +85,9 @@

- + {{ "notYou" | i18n }}
- + + +
- + + +
+ @@ -199,4 +209,8 @@ + +
diff --git a/libs/auth/src/angular/login/login.component.ts b/libs/auth/src/angular/login/login.component.ts index 11e6aaf5cfd..12095bc78e2 100644 --- a/libs/auth/src/angular/login/login.component.ts +++ b/libs/auth/src/angular/login/login.component.ts @@ -249,6 +249,8 @@ export class LoginComponentV2 implements OnInit, OnDestroy { } } + /* TODO-rr-bw: these two lines are also used at the end of the submit method for + Browser/Desktop. See if you can consolidate for all 3 clients. */ this.loginEmailService.clearValues(); await this.router.navigate(["vault"]); }