1
0
mirror of https://github.com/bitwarden/web synced 2025-12-15 15:53:18 +00:00

Undo some changes prettier made

This commit is contained in:
Hinton
2022-01-10 16:33:53 +01:00
parent a1cde3c820
commit 6efe992680
13 changed files with 71 additions and 19 deletions

View File

@@ -48,7 +48,9 @@ export class SetupComponent implements OnInit {
"error", "error",
null, null,
this.i18nService.t("emergencyInviteAcceptFailed"), this.i18nService.t("emergencyInviteAcceptFailed"),
{ timeout: 10000 } {
timeout: 10000,
}
); );
this.router.navigate(["/"]); this.router.navigate(["/"]);
return; return;

View File

@@ -116,7 +116,10 @@
<i <i
class="fa fa-lg" class="fa fa-lg"
aria-hidden="true" aria-hidden="true"
[ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }" [ngClass]="{
'fa-eye': !showPassword,
'fa-eye-slash': showPassword
}"
></i> ></i>
</button> </button>
<div class="progress-bar invisible"></div> <div class="progress-bar invisible"></div>

View File

@@ -60,7 +60,9 @@ export abstract class BaseAcceptComponent implements OnInit {
errorMessage != null errorMessage != null
? this.i18nService.t(this.failedShortMessage, errorMessage) ? this.i18nService.t(this.failedShortMessage, errorMessage)
: this.i18nService.t(this.failedMessage); : this.i18nService.t(this.failedMessage);
this.platformUtilService.showToast("error", null, message, { timeout: 10000 }); this.platformUtilService.showToast("error", null, message, {
timeout: 10000,
});
this.router.navigate(["/"]); this.router.navigate(["/"]);
} }

View File

@@ -110,7 +110,13 @@ export abstract class BaseEventsComponent {
endDate: string, endDate: string,
continuationToken: string continuationToken: string
): Promise<ListResponse<EventResponse>>; ): Promise<ListResponse<EventResponse>>;
protected abstract getUserName(r: EventResponse, userId: string): { name: string; email: string }; protected abstract getUserName(
r: EventResponse,
userId: string
): {
name: string;
email: string;
};
protected async loadAndParseEvents( protected async loadAndParseEvents(
startDate: string, startDate: string,
@@ -138,7 +144,10 @@ export abstract class BaseEventsComponent {
}); });
}) })
); );
return { continuationToken: response.continuationToken, events: events }; return {
continuationToken: response.continuationToken,
events: events,
};
} }
protected parseDates() { protected parseDates() {
@@ -172,6 +181,13 @@ export abstract class BaseEventsComponent {
const data = await this.exportService.getEventExport(events); const data = await this.exportService.getEventExport(events);
const fileName = this.exportService.getFileName(this.exportFileName, "csv"); const fileName = this.exportService.getFileName(this.exportFileName, "csv");
this.platformUtilsService.saveFile(window, data, { type: "text/plain" }, fileName); this.platformUtilsService.saveFile(
window,
data,
{
type: "text/plain",
},
fileName
);
} }
} }

View File

