From b783d99d02f7839d1ec5d2aa82dc759e6fb9132c Mon Sep 17 00:00:00 2001 From: aj-rosado <109146700+aj-rosado@users.noreply.github.com> Date: Thu, 28 Dec 2023 10:06:23 +0000 Subject: [PATCH] Moved reports files into tools ownership and updated the imports (#7222) --- .../reporting/organization-reporting.module.ts | 2 +- .../organizations/reporting/reports-home.component.ts | 2 +- .../tools/exposed-passwords-report.component.ts | 4 ++-- .../tools/inactive-two-factor-report.component.ts | 4 ++-- .../tools/reused-passwords-report.component.ts | 4 ++-- .../tools/unsecured-websites-report.component.ts | 4 ++-- .../organizations/tools/weak-passwords-report.component.ts | 4 ++-- apps/web/src/app/oss-routing.module.ts | 2 +- .../src/app/{ => tools}/reports/icons/report-breach.icon.ts | 0 .../reports/icons/report-exposed-passwords.icon.ts | 0 .../reports/icons/report-inactive-two-factor.icon.ts | 0 .../reports/icons/report-reused-passwords.icon.ts | 0 .../reports/icons/report-unsecured-websites.icon.ts | 0 .../{ => tools}/reports/icons/report-weak-passwords.icon.ts | 0 apps/web/src/app/{ => tools}/reports/index.ts | 0 .../{ => tools}/reports/pages/breach-report.component.html | 0 .../{ => tools}/reports/pages/breach-report.component.ts | 0 .../{ => tools}/reports/pages/cipher-report.component.ts | 4 ++-- .../reports/pages/exposed-passwords-report.component.html | 0 .../pages/exposed-passwords-report.component.spec.ts | 0 .../reports/pages/exposed-passwords-report.component.ts | 0 .../reports/pages/inactive-two-factor-report.component.html | 0 .../pages/inactive-two-factor-report.component.spec.ts | 0 .../reports/pages/inactive-two-factor-report.component.ts | 0 .../app/{ => tools}/reports/pages/reports-ciphers.mock.ts | 0 .../{ => tools}/reports/pages/reports-home.component.html | 0 .../app/{ => tools}/reports/pages/reports-home.component.ts | 0 .../reports/pages/reused-passwords-report.component.html | 0 .../reports/pages/reused-passwords-report.component.spec.ts | 0 .../reports/pages/reused-passwords-report.component.ts | 0 .../reports/pages/unsecured-websites-report.component.html | 0 .../pages/unsecured-websites-report.component.spec.ts | 0 .../reports/pages/unsecured-websites-report.component.ts | 0 .../reports/pages/weak-passwords-report.component.html | 0 .../reports/pages/weak-passwords-report.component.spec.ts | 0 .../reports/pages/weak-passwords-report.component.ts | 0 .../app/{ => tools}/reports/reports-layout.component.html | 0 .../src/app/{ => tools}/reports/reports-layout.component.ts | 0 .../src/app/{ => tools}/reports/reports-routing.module.ts | 2 +- apps/web/src/app/{ => tools}/reports/reports.module.ts | 6 +++--- apps/web/src/app/{ => tools}/reports/reports.ts | 0 apps/web/src/app/{ => tools}/reports/shared/index.ts | 0 .../app/{ => tools}/reports/shared/models/report-entry.ts | 0 .../app/{ => tools}/reports/shared/models/report-variant.ts | 0 .../reports/shared/report-card/report-card.component.html | 0 .../reports/shared/report-card/report-card.component.ts | 0 .../reports/shared/report-card/report-card.stories.ts | 4 ++-- .../reports/shared/report-list/report-list.component.html | 0 .../reports/shared/report-list/report-list.component.ts | 0 .../reports/shared/report-list/report-list.stories.ts | 4 ++-- .../app/{ => tools}/reports/shared/reports-shared.module.ts | 2 +- 51 files changed, 24 insertions(+), 24 deletions(-) rename apps/web/src/app/{ => tools}/reports/icons/report-breach.icon.ts (100%) rename apps/web/src/app/{ => tools}/reports/icons/report-exposed-passwords.icon.ts (100%) rename apps/web/src/app/{ => tools}/reports/icons/report-inactive-two-factor.icon.ts (100%) rename apps/web/src/app/{ => tools}/reports/icons/report-reused-passwords.icon.ts (100%) rename apps/web/src/app/{ => tools}/reports/icons/report-unsecured-websites.icon.ts (100%) rename apps/web/src/app/{ => tools}/reports/icons/report-weak-passwords.icon.ts (100%) rename apps/web/src/app/{ => tools}/reports/index.ts (100%) rename apps/web/src/app/{ => tools}/reports/pages/breach-report.component.html (100%) rename apps/web/src/app/{ => tools}/reports/pages/breach-report.component.ts (100%) rename apps/web/src/app/{ => tools}/reports/pages/cipher-report.component.ts (93%) rename apps/web/src/app/{ => tools}/reports/pages/exposed-passwords-report.component.html (100%) rename apps/web/src/app/{ => tools}/reports/pages/exposed-passwords-report.component.spec.ts (100%) rename apps/web/src/app/{ => tools}/reports/pages/exposed-passwords-report.component.ts (100%) rename apps/web/src/app/{ => tools}/reports/pages/inactive-two-factor-report.component.html (100%) rename apps/web/src/app/{ => tools}/reports/pages/inactive-two-factor-report.component.spec.ts (100%) rename apps/web/src/app/{ => tools}/reports/pages/inactive-two-factor-report.component.ts (100%) rename apps/web/src/app/{ => tools}/reports/pages/reports-ciphers.mock.ts (100%) rename apps/web/src/app/{ => tools}/reports/pages/reports-home.component.html (100%) rename apps/web/src/app/{ => tools}/reports/pages/reports-home.component.ts (100%) rename apps/web/src/app/{ => tools}/reports/pages/reused-passwords-report.component.html (100%) rename apps/web/src/app/{ => tools}/reports/pages/reused-passwords-report.component.spec.ts (100%) rename apps/web/src/app/{ => tools}/reports/pages/reused-passwords-report.component.ts (100%) rename apps/web/src/app/{ => tools}/reports/pages/unsecured-websites-report.component.html (100%) rename apps/web/src/app/{ => tools}/reports/pages/unsecured-websites-report.component.spec.ts (100%) rename apps/web/src/app/{ => tools}/reports/pages/unsecured-websites-report.component.ts (100%) rename apps/web/src/app/{ => tools}/reports/pages/weak-passwords-report.component.html (100%) rename apps/web/src/app/{ => tools}/reports/pages/weak-passwords-report.component.spec.ts (100%) rename apps/web/src/app/{ => tools}/reports/pages/weak-passwords-report.component.ts (100%) rename apps/web/src/app/{ => tools}/reports/reports-layout.component.html (100%) rename apps/web/src/app/{ => tools}/reports/reports-layout.component.ts (100%) rename apps/web/src/app/{ => tools}/reports/reports-routing.module.ts (97%) rename apps/web/src/app/{ => tools}/reports/reports.module.ts (85%) rename apps/web/src/app/{ => tools}/reports/reports.ts (100%) rename apps/web/src/app/{ => tools}/reports/shared/index.ts (100%) rename apps/web/src/app/{ => tools}/reports/shared/models/report-entry.ts (100%) rename apps/web/src/app/{ => tools}/reports/shared/models/report-variant.ts (100%) rename apps/web/src/app/{ => tools}/reports/shared/report-card/report-card.component.html (100%) rename apps/web/src/app/{ => tools}/reports/shared/report-card/report-card.component.ts (100%) rename apps/web/src/app/{ => tools}/reports/shared/report-card/report-card.stories.ts (90%) rename apps/web/src/app/{ => tools}/reports/shared/report-list/report-list.component.html (100%) rename apps/web/src/app/{ => tools}/reports/shared/report-list/report-list.component.ts (100%) rename apps/web/src/app/{ => tools}/reports/shared/report-list/report-list.stories.ts (88%) rename apps/web/src/app/{ => tools}/reports/shared/reports-shared.module.ts (87%) diff --git a/apps/web/src/app/admin-console/organizations/reporting/organization-reporting.module.ts b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting.module.ts index 03bcd28a51..f47cff2265 100644 --- a/apps/web/src/app/admin-console/organizations/reporting/organization-reporting.module.ts +++ b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; -import { ReportsSharedModule } from "../../../reports"; import { SharedModule } from "../../../shared/shared.module"; +import { ReportsSharedModule } from "../../../tools/reports"; import { OrganizationReportingRoutingModule } from "./organization-reporting-routing.module"; import { ReportingComponent } from "./reporting.component"; diff --git a/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts b/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts index bab78a45ae..51f34481d3 100644 --- a/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts +++ b/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts @@ -5,7 +5,7 @@ import { filter, map, Observable, startWith } from "rxjs"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; -import { ReportVariant, reports, ReportType, ReportEntry } from "../../../reports"; +import { ReportVariant, reports, ReportType, ReportEntry } from "../../../tools/reports"; @Component({ selector: "app-org-reports-home", diff --git a/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts index 2419d977a9..54a4bb18b7 100644 --- a/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts @@ -10,11 +10,11 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { PasswordRepromptService } from "@bitwarden/vault"; // eslint-disable-next-line no-restricted-imports -import { ExposedPasswordsReportComponent as BaseExposedPasswordsReportComponent } from "../../../reports/pages/exposed-passwords-report.component"; +import { ExposedPasswordsReportComponent as BaseExposedPasswordsReportComponent } from "../../../tools/reports/pages/exposed-passwords-report.component"; @Component({ selector: "app-org-exposed-passwords-report", - templateUrl: "../../../reports/pages/exposed-passwords-report.component.html", + templateUrl: "../../../tools/reports/pages/exposed-passwords-report.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class ExposedPasswordsReportComponent extends BaseExposedPasswordsReportComponent { diff --git a/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts index d531dcf925..906451397f 100644 --- a/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts @@ -9,11 +9,11 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { PasswordRepromptService } from "@bitwarden/vault"; // eslint-disable-next-line no-restricted-imports -import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponent } from "../../../reports/pages/inactive-two-factor-report.component"; +import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponent } from "../../../tools/reports/pages/inactive-two-factor-report.component"; @Component({ selector: "app-inactive-two-factor-report", - templateUrl: "../../../reports/pages/inactive-two-factor-report.component.html", + templateUrl: "../../../tools/reports/pages/inactive-two-factor-report.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class InactiveTwoFactorReportComponent extends BaseInactiveTwoFactorReportComponent { diff --git a/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts index f5022e4902..03418a7279 100644 --- a/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts @@ -9,11 +9,11 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { PasswordRepromptService } from "@bitwarden/vault"; // eslint-disable-next-line no-restricted-imports -import { ReusedPasswordsReportComponent as BaseReusedPasswordsReportComponent } from "../../../reports/pages/reused-passwords-report.component"; +import { ReusedPasswordsReportComponent as BaseReusedPasswordsReportComponent } from "../../../tools/reports/pages/reused-passwords-report.component"; @Component({ selector: "app-reused-passwords-report", - templateUrl: "../../../reports/pages/reused-passwords-report.component.html", + templateUrl: "../../../tools/reports/pages/reused-passwords-report.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class ReusedPasswordsReportComponent extends BaseReusedPasswordsReportComponent { diff --git a/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts index eb69f218ef..6e1f38e645 100644 --- a/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts @@ -8,11 +8,11 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { PasswordRepromptService } from "@bitwarden/vault"; // eslint-disable-next-line no-restricted-imports -import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponent } from "../../../reports/pages/unsecured-websites-report.component"; +import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponent } from "../../../tools/reports/pages/unsecured-websites-report.component"; @Component({ selector: "app-unsecured-websites-report", - templateUrl: "../../../reports/pages/unsecured-websites-report.component.html", + templateUrl: "../../../tools/reports/pages/unsecured-websites-report.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class UnsecuredWebsitesReportComponent extends BaseUnsecuredWebsitesReportComponent { diff --git a/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts index 3d90b24ca5..a79691c01b 100644 --- a/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts @@ -10,11 +10,11 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { PasswordRepromptService } from "@bitwarden/vault"; // eslint-disable-next-line no-restricted-imports -import { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent } from "../../../reports/pages/weak-passwords-report.component"; +import { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent } from "../../../tools/reports/pages/weak-passwords-report.component"; @Component({ selector: "app-weak-passwords-report", - templateUrl: "../../../reports/pages/weak-passwords-report.component.html", + templateUrl: "../../../tools/reports/pages/weak-passwords-report.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class WeakPasswordsReportComponent extends BaseWeakPasswordsReportComponent { diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index 40fb39dc58..9bf318f657 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -42,11 +42,11 @@ import { VerifyEmailTokenComponent } from "./auth/verify-email-token.component"; import { VerifyRecoverDeleteComponent } from "./auth/verify-recover-delete.component"; import { FrontendLayoutComponent } from "./layouts/frontend-layout.component"; import { UserLayoutComponent } from "./layouts/user-layout.component"; -import { ReportsModule } from "./reports"; import { DomainRulesComponent } from "./settings/domain-rules.component"; import { PreferencesComponent } from "./settings/preferences.component"; import { SettingsComponent } from "./settings/settings.component"; import { GeneratorComponent } from "./tools/generator.component"; +import { ReportsModule } from "./tools/reports"; import { AccessComponent } from "./tools/send/access.component"; import { SendComponent } from "./tools/send/send.component"; import { ToolsComponent } from "./tools/tools.component"; diff --git a/apps/web/src/app/reports/icons/report-breach.icon.ts b/apps/web/src/app/tools/reports/icons/report-breach.icon.ts similarity index 100% rename from apps/web/src/app/reports/icons/report-breach.icon.ts rename to apps/web/src/app/tools/reports/icons/report-breach.icon.ts diff --git a/apps/web/src/app/reports/icons/report-exposed-passwords.icon.ts b/apps/web/src/app/tools/reports/icons/report-exposed-passwords.icon.ts similarity index 100% rename from apps/web/src/app/reports/icons/report-exposed-passwords.icon.ts rename to apps/web/src/app/tools/reports/icons/report-exposed-passwords.icon.ts diff --git a/apps/web/src/app/reports/icons/report-inactive-two-factor.icon.ts b/apps/web/src/app/tools/reports/icons/report-inactive-two-factor.icon.ts similarity index 100% rename from apps/web/src/app/reports/icons/report-inactive-two-factor.icon.ts rename to apps/web/src/app/tools/reports/icons/report-inactive-two-factor.icon.ts diff --git a/apps/web/src/app/reports/icons/report-reused-passwords.icon.ts b/apps/web/src/app/tools/reports/icons/report-reused-passwords.icon.ts similarity index 100% rename from apps/web/src/app/reports/icons/report-reused-passwords.icon.ts rename to apps/web/src/app/tools/reports/icons/report-reused-passwords.icon.ts diff --git a/apps/web/src/app/reports/icons/report-unsecured-websites.icon.ts b/apps/web/src/app/tools/reports/icons/report-unsecured-websites.icon.ts similarity index 100% rename from apps/web/src/app/reports/icons/report-unsecured-websites.icon.ts rename to apps/web/src/app/tools/reports/icons/report-unsecured-websites.icon.ts diff --git a/apps/web/src/app/reports/icons/report-weak-passwords.icon.ts b/apps/web/src/app/tools/reports/icons/report-weak-passwords.icon.ts similarity index 100% rename from apps/web/src/app/reports/icons/report-weak-passwords.icon.ts rename to apps/web/src/app/tools/reports/icons/report-weak-passwords.icon.ts diff --git a/apps/web/src/app/reports/index.ts b/apps/web/src/app/tools/reports/index.ts similarity index 100% rename from apps/web/src/app/reports/index.ts rename to apps/web/src/app/tools/reports/index.ts diff --git a/apps/web/src/app/reports/pages/breach-report.component.html b/apps/web/src/app/tools/reports/pages/breach-report.component.html similarity index 100% rename from apps/web/src/app/reports/pages/breach-report.component.html rename to apps/web/src/app/tools/reports/pages/breach-report.component.html diff --git a/apps/web/src/app/reports/pages/breach-report.component.ts b/apps/web/src/app/tools/reports/pages/breach-report.component.ts similarity index 100% rename from apps/web/src/app/reports/pages/breach-report.component.ts rename to apps/web/src/app/tools/reports/pages/breach-report.component.ts diff --git a/apps/web/src/app/reports/pages/cipher-report.component.ts b/apps/web/src/app/tools/reports/pages/cipher-report.component.ts similarity index 93% rename from apps/web/src/app/reports/pages/cipher-report.component.ts rename to apps/web/src/app/tools/reports/pages/cipher-report.component.ts index 5045649351..0d67b7a769 100644 --- a/apps/web/src/app/reports/pages/cipher-report.component.ts +++ b/apps/web/src/app/tools/reports/pages/cipher-report.component.ts @@ -8,8 +8,8 @@ import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-repromp import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { PasswordRepromptService } from "@bitwarden/vault"; -import { AddEditComponent } from "../../vault/individual-vault/add-edit.component"; -import { AddEditComponent as OrgAddEditComponent } from "../../vault/org-vault/add-edit.component"; +import { AddEditComponent } from "../../../vault/individual-vault/add-edit.component"; +import { AddEditComponent as OrgAddEditComponent } from "../../../vault/org-vault/add-edit.component"; @Directive() export class CipherReportComponent { diff --git a/apps/web/src/app/reports/pages/exposed-passwords-report.component.html b/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html similarity index 100% rename from apps/web/src/app/reports/pages/exposed-passwords-report.component.html rename to apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html diff --git a/apps/web/src/app/reports/pages/exposed-passwords-report.component.spec.ts b/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.spec.ts similarity index 100% rename from apps/web/src/app/reports/pages/exposed-passwords-report.component.spec.ts rename to apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.spec.ts diff --git a/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts b/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.ts similarity index 100% rename from apps/web/src/app/reports/pages/exposed-passwords-report.component.ts rename to apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.ts diff --git a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.html b/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.html similarity index 100% rename from apps/web/src/app/reports/pages/inactive-two-factor-report.component.html rename to apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.html diff --git a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.spec.ts b/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.spec.ts similarity index 100% rename from apps/web/src/app/reports/pages/inactive-two-factor-report.component.spec.ts rename to apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.spec.ts diff --git a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts b/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.ts similarity index 100% rename from apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts rename to apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.ts diff --git a/apps/web/src/app/reports/pages/reports-ciphers.mock.ts b/apps/web/src/app/tools/reports/pages/reports-ciphers.mock.ts similarity index 100% rename from apps/web/src/app/reports/pages/reports-ciphers.mock.ts rename to apps/web/src/app/tools/reports/pages/reports-ciphers.mock.ts diff --git a/apps/web/src/app/reports/pages/reports-home.component.html b/apps/web/src/app/tools/reports/pages/reports-home.component.html similarity index 100% rename from apps/web/src/app/reports/pages/reports-home.component.html rename to apps/web/src/app/tools/reports/pages/reports-home.component.html diff --git a/apps/web/src/app/reports/pages/reports-home.component.ts b/apps/web/src/app/tools/reports/pages/reports-home.component.ts similarity index 100% rename from apps/web/src/app/reports/pages/reports-home.component.ts rename to apps/web/src/app/tools/reports/pages/reports-home.component.ts diff --git a/apps/web/src/app/reports/pages/reused-passwords-report.component.html b/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.html similarity index 100% rename from apps/web/src/app/reports/pages/reused-passwords-report.component.html rename to apps/web/src/app/tools/reports/pages/reused-passwords-report.component.html diff --git a/apps/web/src/app/reports/pages/reused-passwords-report.component.spec.ts b/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.spec.ts similarity index 100% rename from apps/web/src/app/reports/pages/reused-passwords-report.component.spec.ts rename to apps/web/src/app/tools/reports/pages/reused-passwords-report.component.spec.ts diff --git a/apps/web/src/app/reports/pages/reused-passwords-report.component.ts b/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.ts similarity index 100% rename from apps/web/src/app/reports/pages/reused-passwords-report.component.ts rename to apps/web/src/app/tools/reports/pages/reused-passwords-report.component.ts diff --git a/apps/web/src/app/reports/pages/unsecured-websites-report.component.html b/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.html similarity index 100% rename from apps/web/src/app/reports/pages/unsecured-websites-report.component.html rename to apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.html diff --git a/apps/web/src/app/reports/pages/unsecured-websites-report.component.spec.ts b/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.spec.ts similarity index 100% rename from apps/web/src/app/reports/pages/unsecured-websites-report.component.spec.ts rename to apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.spec.ts diff --git a/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts b/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.ts similarity index 100% rename from apps/web/src/app/reports/pages/unsecured-websites-report.component.ts rename to apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.ts diff --git a/apps/web/src/app/reports/pages/weak-passwords-report.component.html b/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html similarity index 100% rename from apps/web/src/app/reports/pages/weak-passwords-report.component.html rename to apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html diff --git a/apps/web/src/app/reports/pages/weak-passwords-report.component.spec.ts b/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.spec.ts similarity index 100% rename from apps/web/src/app/reports/pages/weak-passwords-report.component.spec.ts rename to apps/web/src/app/tools/reports/pages/weak-passwords-report.component.spec.ts diff --git a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.ts similarity index 100% rename from apps/web/src/app/reports/pages/weak-passwords-report.component.ts rename to apps/web/src/app/tools/reports/pages/weak-passwords-report.component.ts diff --git a/apps/web/src/app/reports/reports-layout.component.html b/apps/web/src/app/tools/reports/reports-layout.component.html similarity index 100% rename from apps/web/src/app/reports/reports-layout.component.html rename to apps/web/src/app/tools/reports/reports-layout.component.html diff --git a/apps/web/src/app/reports/reports-layout.component.ts b/apps/web/src/app/tools/reports/reports-layout.component.ts similarity index 100% rename from apps/web/src/app/reports/reports-layout.component.ts rename to apps/web/src/app/tools/reports/reports-layout.component.ts diff --git a/apps/web/src/app/reports/reports-routing.module.ts b/apps/web/src/app/tools/reports/reports-routing.module.ts similarity index 97% rename from apps/web/src/app/reports/reports-routing.module.ts rename to apps/web/src/app/tools/reports/reports-routing.module.ts index 6bd2683776..b361837168 100644 --- a/apps/web/src/app/reports/reports-routing.module.ts +++ b/apps/web/src/app/tools/reports/reports-routing.module.ts @@ -3,7 +3,7 @@ import { RouterModule, Routes } from "@angular/router"; import { AuthGuard } from "@bitwarden/angular/auth/guards"; -import { hasPremiumGuard } from "../core/guards/has-premium.guard"; +import { hasPremiumGuard } from "../../core/guards/has-premium.guard"; import { BreachReportComponent } from "./pages/breach-report.component"; import { ExposedPasswordsReportComponent } from "./pages/exposed-passwords-report.component"; diff --git a/apps/web/src/app/reports/reports.module.ts b/apps/web/src/app/tools/reports/reports.module.ts similarity index 85% rename from apps/web/src/app/reports/reports.module.ts rename to apps/web/src/app/tools/reports/reports.module.ts index 500865cfb1..7b05d19d03 100644 --- a/apps/web/src/app/reports/reports.module.ts +++ b/apps/web/src/app/tools/reports/reports.module.ts @@ -1,9 +1,9 @@ import { CommonModule } from "@angular/common"; import { NgModule } from "@angular/core"; -import { SharedModule } from "../shared"; -import { OrganizationBadgeModule } from "../vault/individual-vault/organization-badge/organization-badge.module"; -import { PipesModule } from "../vault/individual-vault/pipes/pipes.module"; +import { SharedModule } from "../../shared"; +import { OrganizationBadgeModule } from "../../vault/individual-vault/organization-badge/organization-badge.module"; +import { PipesModule } from "../../vault/individual-vault/pipes/pipes.module"; import { BreachReportComponent } from "./pages/breach-report.component"; import { ExposedPasswordsReportComponent } from "./pages/exposed-passwords-report.component"; diff --git a/apps/web/src/app/reports/reports.ts b/apps/web/src/app/tools/reports/reports.ts similarity index 100% rename from apps/web/src/app/reports/reports.ts rename to apps/web/src/app/tools/reports/reports.ts diff --git a/apps/web/src/app/reports/shared/index.ts b/apps/web/src/app/tools/reports/shared/index.ts similarity index 100% rename from apps/web/src/app/reports/shared/index.ts rename to apps/web/src/app/tools/reports/shared/index.ts diff --git a/apps/web/src/app/reports/shared/models/report-entry.ts b/apps/web/src/app/tools/reports/shared/models/report-entry.ts similarity index 100% rename from apps/web/src/app/reports/shared/models/report-entry.ts rename to apps/web/src/app/tools/reports/shared/models/report-entry.ts diff --git a/apps/web/src/app/reports/shared/models/report-variant.ts b/apps/web/src/app/tools/reports/shared/models/report-variant.ts similarity index 100% rename from apps/web/src/app/reports/shared/models/report-variant.ts rename to apps/web/src/app/tools/reports/shared/models/report-variant.ts diff --git a/apps/web/src/app/reports/shared/report-card/report-card.component.html b/apps/web/src/app/tools/reports/shared/report-card/report-card.component.html similarity index 100% rename from apps/web/src/app/reports/shared/report-card/report-card.component.html rename to apps/web/src/app/tools/reports/shared/report-card/report-card.component.html diff --git a/apps/web/src/app/reports/shared/report-card/report-card.component.ts b/apps/web/src/app/tools/reports/shared/report-card/report-card.component.ts similarity index 100% rename from apps/web/src/app/reports/shared/report-card/report-card.component.ts rename to apps/web/src/app/tools/reports/shared/report-card/report-card.component.ts diff --git a/apps/web/src/app/reports/shared/report-card/report-card.stories.ts b/apps/web/src/app/tools/reports/shared/report-card/report-card.stories.ts similarity index 90% rename from apps/web/src/app/reports/shared/report-card/report-card.stories.ts rename to apps/web/src/app/tools/reports/shared/report-card/report-card.stories.ts index 16a0dfc07f..7f7d0ae978 100644 --- a/apps/web/src/app/reports/shared/report-card/report-card.stories.ts +++ b/apps/web/src/app/tools/reports/shared/report-card/report-card.stories.ts @@ -5,8 +5,8 @@ import { Meta, Story, applicationConfig, moduleMetadata } from "@storybook/angul import { JslibModule } from "@bitwarden/angular/jslib.module"; import { BadgeModule, IconModule } from "@bitwarden/components"; -import { PreloadedEnglishI18nModule } from "../../../core/tests"; -import { PremiumBadgeComponent } from "../../../vault/components/premium-badge.component"; +import { PreloadedEnglishI18nModule } from "../../../../core/tests"; +import { PremiumBadgeComponent } from "../../../../vault/components/premium-badge.component"; import { ReportVariant } from "../models/report-variant"; import { ReportCardComponent } from "./report-card.component"; diff --git a/apps/web/src/app/reports/shared/report-list/report-list.component.html b/apps/web/src/app/tools/reports/shared/report-list/report-list.component.html similarity index 100% rename from apps/web/src/app/reports/shared/report-list/report-list.component.html rename to apps/web/src/app/tools/reports/shared/report-list/report-list.component.html diff --git a/apps/web/src/app/reports/shared/report-list/report-list.component.ts b/apps/web/src/app/tools/reports/shared/report-list/report-list.component.ts similarity index 100% rename from apps/web/src/app/reports/shared/report-list/report-list.component.ts rename to apps/web/src/app/tools/reports/shared/report-list/report-list.component.ts diff --git a/apps/web/src/app/reports/shared/report-list/report-list.stories.ts b/apps/web/src/app/tools/reports/shared/report-list/report-list.stories.ts similarity index 88% rename from apps/web/src/app/reports/shared/report-list/report-list.stories.ts rename to apps/web/src/app/tools/reports/shared/report-list/report-list.stories.ts index 9a5f41890f..7eba2c0300 100644 --- a/apps/web/src/app/reports/shared/report-list/report-list.stories.ts +++ b/apps/web/src/app/tools/reports/shared/report-list/report-list.stories.ts @@ -5,8 +5,8 @@ import { Meta, Story, applicationConfig, moduleMetadata } from "@storybook/angul import { JslibModule } from "@bitwarden/angular/jslib.module"; import { BadgeModule, IconModule } from "@bitwarden/components"; -import { PreloadedEnglishI18nModule } from "../../../core/tests"; -import { PremiumBadgeComponent } from "../../../vault/components/premium-badge.component"; +import { PreloadedEnglishI18nModule } from "../../../../core/tests"; +import { PremiumBadgeComponent } from "../../../../vault/components/premium-badge.component"; import { reports } from "../../reports"; import { ReportVariant } from "../models/report-variant"; import { ReportCardComponent } from "../report-card/report-card.component"; diff --git a/apps/web/src/app/reports/shared/reports-shared.module.ts b/apps/web/src/app/tools/reports/shared/reports-shared.module.ts similarity index 87% rename from apps/web/src/app/reports/shared/reports-shared.module.ts rename to apps/web/src/app/tools/reports/shared/reports-shared.module.ts index 1cdf4a3127..cad5d06d79 100644 --- a/apps/web/src/app/reports/shared/reports-shared.module.ts +++ b/apps/web/src/app/tools/reports/shared/reports-shared.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from "@angular/common"; import { NgModule } from "@angular/core"; -import { SharedModule } from "../../shared/shared.module"; +import { SharedModule } from "../../../shared/shared.module"; import { ReportCardComponent } from "./report-card/report-card.component"; import { ReportListComponent } from "./report-list/report-list.component";