From c726b91c1f8538b0114f9be6c9ea9da57319390f Mon Sep 17 00:00:00 2001 From: KiruthigaManivannan <162679756+KiruthigaManivannan@users.noreply.github.com> Date: Wed, 12 Jun 2024 19:34:43 +0530 Subject: [PATCH] AC-2409 Migrate Accept Provider Component (#9390) * AC-2409 Migrate Accept Provider Component * AC-2409 Replaced the loading scenario --- .../manage/accept-provider.component.html | 67 +++++++++---------- .../providers/providers-routing.module.ts | 12 +++- 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html index a5927cbc9a..d8e6f03041 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.html @@ -1,46 +1,41 @@ -
+
- -

+ +

- {{ "loading" | i18n }} + {{ "loading" | i18n }}

-
-
-
-

{{ "joinProvider" | i18n }}

-
-
-

- {{ providerName }} - {{ email }} -

-

{{ "joinProviderDesc" | i18n }}

-
- -
-
-
+
+

+ {{ providerName }} + {{ email }} +

+

{{ "joinProviderDesc" | i18n }}

+
+
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts index 1f03ece907..9a2859fcbf 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-routing.module.ts @@ -2,6 +2,7 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; import { AuthGuard } from "@bitwarden/angular/auth/guards"; +import { AnonLayoutWrapperComponent } from "@bitwarden/auth/angular"; import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; import { ProvidersComponent } from "@bitwarden/web-vault/app/admin-console/providers/providers.component"; import { FrontendLayoutComponent } from "@bitwarden/web-vault/app/layouts/frontend-layout.component"; @@ -48,10 +49,19 @@ const routes: Routes = [ component: SetupProviderComponent, data: { titleId: "setupProvider" }, }, + ], + }, + { + path: "", + component: AnonLayoutWrapperComponent, + children: [ { path: "accept-provider", component: AcceptProviderComponent, - data: { titleId: "acceptProvider" }, + data: { + pageTitle: "joinProvider", + titleId: "acceptProvider", + }, }, ], },