Skip to content

[PM-21184] Migrate free-bitwarden-families.component.html to Tailwind complying #14628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 34 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
f89c14a
Resolve the tw issues
cyprain-okeke May 5, 2025
c1c5296
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke May 19, 2025
43fb1af
Resolve the merge syntax
cyprain-okeke May 19, 2025
42e235a
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke May 19, 2025
2a36646
Remove the image and use the icon
cyprain-okeke May 19, 2025
e80480a
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke May 19, 2025
d2293db
Move the free compoent to standalone
cyprain-okeke May 19, 2025
7c6c29c
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke May 19, 2025
af1de5b
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke May 20, 2025
f22fb38
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke May 20, 2025
221326a
minified and use tailwind classes
cyprain-okeke May 20, 2025
5ea75a1
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke May 20, 2025
db446e9
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke May 21, 2025
ccd2a39
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke May 22, 2025
6ecf4d3
Remove the ngcontainer that is not needed
cyprain-okeke May 22, 2025
da7840f
Merge remote-tracking branch 'refs/remotes/origin/pm-21184-Migrate-frโ€ฆ
cyprain-okeke May 22, 2025
1f914e9
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke May 23, 2025
c1aa2ea
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke May 28, 2025
beb4b56
Remove the no-item changes
cyprain-okeke May 28, 2025
0f30e9e
Merge remote-tracking branch 'refs/remotes/origin/pm-21184-Migrate-frโ€ฆ
cyprain-okeke May 28, 2025
40f609b
Add the compoenet to export
cyprain-okeke May 28, 2025
4bfa6d0
Add the missing export
cyprain-okeke May 28, 2025
e56cc03
Remove the package file
cyprain-okeke May 28, 2025
4c3555a
Removed the added changes on json file
cyprain-okeke May 28, 2025
475c407
revert the change
cyprain-okeke May 28, 2025
754138e
revert the change
cyprain-okeke May 28, 2025
8f23101
Remove package-lock.json from branch
cyprain-okeke May 28, 2025
f1b3be1
Reset package-lock.json to match main branch
cyprain-okeke May 28, 2025
e9c7e4b
Remove package-lock.json from branch
cyprain-okeke May 28, 2025
c79beaf
revert the package file changes
cyprain-okeke May 28, 2025
ec8ec76
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke May 28, 2025
439ad1e
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke May 29, 2025
e56103a
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke Jun 2, 2025
cb27a94
Merge branch 'main' into pm-21184-Migrate-free-bitwarden-families-comโ€ฆ
cyprain-okeke Jun 2, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,21 @@ <h2 bitTypography="h2" class="">{{ "sponsoredBitwardenFamilies" | i18n }}</h2>
appA11yTitle="{{ 'options' | i18n }}"
></button>
<bit-menu #appListDropdown>
<button
type="button"
bitMenuItem
[attr.aria-label]="'resendEmailLabel' | i18n"
*ngIf="!isSelfHosted && !sponsoredFamily.validUntil"
(click)="resendEmail(sponsoredFamily)"
>
<i aria-hidden="true" class="bwi bwi-envelope"></i>
{{ "resendInvitation" | i18n }}
</button>
@if (!isSelfHosted && !sponsoredFamily.validUntil) {
<button
type="button"
bitMenuItem
[attr.aria-label]="'resendEmailLabel' | i18n"
(click)="resendEmail(sponsoredFamily)"
>
<i aria-hidden="true" class="bwi bwi-envelope"></i>
{{ "resendInvitation" | i18n }}
</button>
}

<ng-container *ngIf="!isSelfHosted && !sponsoredFamily.validUntil">
@if (!isSelfHosted && !sponsoredFamily.validUntil) {
<hr class="tw-m-0" />
</ng-container>
}

<button
type="button"
Expand All @@ -78,7 +79,7 @@ <h2 bitTypography="h2" class="">{{ "sponsoredBitwardenFamilies" | i18n }}</h2>
(click)="removeSponsorship(sponsoredFamily)"
>
<i aria-hidden="true" class="bwi bwi-close tw-text-danger"></i>
<span class="tw-text-danger pl-1">{{ "remove" | i18n }}</span>
<span class="tw-text-danger tw-pl-1">{{ "remove" | i18n }}</span>
</button>
</bit-menu>
</td>
Expand All @@ -87,7 +88,7 @@ <h2 bitTypography="h2" class="">{{ "sponsoredBitwardenFamilies" | i18n }}</h2>
}
</ng-template>
</bit-table>
<hr class="mt-0" />
<hr class="tw-mt-0" />
</ng-container>
} @else if (!loading()) {
<div class="tw-my-5 tw-py-5 tw-flex tw-flex-col tw-items-center">
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/shared/loose-components.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { UpdatePasswordComponent } from "../auth/update-password.component";
import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component";
import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component";
import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component";
import { FreeBitwardenFamiliesComponent } from "../billing/members/free-bitwarden-families.component";
import { SponsoredFamiliesComponent } from "../billing/settings/sponsored-families.component";
import { SponsoringOrgRowComponent } from "../billing/settings/sponsoring-org-row.component";
// eslint-disable-next-line no-restricted-imports -- Temporarily disabled until DIRT refactors these out of this module
Expand All @@ -46,7 +47,6 @@ import { OrganizationBadgeModule } from "../vault/individual-vault/organization-
import { PipesModule } from "../vault/individual-vault/pipes/pipes.module";
import { PurgeVaultComponent } from "../vault/settings/purge-vault.component";

import { FreeBitwardenFamiliesComponent } from "./../billing/members/free-bitwarden-families.component";
import { AccountFingerprintComponent } from "./components/account-fingerprint/account-fingerprint.component";
import { SharedModule } from "./shared.module";

Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/images/search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading