AC-2409 Migrate Accept Provider Component (#9390)

* AC-2409 Migrate Accept Provider Component

* AC-2409 Replaced the loading scenario
This commit is contained in:
KiruthigaManivannan 2024-06-12 19:34:43 +05:30 committed by GitHub
parent ae688d9e9e
commit c726b91c1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 37 deletions

View File

@ -1,46 +1,41 @@
<div class="mt-5 d-flex justify-content-center" *ngIf="loading"> <div class="tw-mt-5 tw-flex tw-justify-center" *ngIf="loading">
<div> <div>
<img class="mb-4 logo logo-themed" alt="Bitwarden" /> <img class="tw-mb-4 logo logo-themed" alt="Bitwarden" />
<p class="text-center"> <p class="tw-text-center">
<i <i
class="bwi bwi-spinner bwi-spin bwi-2x text-muted" class="bwi bwi-spinner bwi-spin bwi-2x tw-text-muted"
title="{{ 'loading' | i18n }}" title="{{ 'loading' | i18n }}"
aria-hidden="true" aria-hidden="true"
></i> ></i>
<span class="sr-only">{{ "loading" | i18n }}</span> <span class="tw-sr-only">{{ "loading" | i18n }}</span>
</p> </p>
</div> </div>
</div> </div>
<div class="container" *ngIf="!loading && !authed"> <div *ngIf="!loading && !authed">
<div class="row justify-content-md-center mt-5"> <p bitTypography="body1" class="tw-text-center">
<div class="col-5"> {{ providerName }}
<p class="lead text-center mb-4">{{ "joinProvider" | i18n }}</p> <span bitTypography="body1" class="tw-font-bold">{{ email }}</span>
<div class="card d-block"> </p>
<div class="card-body"> <p bitTypography="body1">{{ "joinProviderDesc" | i18n }}</p>
<p class="text-center"> <hr />
{{ providerName }} <div class="tw-flex tw-gap-2">
<strong class="d-block mt-2">{{ email }}</strong> <a
</p> bitButton
<p>{{ "joinProviderDesc" | i18n }}</p> buttonType="primary"
<hr /> routerLink="/login"
<div class="d-flex"> [queryParams]="{ email: email }"
<a [block]="true"
routerLink="/login" >
[queryParams]="{ email: email }" {{ "logIn" | i18n }}
class="btn btn-primary btn-block" </a>
> <a
{{ "logIn" | i18n }} bitButton
</a> buttonType="primary"
<a routerLink="/register"
routerLink="/register" [queryParams]="{ email: email }"
[queryParams]="{ email: email }" [block]="true"
class="btn btn-primary btn-block ml-2 mt-0" >
> {{ "createAccount" | i18n }}
{{ "createAccount" | i18n }} </a>
</a>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>

View File

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