From e616218de501dfe90f043622297b6e5df8f55670 Mon Sep 17 00:00:00 2001 From: rr-bw <102181210+rr-bw@users.noreply.github.com> Date: Thu, 12 Sep 2024 14:46:42 -0700 Subject: [PATCH] Extension: setup EmailEntry state UI --- apps/browser/src/_locales/en/messages.json | 12 +++++ apps/browser/src/popup/app-routing.module.ts | 2 + .../login-secondary-content.component.ts | 3 ++ .../src/angular/login/login.component.html | 48 ++++++++++++++++++- .../auth/src/angular/login/login.component.ts | 10 ++-- 5 files changed, 69 insertions(+), 6 deletions(-) diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json index 2e82469b47..59ca20cffa 100644 --- a/apps/browser/src/_locales/en/messages.json +++ b/apps/browser/src/_locales/en/messages.json @@ -19,6 +19,18 @@ "createAccount": { "message": "Create account" }, + "newToBitwarden": { + "message": "New to Bitwarden?" + }, + "logInWithPasskey": { + "message": "Log in with passkey" + }, + "useSingleSignOn": { + "message": "Use single sign-on" + }, + "welcomeBack": { + "message": "Welcome back" + }, "setAStrongPassword": { "message": "Set a strong password" }, diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index 5660fc33a9..f76c94a076 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -17,6 +17,7 @@ import { AnonLayoutWrapperComponent, AnonLayoutWrapperData, LoginComponentV2, + LoginSecondaryContentComponent, RegistrationFinishComponent, RegistrationStartComponent, RegistrationStartSecondaryComponent, @@ -403,6 +404,7 @@ const routes: Routes = [ }, // TODO-rr-bw: add `satisfies DataProperties & ExtensionAnonLayoutWrapperData children: [ { path: "", component: LoginComponentV2 }, + { path: "", component: LoginSecondaryContentComponent, outlet: "secondary" }, { path: "", component: EnvironmentSelectorComponent, outlet: "environment-selector" }, ], }, diff --git a/libs/auth/src/angular/login/login-secondary-content.component.ts b/libs/auth/src/angular/login/login-secondary-content.component.ts index e3badc7df0..0e1f209507 100644 --- a/libs/auth/src/angular/login/login-secondary-content.component.ts +++ b/libs/auth/src/angular/login/login-secondary-content.component.ts @@ -11,6 +11,9 @@ import { RegisterRouteService } from "@bitwarden/auth/common"; template: `