diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts index f3b9e0818db..dc57fd53c07 100644 --- a/apps/desktop/src/app/app.module.ts +++ b/apps/desktop/src/app/app.module.ts @@ -46,8 +46,6 @@ import { HeaderComponent } from "./layout/header.component"; import { NavComponent } from "./layout/nav.component"; import { SearchComponent } from "./layout/search/search.component"; import { SharedModule } from "./shared/shared.module"; -import { AddEditComponent as SendAddEditComponent } from "./tools/send/add-edit.component"; -import { SendComponent } from "./tools/send/send.component"; @NgModule({ imports: [ @@ -60,6 +58,7 @@ import { SendComponent } from "./tools/send/send.component"; DeleteAccountComponent, UserVerificationComponent, DecryptionFailureDialogComponent, + NavComponent, ], declarations: [ AccessibilityCookieComponent, @@ -76,13 +75,10 @@ import { SendComponent } from "./tools/send/send.component"; FolderAddEditComponent, HeaderComponent, HintComponent, - NavComponent, PasswordHistoryComponent, PremiumComponent, RemovePasswordComponent, SearchComponent, - SendAddEditComponent, - SendComponent, SetPasswordComponent, SettingsComponent, ShareComponent, diff --git a/apps/desktop/src/app/layout/nav.component.ts b/apps/desktop/src/app/layout/nav.component.ts index 2b413cbc48c..dff35ec12c3 100644 --- a/apps/desktop/src/app/layout/nav.component.ts +++ b/apps/desktop/src/app/layout/nav.component.ts @@ -1,10 +1,14 @@ +import { CommonModule } from "@angular/common"; import { Component } from "@angular/core"; +import { RouterLink, RouterLinkActive } from "@angular/router"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @Component({ selector: "app-nav", templateUrl: "nav.component.html", + standalone: true, + imports: [CommonModule, RouterLink, RouterLinkActive], }) export class NavComponent { items: any[] = [ diff --git a/apps/desktop/src/app/tools/send/add-edit.component.ts b/apps/desktop/src/app/tools/send/add-edit.component.ts index 7c272ac94a7..c0db3934259 100644 --- a/apps/desktop/src/app/tools/send/add-edit.component.ts +++ b/apps/desktop/src/app/tools/send/add-edit.component.ts @@ -1,9 +1,10 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore -import { DatePipe } from "@angular/common"; +import { CommonModule, DatePipe } from "@angular/common"; import { Component } from "@angular/core"; -import { FormBuilder } from "@angular/forms"; +import { FormBuilder, ReactiveFormsModule } from "@angular/forms"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/tools/send/add-edit.component"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -16,11 +17,13 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; -import { DialogService, ToastService } from "@bitwarden/components"; +import { CalloutModule, DialogService, ToastService } from "@bitwarden/components"; @Component({ selector: "app-send-add-edit", templateUrl: "add-edit.component.html", + standalone: true, + imports: [CommonModule, JslibModule, ReactiveFormsModule, CalloutModule], }) export class AddEditComponent extends BaseAddEditComponent { constructor( diff --git a/apps/desktop/src/app/tools/send/send.component.ts b/apps/desktop/src/app/tools/send/send.component.ts index d8b63e9d97c..cc3007ae133 100644 --- a/apps/desktop/src/app/tools/send/send.component.ts +++ b/apps/desktop/src/app/tools/send/send.component.ts @@ -1,7 +1,10 @@ // FIXME: Update this file to be type safe and remove this and next line // @ts-strict-ignore +import { CommonModule } from "@angular/common"; import { Component, NgZone, OnDestroy, OnInit, ViewChild } from "@angular/core"; +import { FormsModule } from "@angular/forms"; +import { JslibModule } from "@bitwarden/angular/jslib.module"; import { SendComponent as BaseSendComponent } from "@bitwarden/angular/tools/send/send.component"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; @@ -17,6 +20,7 @@ import { SendService } from "@bitwarden/common/tools/send/services/send.service. import { DialogService, ToastService } from "@bitwarden/components"; import { invokeMenu, RendererMenuItem } from "../../../utils"; +import { NavComponent } from "../../layout/nav.component"; import { SearchBarService } from "../../layout/search/search-bar.service"; import { AddEditComponent } from "./add-edit.component"; @@ -32,6 +36,8 @@ const BroadcasterSubscriptionId = "SendComponent"; @Component({ selector: "app-send", templateUrl: "send.component.html", + standalone: true, + imports: [CommonModule, JslibModule, FormsModule, NavComponent, AddEditComponent], }) export class SendComponent extends BaseSendComponent implements OnInit, OnDestroy { @ViewChild(AddEditComponent) addEditComponent: AddEditComponent;