@@ -35,7 +35,10 @@ const MaxCheckedCount = 500;
export abstract class BasePeopleComponent< export abstract class BasePeopleComponent<
UserType extends ProviderUserUserDetailsResponse | OrganizationUserUserDetailsResponse UserType extends ProviderUserUserDetailsResponse | OrganizationUserUserDetailsResponse
> { > {
@ViewChild("confirmTemplate", { read: ViewContainerRef, static: true }) @ViewChild("confirmTemplate", {
read: ViewContainerRef,
static: true,
})
confirmModalRef: ViewContainerRef; confirmModalRef: ViewContainerRef;
get allCount() { get allCount() {

View File

@@ -6,10 +6,18 @@ import { Utils } from "jslib-common/misc/utils";
templateUrl: "nested-checkbox.component.html", templateUrl: "nested-checkbox.component.html",
}) })
export class NestedCheckboxComponent { export class NestedCheckboxComponent {
@Input() parentId: string; @Input()
@Input() checkboxes: { id: string; get: () => boolean; set: (v: boolean) => void }[]; parentId: string;
@Output() onSavedUser = new EventEmitter(); @Input()
@Output() onDeletedUser = new EventEmitter(); checkboxes: {
id: string;
get: () => boolean;
set: (v: boolean) => void;
}[];
@Output()
onSavedUser = new EventEmitter();
@Output()
onDeletedUser = new EventEmitter();
get parentIndeterminate() { get parentIndeterminate() {
return !this.parentChecked && this.checkboxes.some((c) => c.get()); return !this.parentChecked && this.checkboxes.some((c) => c.get());

View File

@@ -34,7 +34,10 @@
<i <i
class="fa fa-lg" class="fa fa-lg"
aria-hidden="true" aria-hidden="true"
[ngClass]="{ 'fa-eye': !showPassword, 'fa-eye-slash': showPassword }" [ngClass]="{
'fa-eye': !showPassword,
'fa-eye-slash': showPassword
}"
></i> ></i>
</button> </button>
</div> </div>

View File

@@ -2,7 +2,9 @@
<div <div
class="progress-bar {{ color }}" class="progress-bar {{ color }}"
role="progressbar" role="progressbar"
[ngStyle]="{ width: scoreWidth + '%' }" [ngStyle]="{
width: scoreWidth + '%'
}"
attr.aria-valuenow="{{ scoreWidth }}" attr.aria-valuenow="{{ scoreWidth }}"
aria-valuemin="0" aria-valuemin="0"
aria-valuemax="100" aria-valuemax="100"

View File

@@ -7,8 +7,10 @@ import { I18nService } from "jslib-common/abstractions/i18n.service";
templateUrl: "password-strength.component.html", templateUrl: "password-strength.component.html",
}) })
export class PasswordStrengthComponent implements OnChanges { export class PasswordStrengthComponent implements OnChanges {
@Input() score?: number; @Input()
@Input() showText = false; score?: number;
@Input()
showText = false;
scoreWidth = 0; scoreWidth = 0;
color = "bg-danger"; color = "bg-danger";

View File

@@ -1,6 +1,9 @@
<div class="container footer text-muted"> <div class="container footer text-muted">
<div class="row"> <div class="row">
<div class="col">&copy; {{ year }}, Bitwarden Inc.</div> <div class="col">
&copy;
{{ year }}, Bitwarden Inc.
</div>
<div class="col text-center"></div> <div class="col text-center"></div>
<div class="col text-right"> <div class="col text-right">
{{ "versionNumber" | i18n: version }} {{ "versionNumber" | i18n: version }}

View File

@@ -1,5 +1,7 @@
<router-outlet></router-outlet> <router-outlet></router-outlet>
<div class="container my-5 text-muted text-center"> <div class="container my-5 text-muted text-center">
&copy; {{ year }}, Bitwarden Inc. <br /> &copy;
{{ year }}, Bitwarden Inc.
<br />
{{ "versionNumber" | i18n: version }} {{ "versionNumber" | i18n: version }}
</div> </div>

View File

@@ -1,4 +1,9 @@
<nav class="navbar navbar-expand navbar-dark" [ngClass]="{ 'nav-background-alt': selfHosted }"> <nav
class="navbar navbar-expand navbar-dark"
[ngClass]="{
'nav-background-alt': selfHosted
}"
>
<div class="container"> <div class="container">
<a class="navbar-brand" routerLink="/" appA11yTitle="{{ 'pageTitle' | i18n: 'Bitwarden' }}"> <a class="navbar-brand" routerLink="/" appA11yTitle="{{ 'pageTitle' | i18n: 'Bitwarden' }}">
<i class="fa fa-shield" aria-hidden="true"></i> <i class="fa fa-shield" aria-hidden="true"></i>

View File

@@ -95,7 +95,8 @@
<h2 class="spaced-header">{{ "summary" | i18n }}</h2> <h2 class="spaced-header">{{ "summary" | i18n }}</h2>
{{ "premiumMembership" | i18n }}: {{ premiumPrice | currency: "$" }} <br /> {{ "premiumMembership" | i18n }}: {{ premiumPrice | currency: "$" }} <br />
{{ "additionalStorageGb" | i18n }}: {{ additionalStorage || 0 }} GB &times; {{ "additionalStorageGb" | i18n }}: {{ additionalStorage || 0 }} GB &times;
{{ storageGbPrice | currency: "$" }} = {{ additionalStorageTotal | currency: "$" }} {{ storageGbPrice | currency: "$" }} =
{{ additionalStorageTotal | currency: "$" }}
<hr class="my-3" /> <hr class="my-3" />
<h2 class="spaced-header mb-4">{{ "paymentInformation" | i18n }}</h2> <h2 class="spaced-header mb-4">{{ "paymentInformation" | i18n }}</h2>
<app-payment [hideBank]="true"></app-payment> <app-payment [hideBank]="true"></app-payment>