diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts index 0e5be083081..f01c0278f87 100644 --- a/apps/web/src/app/core/core.module.ts +++ b/apps/web/src/app/core/core.module.ts @@ -24,7 +24,7 @@ import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; -import { PasswordRepromptService } from "../../vault/core/password-reprompt.service"; +import { PasswordRepromptService } from "../vault/core/password-reprompt.service"; import { BroadcasterMessagingService } from "./broadcaster-messaging.service"; import { EventService } from "./event.service"; diff --git a/apps/web/src/app/organizations/organization-routing.module.ts b/apps/web/src/app/organizations/organization-routing.module.ts index c29fb69030e..0f54d6150c7 100644 --- a/apps/web/src/app/organizations/organization-routing.module.ts +++ b/apps/web/src/app/organizations/organization-routing.module.ts @@ -12,7 +12,7 @@ import { } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/models/domain/organization"; -import { VaultModule } from "../../vault/org-vault/vault.module"; +import { VaultModule } from "../vault/org-vault/vault.module"; import { OrganizationPermissionsGuard } from "./guards/org-permissions.guard"; import { OrganizationRedirectGuard } from "./guards/org-redirect.guard"; diff --git a/apps/web/src/app/organizations/vault/collections.component.ts b/apps/web/src/app/organizations/vault/collections.component.ts index de3f51b5f2b..1766548ace2 100644 --- a/apps/web/src/app/organizations/vault/collections.component.ts +++ b/apps/web/src/app/organizations/vault/collections.component.ts @@ -11,11 +11,11 @@ import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { CipherCollectionsRequest } from "@bitwarden/common/vault/models/request/cipher-collections.request"; -import { CollectionsComponent as BaseCollectionsComponent } from "../../../vault/individual-vault/collections.component"; +import { CollectionsComponent as BaseCollectionsComponent } from "../../vault/individual-vault/collections.component"; @Component({ selector: "app-org-vault-collections", - templateUrl: "../../../vault/individual-vault/collections.component.html", + templateUrl: "../../vault/individual-vault/collections.component.html", }) export class CollectionsComponent extends BaseCollectionsComponent { organization: Organization; diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index 85d1e08793d..7610aea164f 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -24,7 +24,6 @@ import { UpdateTempPasswordComponent } from "../auth/update-temp-password.compon import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component"; import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component"; import { flagEnabled, Flags } from "../utils/flags"; -import { VaultModule } from "../vault/individual-vault/vault.module"; import { TrialInitiationComponent } from "./accounts/trial-initiation/trial-initiation.component"; import { HomeGuard } from "./guards/home.guard"; @@ -46,6 +45,7 @@ import { SponsoredFamiliesComponent } from "./settings/sponsored-families.compon import { SubscriptionRoutingModule } from "./settings/subscription-routing.module"; import { GeneratorComponent } from "./tools/generator.component"; import { ToolsComponent } from "./tools/tools.component"; +import { VaultModule } from "./vault/individual-vault/vault.module"; const routes: Routes = [ { diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts index e13c32d9678..0b05f028036 100644 --- a/apps/web/src/app/oss.module.ts +++ b/apps/web/src/app/oss.module.ts @@ -1,14 +1,14 @@ import { NgModule } from "@angular/core"; import { LoginModule } from "../auth/login/login.module"; -import { OrganizationBadgeModule } from "../vault/individual-vault/organization-badge/organization-badge.module"; -import { VaultFilterModule } from "../vault/individual-vault/vault-filter/vault-filter.module"; import { TrialInitiationModule } from "./accounts/trial-initiation/trial-initiation.module"; import { OrganizationCreateModule } from "./organizations/create/organization-create.module"; import { OrganizationManageModule } from "./organizations/manage/organization-manage.module"; import { OrganizationUserModule } from "./organizations/users/organization-user.module"; import { LooseComponentsModule, SharedModule } from "./shared"; +import { OrganizationBadgeModule } from "./vault/individual-vault/organization-badge/organization-badge.module"; +import { VaultFilterModule } from "./vault/individual-vault/vault-filter/vault-filter.module"; @NgModule({ imports: [ diff --git a/apps/web/src/app/reports/pages/cipher-report.component.ts b/apps/web/src/app/reports/pages/cipher-report.component.ts index 0268a96d40a..4c970e729a0 100644 --- a/apps/web/src/app/reports/pages/cipher-report.component.ts +++ b/apps/web/src/app/reports/pages/cipher-report.component.ts @@ -7,8 +7,8 @@ import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/pa import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -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/shared/report-card/report-card.stories.ts b/apps/web/src/app/reports/shared/report-card/report-card.stories.ts index 88f66ebf324..82c5c4e83b3 100644 --- a/apps/web/src/app/reports/shared/report-card/report-card.stories.ts +++ b/apps/web/src/app/reports/shared/report-card/report-card.stories.ts @@ -4,8 +4,8 @@ import { Meta, Story, moduleMetadata } from "@storybook/angular"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { BadgeModule, IconModule } from "@bitwarden/components"; -import { PremiumBadgeComponent } from "../../../../vault/components/premium-badge.component"; import { PreloadedEnglishI18nModule } from "../../../tests/preloaded-english-i18n.module"; +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.stories.ts b/apps/web/src/app/reports/shared/report-list/report-list.stories.ts index 3be229bfd69..7a092d99d6d 100644 --- a/apps/web/src/app/reports/shared/report-list/report-list.stories.ts +++ b/apps/web/src/app/reports/shared/report-list/report-list.stories.ts @@ -4,8 +4,8 @@ import { Meta, Story, moduleMetadata } from "@storybook/angular"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { BadgeModule, IconModule } from "@bitwarden/components"; -import { PremiumBadgeComponent } from "../../../../vault/components/premium-badge.component"; import { PreloadedEnglishI18nModule } from "../../../tests/preloaded-english-i18n.module"; +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/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index 59847918b47..cc7ae661045 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -1,6 +1,5 @@ import { NgModule } from "@angular/core"; -import { PasswordRepromptComponent } from "../../../src/vault/components/password-reprompt.component"; import { AcceptEmergencyComponent } from "../../auth/accept-emergency.component"; import { AcceptOrganizationComponent } from "../../auth/accept-organization.component"; import { HintComponent } from "../../auth/hint.component"; @@ -34,15 +33,6 @@ 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 { PremiumBadgeComponent } from "../../vault/components/premium-badge.component"; -import { AddEditCustomFieldsComponent } from "../../vault/individual-vault/add-edit-custom-fields.component"; -import { AddEditComponent } from "../../vault/individual-vault/add-edit.component"; -import { AttachmentsComponent } from "../../vault/individual-vault/attachments.component"; -import { CollectionsComponent } from "../../vault/individual-vault/collections.component"; -import { FolderAddEditComponent } from "../../vault/individual-vault/folder-add-edit.component"; -import { ShareComponent } from "../../vault/individual-vault/share.component"; -import { AddEditComponent as OrgAddEditComponent } from "../../vault/org-vault/add-edit.component"; -import { AttachmentsComponent as OrgAttachmentsComponent } from "../../vault/org-vault/attachments.component"; import { DynamicAvatarComponent } from "../components/dynamic-avatar.component"; import { OrganizationSwitcherComponent } from "../components/organization-switcher.component"; import { SelectableAvatarComponent } from "../components/selectable-avatar.component"; @@ -111,6 +101,16 @@ import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.comp import { GeneratorComponent } from "../tools/generator.component"; import { PasswordGeneratorHistoryComponent } from "../tools/password-generator-history.component"; import { ToolsComponent } from "../tools/tools.component"; +import { PasswordRepromptComponent } from "../vault/components/password-reprompt.component"; +import { PremiumBadgeComponent } from "../vault/components/premium-badge.component"; +import { AddEditCustomFieldsComponent } from "../vault/individual-vault/add-edit-custom-fields.component"; +import { AddEditComponent } from "../vault/individual-vault/add-edit.component"; +import { AttachmentsComponent } from "../vault/individual-vault/attachments.component"; +import { CollectionsComponent } from "../vault/individual-vault/collections.component"; +import { FolderAddEditComponent } from "../vault/individual-vault/folder-add-edit.component"; +import { ShareComponent } from "../vault/individual-vault/share.component"; +import { AddEditComponent as OrgAddEditComponent } from "../vault/org-vault/add-edit.component"; +import { AttachmentsComponent as OrgAttachmentsComponent } from "../vault/org-vault/attachments.component"; import { SharedModule } from "./shared.module"; diff --git a/apps/web/src/vault/components/password-reprompt.component.html b/apps/web/src/app/vault/components/password-reprompt.component.html similarity index 100% rename from apps/web/src/vault/components/password-reprompt.component.html rename to apps/web/src/app/vault/components/password-reprompt.component.html diff --git a/apps/web/src/vault/components/password-reprompt.component.ts b/apps/web/src/app/vault/components/password-reprompt.component.ts similarity index 100% rename from apps/web/src/vault/components/password-reprompt.component.ts rename to apps/web/src/app/vault/components/password-reprompt.component.ts diff --git a/apps/web/src/vault/components/premium-badge.component.ts b/apps/web/src/app/vault/components/premium-badge.component.ts similarity index 100% rename from apps/web/src/vault/components/premium-badge.component.ts rename to apps/web/src/app/vault/components/premium-badge.component.ts diff --git a/apps/web/src/vault/components/premium-badge.stories.ts b/apps/web/src/app/vault/components/premium-badge.stories.ts similarity index 100% rename from apps/web/src/vault/components/premium-badge.stories.ts rename to apps/web/src/app/vault/components/premium-badge.stories.ts diff --git a/apps/web/src/vault/core/password-reprompt.service.ts b/apps/web/src/app/vault/core/password-reprompt.service.ts similarity index 100% rename from apps/web/src/vault/core/password-reprompt.service.ts rename to apps/web/src/app/vault/core/password-reprompt.service.ts diff --git a/apps/web/src/vault/individual-vault/add-edit-custom-fields.component.html b/apps/web/src/app/vault/individual-vault/add-edit-custom-fields.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/add-edit-custom-fields.component.html rename to apps/web/src/app/vault/individual-vault/add-edit-custom-fields.component.html diff --git a/apps/web/src/vault/individual-vault/add-edit-custom-fields.component.ts b/apps/web/src/app/vault/individual-vault/add-edit-custom-fields.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/add-edit-custom-fields.component.ts rename to apps/web/src/app/vault/individual-vault/add-edit-custom-fields.component.ts diff --git a/apps/web/src/vault/individual-vault/add-edit.component.html b/apps/web/src/app/vault/individual-vault/add-edit.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/add-edit.component.html rename to apps/web/src/app/vault/individual-vault/add-edit.component.html diff --git a/apps/web/src/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/add-edit.component.ts rename to apps/web/src/app/vault/individual-vault/add-edit.component.ts diff --git a/apps/web/src/vault/individual-vault/attachments.component.html b/apps/web/src/app/vault/individual-vault/attachments.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/attachments.component.html rename to apps/web/src/app/vault/individual-vault/attachments.component.html diff --git a/apps/web/src/vault/individual-vault/attachments.component.ts b/apps/web/src/app/vault/individual-vault/attachments.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/attachments.component.ts rename to apps/web/src/app/vault/individual-vault/attachments.component.ts diff --git a/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html rename to apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html diff --git a/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts rename to apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts diff --git a/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-dialogs.module.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-dialogs.module.ts similarity index 93% rename from apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-dialogs.module.ts rename to apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-dialogs.module.ts index b6e1fb5ce5c..0618025bbfa 100644 --- a/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-dialogs.module.ts +++ b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-dialogs.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../../app/shared"; +import { SharedModule } from "../../../shared"; import { BulkDeleteDialogComponent } from "./bulk-delete-dialog/bulk-delete-dialog.component"; import { BulkMoveDialogComponent } from "./bulk-move-dialog/bulk-move-dialog.component"; diff --git a/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html rename to apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html diff --git a/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts rename to apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts diff --git a/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html rename to apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html diff --git a/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts rename to apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts diff --git a/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html rename to apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html diff --git a/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts rename to apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts diff --git a/apps/web/src/vault/individual-vault/collections.component.html b/apps/web/src/app/vault/individual-vault/collections.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/collections.component.html rename to apps/web/src/app/vault/individual-vault/collections.component.html diff --git a/apps/web/src/vault/individual-vault/collections.component.ts b/apps/web/src/app/vault/individual-vault/collections.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/collections.component.ts rename to apps/web/src/app/vault/individual-vault/collections.component.ts diff --git a/apps/web/src/vault/individual-vault/folder-add-edit.component.html b/apps/web/src/app/vault/individual-vault/folder-add-edit.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/folder-add-edit.component.html rename to apps/web/src/app/vault/individual-vault/folder-add-edit.component.html diff --git a/apps/web/src/vault/individual-vault/folder-add-edit.component.ts b/apps/web/src/app/vault/individual-vault/folder-add-edit.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/folder-add-edit.component.ts rename to apps/web/src/app/vault/individual-vault/folder-add-edit.component.ts diff --git a/apps/web/src/vault/individual-vault/organization-badge/organization-badge.module.ts b/apps/web/src/app/vault/individual-vault/organization-badge/organization-badge.module.ts similarity index 85% rename from apps/web/src/vault/individual-vault/organization-badge/organization-badge.module.ts rename to apps/web/src/app/vault/individual-vault/organization-badge/organization-badge.module.ts index e06ca1862e0..88069740602 100644 --- a/apps/web/src/vault/individual-vault/organization-badge/organization-badge.module.ts +++ b/apps/web/src/app/vault/individual-vault/organization-badge/organization-badge.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../../app/shared"; +import { SharedModule } from "../../../shared"; import { OrganizationNameBadgeComponent } from "./organization-name-badge.component"; diff --git a/apps/web/src/vault/individual-vault/organization-badge/organization-name-badge.component.html b/apps/web/src/app/vault/individual-vault/organization-badge/organization-name-badge.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/organization-badge/organization-name-badge.component.html rename to apps/web/src/app/vault/individual-vault/organization-badge/organization-name-badge.component.html diff --git a/apps/web/src/vault/individual-vault/organization-badge/organization-name-badge.component.ts b/apps/web/src/app/vault/individual-vault/organization-badge/organization-name-badge.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/organization-badge/organization-name-badge.component.ts rename to apps/web/src/app/vault/individual-vault/organization-badge/organization-name-badge.component.ts diff --git a/apps/web/src/vault/individual-vault/pipes/get-collection-name.pipe.ts b/apps/web/src/app/vault/individual-vault/pipes/get-collection-name.pipe.ts similarity index 100% rename from apps/web/src/vault/individual-vault/pipes/get-collection-name.pipe.ts rename to apps/web/src/app/vault/individual-vault/pipes/get-collection-name.pipe.ts diff --git a/apps/web/src/vault/individual-vault/pipes/get-group-name.pipe.ts b/apps/web/src/app/vault/individual-vault/pipes/get-group-name.pipe.ts similarity index 82% rename from apps/web/src/vault/individual-vault/pipes/get-group-name.pipe.ts rename to apps/web/src/app/vault/individual-vault/pipes/get-group-name.pipe.ts index b299ae8670c..fa973468a20 100644 --- a/apps/web/src/vault/individual-vault/pipes/get-group-name.pipe.ts +++ b/apps/web/src/app/vault/individual-vault/pipes/get-group-name.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from "@angular/core"; -import { GroupView } from "../../../app/organizations/core"; +import { GroupView } from "../../../organizations/core"; @Pipe({ name: "groupNameFromId", diff --git a/apps/web/src/vault/individual-vault/pipes/get-organization-name.pipe.ts b/apps/web/src/app/vault/individual-vault/pipes/get-organization-name.pipe.ts similarity index 100% rename from apps/web/src/vault/individual-vault/pipes/get-organization-name.pipe.ts rename to apps/web/src/app/vault/individual-vault/pipes/get-organization-name.pipe.ts diff --git a/apps/web/src/vault/individual-vault/pipes/pipes.module.ts b/apps/web/src/app/vault/individual-vault/pipes/pipes.module.ts similarity index 100% rename from apps/web/src/vault/individual-vault/pipes/pipes.module.ts rename to apps/web/src/app/vault/individual-vault/pipes/pipes.module.ts diff --git a/apps/web/src/vault/individual-vault/share.component.html b/apps/web/src/app/vault/individual-vault/share.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/share.component.html rename to apps/web/src/app/vault/individual-vault/share.component.html diff --git a/apps/web/src/vault/individual-vault/share.component.ts b/apps/web/src/app/vault/individual-vault/share.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/share.component.ts rename to apps/web/src/app/vault/individual-vault/share.component.ts diff --git a/apps/web/src/vault/individual-vault/vault-filter/components/link-sso.component.html b/apps/web/src/app/vault/individual-vault/vault-filter/components/link-sso.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/components/link-sso.component.html rename to apps/web/src/app/vault/individual-vault/vault-filter/components/link-sso.component.html diff --git a/apps/web/src/vault/individual-vault/vault-filter/components/link-sso.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/link-sso.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/components/link-sso.component.ts rename to apps/web/src/app/vault/individual-vault/vault-filter/components/link-sso.component.ts diff --git a/apps/web/src/vault/individual-vault/vault-filter/components/organization-options.component.html b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/components/organization-options.component.html rename to apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.html diff --git a/apps/web/src/vault/individual-vault/vault-filter/components/organization-options.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts similarity index 97% rename from apps/web/src/vault/individual-vault/vault-filter/components/organization-options.component.ts rename to apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts index f287cf7b5d9..e4fdcbf4dd2 100644 --- a/apps/web/src/vault/individual-vault/vault-filter/components/organization-options.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts @@ -15,7 +15,7 @@ import { Organization } from "@bitwarden/common/models/domain/organization"; import { Policy } from "@bitwarden/common/models/domain/policy"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { EnrollMasterPasswordReset } from "../../../../app/organizations/users/enroll-master-password-reset.component"; +import { EnrollMasterPasswordReset } from "../../../../organizations/users/enroll-master-password-reset.component"; import { OptionsInput } from "../shared/components/vault-filter-section.component"; import { OrganizationFilter } from "../shared/models/vault-filter.type"; diff --git a/apps/web/src/vault/individual-vault/vault-filter/components/vault-filter.component.html b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/components/vault-filter.component.html rename to apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.html diff --git a/apps/web/src/vault/individual-vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/components/vault-filter.component.ts rename to apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts diff --git a/apps/web/src/vault/individual-vault/vault-filter/organization-filter/organization-filter.component.html b/apps/web/src/app/vault/individual-vault/vault-filter/organization-filter/organization-filter.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/organization-filter/organization-filter.component.html rename to apps/web/src/app/vault/individual-vault/vault-filter/organization-filter/organization-filter.component.html diff --git a/apps/web/src/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts rename to apps/web/src/app/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts diff --git a/apps/web/src/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts rename to apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts diff --git a/apps/web/src/vault/individual-vault/vault-filter/services/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts similarity index 99% rename from apps/web/src/vault/individual-vault/vault-filter/services/vault-filter.service.ts rename to apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts index 27e3ab918d2..ef040f02ade 100644 --- a/apps/web/src/vault/individual-vault/vault-filter/services/vault-filter.service.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts @@ -24,7 +24,7 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; -import { CollectionAdminView } from "../../../../app/organizations/core"; +import { CollectionAdminView } from "../../../../organizations/core"; import { CipherTypeFilter, CollectionFilter, diff --git a/apps/web/src/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html rename to apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html diff --git a/apps/web/src/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts rename to apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts diff --git a/apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts rename to apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts diff --git a/apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts rename to apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts diff --git a/apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts rename to apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts diff --git a/apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts similarity index 90% rename from apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts rename to apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts index e9fe0d65e1f..60bc6af3e41 100644 --- a/apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts @@ -3,7 +3,7 @@ import { ITreeNodeObject } from "@bitwarden/common/src/models/domain/tree-node"; import { FolderView } from "@bitwarden/common/src/vault/models/view/folder.view"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; -import { CollectionAdminView } from "../../../../../app/organizations/core"; +import { CollectionAdminView } from "../../../../../organizations/core"; export type CipherStatus = "all" | "favorites" | "trash" | CipherType; diff --git a/apps/web/src/vault/individual-vault/vault-filter/shared/vault-filter-shared.module.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/vault-filter-shared.module.ts similarity index 85% rename from apps/web/src/vault/individual-vault/vault-filter/shared/vault-filter-shared.module.ts rename to apps/web/src/app/vault/individual-vault/vault-filter/shared/vault-filter-shared.module.ts index 1893f10b77c..e3fddb1824e 100644 --- a/apps/web/src/vault/individual-vault/vault-filter/shared/vault-filter-shared.module.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/vault-filter-shared.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../../../app/shared"; +import { SharedModule } from "../../../../shared"; import { VaultFilterSectionComponent } from "./components/vault-filter-section.component"; diff --git a/apps/web/src/vault/individual-vault/vault-filter/vault-filter.module.ts b/apps/web/src/app/vault/individual-vault/vault-filter/vault-filter.module.ts similarity index 100% rename from apps/web/src/vault/individual-vault/vault-filter/vault-filter.module.ts rename to apps/web/src/app/vault/individual-vault/vault-filter/vault-filter.module.ts diff --git a/apps/web/src/vault/individual-vault/vault-header/vault-header.component.html b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/vault-header/vault-header.component.html rename to apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html diff --git a/apps/web/src/vault/individual-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts similarity index 100% rename from apps/web/src/vault/individual-vault/vault-header/vault-header.component.ts rename to apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts diff --git a/apps/web/src/vault/individual-vault/vault-items.component.html b/apps/web/src/app/vault/individual-vault/vault-items.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/vault-items.component.html rename to apps/web/src/app/vault/individual-vault/vault-items.component.html diff --git a/apps/web/src/vault/individual-vault/vault-items.component.ts b/apps/web/src/app/vault/individual-vault/vault-items.component.ts similarity index 99% rename from apps/web/src/vault/individual-vault/vault-items.component.ts rename to apps/web/src/app/vault/individual-vault/vault-items.component.ts index 8af86d5b48b..2df96f4c922 100644 --- a/apps/web/src/vault/individual-vault/vault-items.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-items.component.ts @@ -23,7 +23,7 @@ import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService, Icons } from "@bitwarden/components"; -import { CollectionAdminView, GroupView } from "../../app/organizations/core"; +import { CollectionAdminView, GroupView } from "../../organizations/core"; import { BulkDeleteDialogResult, diff --git a/apps/web/src/vault/individual-vault/vault-routing.module.ts b/apps/web/src/app/vault/individual-vault/vault-routing.module.ts similarity index 100% rename from apps/web/src/vault/individual-vault/vault-routing.module.ts rename to apps/web/src/app/vault/individual-vault/vault-routing.module.ts diff --git a/apps/web/src/vault/individual-vault/vault.component.html b/apps/web/src/app/vault/individual-vault/vault.component.html similarity index 100% rename from apps/web/src/vault/individual-vault/vault.component.html rename to apps/web/src/app/vault/individual-vault/vault.component.html diff --git a/apps/web/src/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts similarity index 99% rename from apps/web/src/vault/individual-vault/vault.component.ts rename to apps/web/src/app/vault/individual-vault/vault.component.ts index c8f17f1f5f4..0c1d83d22e6 100644 --- a/apps/web/src/vault/individual-vault/vault.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault.component.ts @@ -28,7 +28,7 @@ import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/pa import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import { UpdateKeyComponent } from "../../app/settings/update-key.component"; +import { UpdateKeyComponent } from "../../settings/update-key.component"; import { AddEditComponent } from "./add-edit.component"; import { AttachmentsComponent } from "./attachments.component"; diff --git a/apps/web/src/vault/individual-vault/vault.module.ts b/apps/web/src/app/vault/individual-vault/vault.module.ts similarity index 94% rename from apps/web/src/vault/individual-vault/vault.module.ts rename to apps/web/src/app/vault/individual-vault/vault.module.ts index 3436a6e9695..97ae44a4617 100644 --- a/apps/web/src/vault/individual-vault/vault.module.ts +++ b/apps/web/src/app/vault/individual-vault/vault.module.ts @@ -2,7 +2,7 @@ import { NgModule } from "@angular/core"; import { BreadcrumbsModule } from "@bitwarden/components"; -import { LooseComponentsModule, SharedModule } from "../../app/shared"; +import { LooseComponentsModule, SharedModule } from "../../shared"; import { CollectionBadgeModule } from "../org-vault/collection-badge/collection-badge.module"; import { GroupBadgeModule } from "../org-vault/group-badge/group-badge.module"; diff --git a/apps/web/src/vault/org-vault/add-edit.component.ts b/apps/web/src/app/vault/org-vault/add-edit.component.ts similarity index 100% rename from apps/web/src/vault/org-vault/add-edit.component.ts rename to apps/web/src/app/vault/org-vault/add-edit.component.ts diff --git a/apps/web/src/vault/org-vault/attachments.component.ts b/apps/web/src/app/vault/org-vault/attachments.component.ts similarity index 100% rename from apps/web/src/vault/org-vault/attachments.component.ts rename to apps/web/src/app/vault/org-vault/attachments.component.ts diff --git a/apps/web/src/vault/org-vault/collection-badge/collection-badge.module.ts b/apps/web/src/app/vault/org-vault/collection-badge/collection-badge.module.ts similarity index 88% rename from apps/web/src/vault/org-vault/collection-badge/collection-badge.module.ts rename to apps/web/src/app/vault/org-vault/collection-badge/collection-badge.module.ts index 0fe8bf337ae..6e29b016a5b 100644 --- a/apps/web/src/vault/org-vault/collection-badge/collection-badge.module.ts +++ b/apps/web/src/app/vault/org-vault/collection-badge/collection-badge.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../../app/shared"; +import { SharedModule } from "../../../shared"; import { PipesModule } from "../../individual-vault/pipes/pipes.module"; import { CollectionNameBadgeComponent } from "./collection-name.badge.component"; diff --git a/apps/web/src/vault/org-vault/collection-badge/collection-name-badge.component.html b/apps/web/src/app/vault/org-vault/collection-badge/collection-name-badge.component.html similarity index 100% rename from apps/web/src/vault/org-vault/collection-badge/collection-name-badge.component.html rename to apps/web/src/app/vault/org-vault/collection-badge/collection-name-badge.component.html diff --git a/apps/web/src/vault/org-vault/collection-badge/collection-name.badge.component.ts b/apps/web/src/app/vault/org-vault/collection-badge/collection-name.badge.component.ts similarity index 100% rename from apps/web/src/vault/org-vault/collection-badge/collection-name.badge.component.ts rename to apps/web/src/app/vault/org-vault/collection-badge/collection-name.badge.component.ts diff --git a/apps/web/src/vault/org-vault/group-badge/group-badge.module.ts b/apps/web/src/app/vault/org-vault/group-badge/group-badge.module.ts similarity index 87% rename from apps/web/src/vault/org-vault/group-badge/group-badge.module.ts rename to apps/web/src/app/vault/org-vault/group-badge/group-badge.module.ts index 67bb1051dc3..5839e7e17b4 100644 --- a/apps/web/src/vault/org-vault/group-badge/group-badge.module.ts +++ b/apps/web/src/app/vault/org-vault/group-badge/group-badge.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../../app/shared"; +import { SharedModule } from "../../../shared"; import { PipesModule } from "../../individual-vault/pipes/pipes.module"; import { GroupNameBadgeComponent } from "./group-name-badge.component"; diff --git a/apps/web/src/vault/org-vault/group-badge/group-name-badge.component.html b/apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.html similarity index 100% rename from apps/web/src/vault/org-vault/group-badge/group-name-badge.component.html rename to apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.html diff --git a/apps/web/src/vault/org-vault/group-badge/group-name-badge.component.ts b/apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.ts similarity index 92% rename from apps/web/src/vault/org-vault/group-badge/group-name-badge.component.ts rename to apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.ts index 09f0213ab28..6a019b3a263 100644 --- a/apps/web/src/vault/org-vault/group-badge/group-name-badge.component.ts +++ b/apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.ts @@ -3,7 +3,7 @@ import { Component, Input, OnChanges } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; -import { GroupView } from "../../../app/organizations/core"; +import { GroupView } from "../../../organizations/core"; @Component({ selector: "app-group-badge", diff --git a/apps/web/src/vault/org-vault/vault-filter/vault-filter.component.ts b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts similarity index 100% rename from apps/web/src/vault/org-vault/vault-filter/vault-filter.component.ts rename to apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts diff --git a/apps/web/src/vault/org-vault/vault-filter/vault-filter.module.ts b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.module.ts similarity index 100% rename from apps/web/src/vault/org-vault/vault-filter/vault-filter.module.ts rename to apps/web/src/app/vault/org-vault/vault-filter/vault-filter.module.ts diff --git a/apps/web/src/vault/org-vault/vault-filter/vault-filter.service.ts b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts similarity index 94% rename from apps/web/src/vault/org-vault/vault-filter/vault-filter.service.ts rename to apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts index 1477ccafbfe..166fcdea641 100644 --- a/apps/web/src/vault/org-vault/vault-filter/vault-filter.service.ts +++ b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts @@ -14,8 +14,8 @@ import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { CollectionAdminView } from "../../../app/organizations/core"; -import { CollectionAdminService } from "../../../app/organizations/core/services/collection-admin.service"; +import { CollectionAdminView } from "../../../organizations/core"; +import { CollectionAdminService } from "../../../organizations/core/services/collection-admin.service"; import { VaultFilterService as BaseVaultFilterService } from "../../individual-vault/vault-filter/services/vault-filter.service"; import { CollectionFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.type"; diff --git a/apps/web/src/vault/org-vault/vault-header/vault-header.component.html b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html similarity index 100% rename from apps/web/src/vault/org-vault/vault-header/vault-header.component.html rename to apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html diff --git a/apps/web/src/vault/org-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts similarity index 99% rename from apps/web/src/vault/org-vault/vault-header/vault-header.component.ts rename to apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts index c92b1fa3b57..a6ddbaa0eb5 100644 --- a/apps/web/src/vault/org-vault/vault-header/vault-header.component.ts +++ b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts @@ -18,12 +18,12 @@ import { SimpleDialogType, } from "@bitwarden/components"; -import { CollectionAdminService, CollectionAdminView } from "../../../app/organizations/core"; +import { CollectionAdminService, CollectionAdminView } from "../../../organizations/core"; import { CollectionDialogResult, CollectionDialogTabType, openCollectionDialog, -} from "../../../app/organizations/shared"; +} from "../../../organizations/shared"; import { VaultFilterService } from "../../individual-vault/vault-filter/services/abstractions/vault-filter.service"; import { VaultFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.model"; import { CollectionFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.type"; diff --git a/apps/web/src/vault/org-vault/vault-items.component.ts b/apps/web/src/app/vault/org-vault/vault-items.component.ts similarity index 97% rename from apps/web/src/vault/org-vault/vault-items.component.ts rename to apps/web/src/app/vault/org-vault/vault-items.component.ts index 398d9d39b19..22718fc1358 100644 --- a/apps/web/src/vault/org-vault/vault-items.component.ts +++ b/apps/web/src/app/vault/org-vault/vault-items.component.ts @@ -20,13 +20,13 @@ import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/pa import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService } from "@bitwarden/components"; -import { CollectionAdminView } from "../../app/organizations/core"; -import { GroupService } from "../../app/organizations/core/services/group/group.service"; +import { CollectionAdminView } from "../../organizations/core"; +import { GroupService } from "../../organizations/core/services/group/group.service"; import { CollectionDialogResult, CollectionDialogTabType, openCollectionDialog, -} from "../../app/organizations/shared/components/collection-dialog/collection-dialog.component"; +} from "../../organizations/shared/components/collection-dialog/collection-dialog.component"; import { BulkDeleteDialogResult, openBulkDeleteDialog, diff --git a/apps/web/src/vault/org-vault/vault-routing.module.ts b/apps/web/src/app/vault/org-vault/vault-routing.module.ts similarity index 85% rename from apps/web/src/vault/org-vault/vault-routing.module.ts rename to apps/web/src/app/vault/org-vault/vault-routing.module.ts index a5a900c9762..12a5a3b9b3c 100644 --- a/apps/web/src/vault/org-vault/vault-routing.module.ts +++ b/apps/web/src/app/vault/org-vault/vault-routing.module.ts @@ -3,7 +3,7 @@ import { RouterModule, Routes } from "@angular/router"; import { canAccessVaultTab } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { OrganizationPermissionsGuard } from "../../app/organizations/guards/org-permissions.guard"; +import { OrganizationPermissionsGuard } from "../../organizations/guards/org-permissions.guard"; import { VaultComponent } from "./vault.component"; const routes: Routes = [ diff --git a/apps/web/src/vault/org-vault/vault.component.html b/apps/web/src/app/vault/org-vault/vault.component.html similarity index 100% rename from apps/web/src/vault/org-vault/vault.component.html rename to apps/web/src/app/vault/org-vault/vault.component.html diff --git a/apps/web/src/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts similarity index 98% rename from apps/web/src/vault/org-vault/vault.component.ts rename to apps/web/src/app/vault/org-vault/vault.component.ts index ab65aea8ae3..c5b574f1ebe 100644 --- a/apps/web/src/vault/org-vault/vault.component.ts +++ b/apps/web/src/app/vault/org-vault/vault.component.ts @@ -24,8 +24,8 @@ import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.serv import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService } from "@bitwarden/components"; -import { EntityEventsComponent } from "../../app/organizations/manage/entity-events.component"; -import { CollectionsComponent } from "../../app/organizations/vault/collections.component"; +import { EntityEventsComponent } from "../../organizations/manage/entity-events.component"; +import { CollectionsComponent } from "../../organizations/vault/collections.component"; import { VaultFilterService } from "../../vault/individual-vault/vault-filter/services/abstractions/vault-filter.service"; import { VaultFilter } from "../../vault/individual-vault/vault-filter/shared/models/vault-filter.model"; diff --git a/apps/web/src/vault/org-vault/vault.module.ts b/apps/web/src/app/vault/org-vault/vault.module.ts similarity index 78% rename from apps/web/src/vault/org-vault/vault.module.ts rename to apps/web/src/app/vault/org-vault/vault.module.ts index 05d7c66f7a4..d50498a937e 100644 --- a/apps/web/src/vault/org-vault/vault.module.ts +++ b/apps/web/src/app/vault/org-vault/vault.module.ts @@ -2,11 +2,8 @@ import { NgModule } from "@angular/core"; import { BreadcrumbsModule } from "@bitwarden/components"; -// TODO refine elsint rule for **/app/shared/* for both of these imports -// eslint-disable-next-line no-restricted-imports -import { LooseComponentsModule } from "../../app/shared/loose-components.module"; -// eslint-disable-next-line no-restricted-imports -import { SharedModule } from "../../app/shared/shared.module"; +import { LooseComponentsModule } from "../../shared/loose-components.module"; +import { SharedModule } from "../../shared/shared.module"; import { OrganizationBadgeModule } from "../../vault/individual-vault/organization-badge/organization-badge.module"; import { PipesModule } from "../../vault/individual-vault/pipes/pipes.module"; diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts index 56748eb5f8d..05c7b6c577c 100644 --- a/apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts @@ -13,7 +13,7 @@ import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.v @Component({ selector: "emergency-access-attachments", - templateUrl: "../../../vault/individual-vault/attachments.component.html", + templateUrl: "../../../app/vault/individual-vault/attachments.component.html", }) export class EmergencyAccessAttachmentsComponent extends BaseAttachmentsComponent { viewOnly = true; diff --git a/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts index 0adb78d4cd8..7684e3a0d11 100644 --- a/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts @@ -17,11 +17,11 @@ import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folde import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; -import { AddEditComponent as BaseAddEditComponent } from "../../../vault/individual-vault/add-edit.component"; +import { AddEditComponent as BaseAddEditComponent } from "../../../app/vault/individual-vault/add-edit.component"; @Component({ selector: "app-org-vault-add-edit", - templateUrl: "../../../vault/individual-vault/add-edit.component.html", + templateUrl: "../../../app/vault/individual-vault/add-edit.component.html", }) export class EmergencyAddEditComponent extends BaseAddEditComponent { originalCipher: Cipher = null;