1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 06:13:38 +00:00

migrate components (#13810)

This commit is contained in:
Brandon Treston
2025-03-13 10:04:10 -04:00
committed by GitHub
parent cff14ffea3
commit a26f7704bf
11 changed files with 19 additions and 13 deletions

View File

@@ -9,7 +9,7 @@
<div bitDialogContent> <div bitDialogContent>
<div *ngIf="loading"> <div *ngIf="loading">
<i <i
class="bwi bwi-spinner bwi-spin text-muted" class="bwi bwi-spinner bwi-spin tw-text-muted"
title="{{ 'loading' | i18n }}" title="{{ 'loading' | i18n }}"
aria-hidden="true" aria-hidden="true"
></i> ></i>

View File

@@ -12,7 +12,7 @@
<ng-container *ngIf="loading"> <ng-container *ngIf="loading">
<i <i
class="bwi bwi-spinner bwi-spin text-muted" class="bwi bwi-spinner bwi-spin tw-text-muted"
title="{{ 'loading' | i18n }}" title="{{ 'loading' | i18n }}"
aria-hidden="true" aria-hidden="true"
></i> ></i>

View File

@@ -18,7 +18,9 @@
</td> </td>
<td bitCell> <td bitCell>
{{ item.user.email }} {{ item.user.email }}
<small class="text-muted d-block" *ngIf="item.user.name">{{ item.user.name }}</small> <small class="tw-text-muted tw-block" *ngIf="item.user.name">{{
item.user.name
}}</small>
</td> </td>
<td class="tw-text-danger" *ngIf="item.error" bitCell> <td class="tw-text-danger" *ngIf="item.error" bitCell>
{{ item.message }} {{ item.message }}

View File

@@ -12,7 +12,7 @@
<div bitDialogContent> <div bitDialogContent>
<ng-container *ngIf="loading"> <ng-container *ngIf="loading">
<i <i
class="bwi bwi-spinner bwi-spin text-muted" class="bwi bwi-spinner bwi-spin tw-text-muted"
title="{{ 'loading' | i18n }}" title="{{ 'loading' | i18n }}"
aria-hidden="true" aria-hidden="true"
></i> ></i>

View File

@@ -48,7 +48,7 @@
</div> </div>
<ng-container *ngIf="!firstLoaded"> <ng-container *ngIf="!firstLoaded">
<i <i
class="bwi bwi-spinner bwi-spin text-muted" class="bwi bwi-spinner bwi-spin tw-text-muted"
title="{{ 'loading' | i18n }}" title="{{ 'loading' | i18n }}"
aria-hidden="true" aria-hidden="true"
></i> ></i>

View File

@@ -1,13 +1,13 @@
<div class="mt-5 d-flex justify-content-center" *ngIf="loading"> <div class="tw-mt-10 tw-flex tw-justify-center" *ngIf="loading">
<div> <div>
<img class="mb-4 logo logo-themed" alt="Bitwarden" /> <bit-icon class="tw-w-72 tw-block tw-mb-4" [icon]="logo"></bit-icon>
<p class="text-center"> <div class="tw-flex tw-justify-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="tw-sr-only">{{ "loading" | i18n }}</span> <span class="tw-sr-only">{{ "loading" | i18n }}</span>
</p> </div>
</div> </div>
</div> </div>

View File

@@ -3,6 +3,7 @@
import { Component, inject } from "@angular/core"; import { Component, inject } from "@angular/core";
import { Params } from "@angular/router"; import { Params } from "@angular/router";
import { BitwardenLogo } from "@bitwarden/auth/angular";
import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
import { OrganizationSponsorshipResponse } from "@bitwarden/common/admin-console/models/response/organization-sponsorship.response"; import { OrganizationSponsorshipResponse } from "@bitwarden/common/admin-console/models/response/organization-sponsorship.response";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
@@ -20,6 +21,7 @@ import { BaseAcceptComponent } from "../../../common/base.accept.component";
templateUrl: "accept-family-sponsorship.component.html", templateUrl: "accept-family-sponsorship.component.html",
}) })
export class AcceptFamilySponsorshipComponent extends BaseAcceptComponent { export class AcceptFamilySponsorshipComponent extends BaseAcceptComponent {
protected logo = BitwardenLogo;
failedShortMessage = "inviteAcceptFailedShort"; failedShortMessage = "inviteAcceptFailedShort";
failedMessage = "inviteAcceptFailed"; failedMessage = "inviteAcceptFailed";

View File

@@ -29,7 +29,7 @@
<div *ngIf="showNewOrganization"> <div *ngIf="showNewOrganization">
<app-organization-plans></app-organization-plans> <app-organization-plans></app-organization-plans>
</div> </div>
<div class="w-1/2" *ngIf="!showNewOrganization"> <div class="tw-w-1/2" *ngIf="!showNewOrganization">
<button bitButton buttonType="primary" bitFormButton type="submit"> <button bitButton buttonType="primary" bitFormButton type="submit">
{{ "acceptOffer" | i18n }} {{ "acceptOffer" | i18n }}
</button> </button>

View File

@@ -1,6 +1,6 @@
<div class="tw-mt-5 tw-flex tw-justify-center" *ngIf="loading"> <div class="tw-mt-5 tw-flex tw-justify-center" *ngIf="loading">
<div> <div>
<img class="tw-mb-4 logo logo-themed" alt="Bitwarden" /> <bit-icon class="tw-w-72 tw-block tw-mb-4" [icon]="logo"></bit-icon>
<p class="tw-text-center"> <p class="tw-text-center">
<i <i
class="bwi bwi-spinner bwi-spin bwi-2x tw-text-muted" class="bwi bwi-spinner bwi-spin bwi-2x tw-text-muted"

View File

@@ -3,6 +3,7 @@
import { Component } from "@angular/core"; import { Component } from "@angular/core";
import { ActivatedRoute, Params, Router } from "@angular/router"; import { ActivatedRoute, Params, Router } from "@angular/router";
import { BitwardenLogo } from "@bitwarden/auth/angular";
import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { ProviderUserAcceptRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-accept.request"; import { ProviderUserAcceptRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-accept.request";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -15,6 +16,7 @@ import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept
templateUrl: "accept-provider.component.html", templateUrl: "accept-provider.component.html",
}) })
export class AcceptProviderComponent extends BaseAcceptComponent { export class AcceptProviderComponent extends BaseAcceptComponent {
protected logo = BitwardenLogo;
providerName: string; providerName: string;
providerId: string; providerId: string;
providerUserId: string; providerUserId: string;

View File

@@ -1,4 +1,4 @@
<p class="lead tw-text-center tw-mb-4">{{ "deleteProvider" | i18n }}</p> <h2 class="tw-text-center tw-mb-4">{{ "deleteProvider" | i18n }}</h2>
<app-callout type="warning">{{ "deleteProviderWarning" | i18n }}</app-callout> <app-callout type="warning">{{ "deleteProviderWarning" | i18n }}</app-callout>
<p class="tw-text-center"> <p class="tw-text-center">
<strong>{{ name }}</strong> <strong>{{ name }}</strong>