From 8385b4e89fa0fc3204532adda9d085d9c0fd7996 Mon Sep 17 00:00:00 2001 From: Mo Date: Thu, 4 May 2023 05:52:42 -0500 Subject: [PATCH] fix: workspace names now default to account email after signing in. It can later be changed from the workspace switcher menu. --- .../src/Domain/Application/ApplicationInterface.ts | 2 ++ packages/snjs/lib/ApplicationGroup/ApplicationGroup.ts | 8 ++++++++ packages/web/src/javascripts/App.tsx | 6 +++--- .../{Application.spec.ts => WebApplication.spec.ts} | 2 +- .../Application/{Application.ts => WebApplication.ts} | 0 .../{ApplicationGroup.ts => WebApplicationGroup.ts} | 4 ++-- .../src/javascripts/Components/Abstract/PureComponent.tsx | 2 +- .../javascripts/Components/AccountMenu/AccountMenu.tsx | 6 +++--- .../Components/AccountMenu/AdvancedOptions.tsx | 2 +- .../Components/AccountMenu/ConfirmPassword.tsx | 2 +- .../javascripts/Components/AccountMenu/CreateAccount.tsx | 2 +- .../Components/AccountMenu/GeneralAccountMenu.tsx | 6 +++--- .../Components/AccountMenu/MenuPaneSelector.tsx | 6 +++--- .../web/src/javascripts/Components/AccountMenu/SignIn.tsx | 2 +- .../web/src/javascripts/Components/AccountMenu/User.tsx | 2 +- .../WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx | 4 ++-- .../WorkspaceSwitcher/WorkspaceSwitcherOption.tsx | 4 ++-- .../ApplicationGroupView/ApplicationGroupView.tsx | 8 ++++---- .../src/javascripts/Components/ApplicationProvider.tsx | 2 +- .../Components/ApplicationView/ApplicationView.tsx | 6 +++--- .../Components/ChallengeModal/BiometricsPrompt.tsx | 2 +- .../Components/ChallengeModal/ChallengeModal.tsx | 6 +++--- .../Components/ChallengeModal/ChallengePrompt.tsx | 2 +- .../ChallengeModal/LockscreenWorkspaceSwitcher.tsx | 4 ++-- .../javascripts/Components/ChallengeModal/U2FPrompt.tsx | 2 +- .../Components/ChangeEditor/ChangeEditorMenu.tsx | 2 +- .../Components/ChangeEditor/ChangeMultipleButton.tsx | 2 +- .../Components/ChangeEditor/ChangeMultipleMenu.tsx | 2 +- .../javascripts/Components/ClipperView/ClipperView.tsx | 4 ++-- .../Components/ComponentView/ComponentView.tsx | 2 +- .../ConfirmDeleteAccountModal.tsx | 2 +- .../ConfirmSignoutModal/ConfirmSignoutModal.tsx | 6 +++--- .../Components/ContentListView/ContentList.tsx | 2 +- .../Components/ContentListView/ContentListView.tsx | 2 +- .../ContentListView/Header/ContentListHeader.tsx | 2 +- .../ContentListView/Header/DisplayOptionsMenuProps.tsx | 2 +- .../ContentListView/Header/NewNotePreferences.tsx | 2 +- .../ContentListView/Types/AbstractListItemProps.ts | 2 +- .../Components/ContentTableView/ContentTableView.tsx | 2 +- .../Components/DarkModeHandler/DarkModeHandler.tsx | 2 +- .../Components/DeallocateHandler/DeallocateHandler.tsx | 2 +- .../src/javascripts/Components/FileDragNDropProvider.tsx | 2 +- .../javascripts/Components/FilePreview/FilePreview.tsx | 2 +- .../Components/FilePreview/FilePreviewModal.tsx | 2 +- .../Components/FilePreview/PreviewComponent.tsx | 2 +- .../src/javascripts/Components/FileView/FileViewProps.tsx | 2 +- packages/web/src/javascripts/Components/Footer/Footer.tsx | 6 +++--- .../javascripts/Components/Footer/QuickSettingsButton.tsx | 2 +- .../web/src/javascripts/Components/Footer/UpgradeNow.tsx | 2 +- .../MultipleSelectedNotes/MultipleSelectedNotes.tsx | 2 +- .../NoSubscriptionBanner/NoSubscriptionBanner.tsx | 2 +- .../javascripts/Components/NoteGroupView/EditorPane.tsx | 2 +- .../Components/NoteGroupView/NoteGroupView.tsx | 2 +- .../Components/NoteView/Controller/ItemGroupController.ts | 2 +- .../NoteView/Controller/NoteViewController.spec.ts | 2 +- .../Components/NoteView/Controller/NoteViewController.ts | 2 +- .../src/javascripts/Components/NoteView/NoteView.test.ts | 2 +- .../src/javascripts/Components/NoteView/NoteViewProps.ts | 2 +- .../Components/NoteView/PlainEditor/PlainEditor.tsx | 2 +- .../Components/NotesOptions/ChangeEditorOption.tsx | 2 +- .../Components/NotesOptions/Listed/ListedActionsMenu.tsx | 2 +- .../NotesOptions/Listed/ListedActionsOption.tsx | 2 +- .../Components/NotesOptions/Listed/ListedMenuItem.tsx | 2 +- .../OtherSessionsSignOut/OtherSessionsSignOut.tsx | 2 +- .../Components/PasswordWizard/PasswordWizard.tsx | 2 +- .../PermissionsModal/PermissionsModalWrapper.tsx | 2 +- .../Preferences/Panes/Account/AccountPreferences.tsx | 2 +- .../Preferences/Panes/Account/Authentication.tsx | 2 +- .../Preferences/Panes/Account/ChangeEmail/ChangeEmail.tsx | 2 +- .../Components/Preferences/Panes/Account/Credentials.tsx | 2 +- .../Preferences/Panes/Account/DeleteAccount.tsx | 2 +- .../Components/Preferences/Panes/Account/Email/Email.tsx | 2 +- .../Components/Preferences/Panes/Account/Files.tsx | 2 +- .../Preferences/Panes/Account/NoProSubscription.tsx | 2 +- .../Components/Preferences/Panes/Account/SignOutView.tsx | 2 +- .../Panes/Account/Subscription/NoSubscription.tsx | 2 +- .../Panes/Account/Subscription/Subscription.tsx | 2 +- .../Account/Subscription/SubscriptionInformation.tsx | 2 +- .../Panes/Account/SubscriptionSharing/InvitationsList.tsx | 2 +- .../Panes/Account/SubscriptionSharing/Invite/Invite.tsx | 2 +- .../Account/SubscriptionSharing/SubscriptionSharing.tsx | 2 +- .../Components/Preferences/Panes/Account/Sync.tsx | 2 +- .../Components/Preferences/Panes/Appearance.tsx | 2 +- .../Preferences/Panes/Appearance/EditorAppearance.tsx | 2 +- .../Components/Preferences/Panes/Backups/Backups.tsx | 2 +- .../Components/Preferences/Panes/Backups/DataBackups.tsx | 2 +- .../Components/Preferences/Panes/Backups/EmailBackups.tsx | 2 +- .../Preferences/Panes/Backups/Files/BackupsDropZone.tsx | 2 +- .../Panes/Backups/Files/FileBackupsCrossPlatform.tsx | 2 +- .../Backups/TextBackups/TextBackupsCrossPlatform.tsx | 2 +- .../Panes/General/Advanced/AdvancedSection.tsx | 2 +- .../Panes/General/Advanced/OfflineSubscription.tsx | 2 +- .../Panes/General/Advanced/Packages/PackageEntry.tsx | 2 +- .../General/Advanced/Packages/Provider/PackageProvider.ts | 2 +- .../Panes/General/Advanced/Packages/Section.tsx | 2 +- .../Components/Preferences/Panes/General/Defaults.tsx | 2 +- .../Components/Preferences/Panes/General/General.tsx | 2 +- .../Components/Preferences/Panes/General/Labs/Labs.tsx | 2 +- .../Components/Preferences/Panes/General/Moments.tsx | 2 +- .../Components/Preferences/Panes/General/Persistence.tsx | 2 +- .../General/SmartViews/EditSmartViewModalController.tsx | 2 +- .../Preferences/Panes/General/SmartViews/SmartViews.tsx | 2 +- .../Components/Preferences/Panes/General/Tools.tsx | 2 +- .../Components/Preferences/Panes/HelpFeedback.tsx | 2 +- .../Components/Preferences/Panes/Listed/Listed.tsx | 2 +- .../Preferences/Panes/Listed/ListedAccountItem.tsx | 2 +- .../Preferences/Panes/Security/BiometricsLock.tsx | 2 +- .../Preferences/Panes/Security/MultitaskingPrivacy.tsx | 2 +- .../Preferences/Panes/Security/PasscodeLock.tsx | 2 +- .../Components/Preferences/Panes/Security/Privacy.tsx | 2 +- .../Components/Preferences/Panes/Security/Protections.tsx | 2 +- .../Components/Preferences/Panes/Security/Security.tsx | 2 +- .../Preferences/Panes/Security/TwoFactorAuth/MfaProps.ts | 2 +- .../TwoFactorAuth/TwoFactorAuthView/TwoFactorAuthView.tsx | 2 +- .../Components/Preferences/Panes/Security/U2F/U2FProps.ts | 2 +- .../Panes/Security/U2F/U2FView/U2FDevicesList.tsx | 2 +- .../Preferences/Panes/Security/U2F/U2FView/U2FView.tsx | 2 +- .../Preferences/Panes/Security/securityPrefsHasBubble.tsx | 2 +- .../Components/Preferences/Panes/WhatsNew/WhatsNew.tsx | 2 +- .../javascripts/Components/Preferences/PreferencesMenu.ts | 2 +- .../Components/Preferences/PreferencesProps.tsx | 2 +- .../Preferences/PreferencesViewWrapperProps.tsx | 2 +- .../PremiumFeaturesModal/PremiumFeaturesModal.tsx | 2 +- .../PremiumFeaturesModal/Subviews/UpgradePrompt.tsx | 2 +- .../Components/PurchaseFlow/Panes/CreateAccount.tsx | 2 +- .../javascripts/Components/PurchaseFlow/Panes/SignIn.tsx | 2 +- .../Components/PurchaseFlow/PurchaseFlowFunctions.ts | 2 +- .../Components/PurchaseFlow/PurchaseFlowView.tsx | 2 +- .../Components/PurchaseFlow/PurchaseFlowWrapperProps.tsx | 2 +- .../Components/QuickSettingsMenu/FocusModeSwitch.tsx | 2 +- .../Components/QuickSettingsMenu/QuickSettingsMenu.tsx | 2 +- .../Components/QuickSettingsMenu/ThemesMenuButton.tsx | 2 +- .../Components/RecoveryCodeBanner/RecoveryCodeBanner.tsx | 2 +- .../RevisionHistoryModal/HistoryModalContentPane.tsx | 2 +- .../RevisionHistoryModal/RevisionHistoryModalProps.tsx | 2 +- .../RevisionHistoryModal/SelectedRevisionContent.tsx | 2 +- .../Components/SessionsModal/SessionsModal.tsx | 2 +- .../SmartViewBuilder/AddSmartViewModalController.ts | 2 +- .../javascripts/Components/SuperEditor/SuperEditor.tsx | 2 +- .../Components/SuperEditor/SuperNoteImporter.tsx | 2 +- .../Components/SyncResolutionMenu/SyncResolutionMenu.tsx | 2 +- .../web/src/javascripts/Components/Tags/Navigation.tsx | 2 +- .../src/javascripts/Components/Tags/SmartViewsSection.tsx | 2 +- .../Controllers/Abstract/AbstractViewController.ts | 2 +- .../Controllers/Abstract/PersistenceService.ts | 2 +- .../Controllers/AccountMenu/AccountMenuController.ts | 2 +- .../web/src/javascripts/Controllers/FeaturesController.ts | 2 +- .../javascripts/Controllers/FilePreviewModalController.ts | 2 +- .../web/src/javascripts/Controllers/FilesController.ts | 2 +- .../src/javascripts/Controllers/ImportModalController.ts | 2 +- .../Controllers/ItemList/ItemListController.spec.ts | 2 +- .../Controllers/ItemList/ItemListController.ts | 2 +- .../src/javascripts/Controllers/LinkingController.spec.ts | 2 +- .../web/src/javascripts/Controllers/LinkingController.tsx | 2 +- .../src/javascripts/Controllers/Moments/MomentsService.ts | 2 +- .../Controllers/Navigation/NavigationController.ts | 2 +- .../javascripts/Controllers/NoAccountWarningController.ts | 2 +- .../Controllers/NoteHistory/HistoryModalController.ts | 2 +- .../Controllers/NoteHistory/NoteHistoryController.ts | 2 +- .../web/src/javascripts/Controllers/NoteSyncController.ts | 2 +- .../Controllers/NotesController/NotesController.ts | 2 +- .../Controllers/PaneController/PaneController.ts | 2 +- .../Controllers/PaneController/panesForLayout.ts | 2 +- .../src/javascripts/Controllers/PreferencesController.ts | 2 +- .../Controllers/PurchaseFlow/PurchaseFlowController.ts | 2 +- .../javascripts/Controllers/QuickSettingsController.ts | 2 +- .../javascripts/Controllers/SearchOptionsController.ts | 2 +- .../javascripts/Controllers/SelectedItemsController.ts | 2 +- .../Controllers/Subscription/SubscriptionController.ts | 2 +- .../src/javascripts/Controllers/ViewControllerManager.ts | 2 +- .../javascripts/Event/ApplicationEventObserver.spec.ts | 2 +- .../web/src/javascripts/Event/ApplicationEventObserver.ts | 2 +- .../src/javascripts/Hooks/useIsTabletOrMobileScreen.tsx | 2 +- packages/web/src/javascripts/Hooks/usePremiumModal.tsx | 2 +- .../javascripts/NativeMobileWeb/DownloadBlobOnAndroid.tsx | 2 +- .../NativeMobileWeb/DownloadSelectedNotesOnAndroid.tsx | 2 +- .../src/javascripts/NativeMobileWeb/ShareBlobOnMobile.ts | 2 +- .../javascripts/NativeMobileWeb/ShareSelectedNotes.tsx | 2 +- .../javascripts/NativeMobileWeb/useAndroidBackHandler.tsx | 2 +- .../javascripts/Utils/DownloadOrShareBasedOnPlatform.ts | 2 +- packages/web/src/javascripts/Utils/DragTypeCheck.ts | 2 +- .../web/src/javascripts/Utils/DropdownItemsForEditors.ts | 2 +- packages/web/src/javascripts/Utils/NoteExportUtils.ts | 2 +- .../web/src/javascripts/Utils/createEditorMenuGroups.ts | 2 +- 184 files changed, 215 insertions(+), 205 deletions(-) rename packages/web/src/javascripts/Application/{Application.spec.ts => WebApplication.spec.ts} (97%) rename packages/web/src/javascripts/Application/{Application.ts => WebApplication.ts} (100%) rename packages/web/src/javascripts/Application/{ApplicationGroup.ts => WebApplicationGroup.ts} (91%) diff --git a/packages/services/src/Domain/Application/ApplicationInterface.ts b/packages/services/src/Domain/Application/ApplicationInterface.ts index 2ff20ca42..3a8f4ce83 100644 --- a/packages/services/src/Domain/Application/ApplicationInterface.ts +++ b/packages/services/src/Domain/Application/ApplicationInterface.ts @@ -16,6 +16,7 @@ import { StorageValueModes } from '../Storage/StorageTypes' import { DeinitMode } from './DeinitMode' import { DeinitSource } from './DeinitSource' import { UserClientInterface } from '../User/UserClientInterface' +import { SessionsClientInterface } from '../Session/SessionsClientInterface' export interface ApplicationInterface { deinit(mode: DeinitMode, source: DeinitSource): void @@ -51,6 +52,7 @@ export interface ApplicationInterface { get files(): FilesClientInterface get subscriptions(): SubscriptionClientInterface get fileBackups(): BackupServiceInterface | undefined + get sessions(): SessionsClientInterface readonly identifier: ApplicationIdentifier readonly platform: Platform deviceInterface: DeviceInterface diff --git a/packages/snjs/lib/ApplicationGroup/ApplicationGroup.ts b/packages/snjs/lib/ApplicationGroup/ApplicationGroup.ts index 05ca51e6c..9d981997a 100644 --- a/packages/snjs/lib/ApplicationGroup/ApplicationGroup.ts +++ b/packages/snjs/lib/ApplicationGroup/ApplicationGroup.ts @@ -8,6 +8,7 @@ import { InternalEventBus, InternalEventBusInterface, RawStorageKey, + ApplicationEvent, } from '@standardnotes/services' import { UuidGenerator } from '@standardnotes/utils' import { AppGroupCallback } from './AppGroupCallback' @@ -72,6 +73,13 @@ export class SNApplicationGroup ext this.primaryApplication = application + application.addEventObserver(async () => { + this.renameDescriptor( + primaryDescriptor as ApplicationDescriptor, + application.sessions.getWorkspaceDisplayIdentifier(), + ) + }, ApplicationEvent.SignedIn) + await this.notifyEvent(ApplicationGroupEvent.PrimaryApplicationSet, { application: application }) } diff --git a/packages/web/src/javascripts/App.tsx b/packages/web/src/javascripts/App.tsx index 6044f82ec..6122ccb21 100644 --- a/packages/web/src/javascripts/App.tsx +++ b/packages/web/src/javascripts/App.tsx @@ -19,7 +19,7 @@ declare global { platform?: Platform application?: WebApplication - mainApplicationGroup?: ApplicationGroup + mainApplicationGroup?: WebApplicationGroup MSStream?: unknown } } @@ -30,9 +30,9 @@ import { DesktopManagerInterface, Platform, SNLog } from '@standardnotes/snjs' import ApplicationGroupView from './Components/ApplicationGroupView/ApplicationGroupView' import { WebDevice } from './Application/Device/WebDevice' import { StartApplication } from './Application/Device/StartApplication' -import { ApplicationGroup } from './Application/ApplicationGroup' +import { WebApplicationGroup } from './Application/WebApplicationGroup' import { WebOrDesktopDevice } from './Application/Device/WebOrDesktopDevice' -import { WebApplication } from './Application/Application' +import { WebApplication } from './Application/WebApplication' import { createRoot, Root } from 'react-dom/client' import { ElementIds } from './Constants/ElementIDs' import { setDefaultMonospaceFont } from './setDefaultMonospaceFont' diff --git a/packages/web/src/javascripts/Application/Application.spec.ts b/packages/web/src/javascripts/Application/WebApplication.spec.ts similarity index 97% rename from packages/web/src/javascripts/Application/Application.spec.ts rename to packages/web/src/javascripts/Application/WebApplication.spec.ts index e4236ca29..a42c18041 100644 --- a/packages/web/src/javascripts/Application/Application.spec.ts +++ b/packages/web/src/javascripts/Application/WebApplication.spec.ts @@ -13,7 +13,7 @@ import { SNLog, SNTag, } from '@standardnotes/snjs' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { WebOrDesktopDevice } from './Device/WebOrDesktopDevice' describe('web application', () => { diff --git a/packages/web/src/javascripts/Application/Application.ts b/packages/web/src/javascripts/Application/WebApplication.ts similarity index 100% rename from packages/web/src/javascripts/Application/Application.ts rename to packages/web/src/javascripts/Application/WebApplication.ts diff --git a/packages/web/src/javascripts/Application/ApplicationGroup.ts b/packages/web/src/javascripts/Application/WebApplicationGroup.ts similarity index 91% rename from packages/web/src/javascripts/Application/ApplicationGroup.ts rename to packages/web/src/javascripts/Application/WebApplicationGroup.ts index 9a2430913..0c1500bb9 100644 --- a/packages/web/src/javascripts/Application/ApplicationGroup.ts +++ b/packages/web/src/javascripts/Application/WebApplicationGroup.ts @@ -1,4 +1,4 @@ -import { WebApplication } from './Application' +import { WebApplication } from './WebApplication' import { ApplicationDescriptor, SNApplicationGroup } from '@standardnotes/snjs' import { getPlatform, isDesktopApplication } from '@/Utils' import { WebOrDesktopDevice } from '@/Application/Device/WebOrDesktopDevice' @@ -23,7 +23,7 @@ const createApplication = ( return application } -export class ApplicationGroup extends SNApplicationGroup { +export class WebApplicationGroup extends SNApplicationGroup { constructor(private defaultSyncServerHost: string, device: WebOrDesktopDevice, private webSocketUrl: string) { super(device) } diff --git a/packages/web/src/javascripts/Components/Abstract/PureComponent.tsx b/packages/web/src/javascripts/Components/Abstract/PureComponent.tsx index 8d31e9fe7..9097e855a 100644 --- a/packages/web/src/javascripts/Components/Abstract/PureComponent.tsx +++ b/packages/web/src/javascripts/Components/Abstract/PureComponent.tsx @@ -1,5 +1,5 @@ import { ApplicationEvent } from '@standardnotes/snjs' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { autorun, IReactionDisposer, IReactionPublic } from 'mobx' import { Component } from 'react' diff --git a/packages/web/src/javascripts/Components/AccountMenu/AccountMenu.tsx b/packages/web/src/javascripts/Components/AccountMenu/AccountMenu.tsx index 99f8f6134..ec513a105 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/AccountMenu.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/AccountMenu.tsx @@ -1,8 +1,8 @@ import { observer } from 'mobx-react-lite' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { useCallback, FunctionComponent, KeyboardEventHandler } from 'react' -import { ApplicationGroup } from '@/Application/ApplicationGroup' +import { WebApplicationGroup } from '@/Application/WebApplicationGroup' import { AccountMenuPane } from './AccountMenuPane' import MenuPaneSelector from './MenuPaneSelector' import { KeyboardKey } from '@standardnotes/ui-services' @@ -11,7 +11,7 @@ export type AccountMenuProps = { viewControllerManager: ViewControllerManager application: WebApplication onClickOutside: () => void - mainApplicationGroup: ApplicationGroup + mainApplicationGroup: WebApplicationGroup } const AccountMenu: FunctionComponent = ({ diff --git a/packages/web/src/javascripts/Components/AccountMenu/AdvancedOptions.tsx b/packages/web/src/javascripts/Components/AccountMenu/AdvancedOptions.tsx index 57748d479..e6241bfcf 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/AdvancedOptions.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/AdvancedOptions.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { observer } from 'mobx-react-lite' import { ChangeEventHandler, FunctionComponent, ReactNode, useCallback, useEffect, useState } from 'react' diff --git a/packages/web/src/javascripts/Components/AccountMenu/ConfirmPassword.tsx b/packages/web/src/javascripts/Components/AccountMenu/ConfirmPassword.tsx index bf4162ad8..ce29b651c 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/ConfirmPassword.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/ConfirmPassword.tsx @@ -1,5 +1,5 @@ import { STRING_NON_MATCHING_PASSWORDS } from '@/Constants/Strings' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { observer } from 'mobx-react-lite' import { diff --git a/packages/web/src/javascripts/Components/AccountMenu/CreateAccount.tsx b/packages/web/src/javascripts/Components/AccountMenu/CreateAccount.tsx index 2bf1f4bc9..9db1eb895 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/CreateAccount.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/CreateAccount.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { observer } from 'mobx-react-lite' import { diff --git a/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx b/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx index d1581ba63..2811ea111 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { observer } from 'mobx-react-lite' import Icon from '@/Components/Icon/Icon' @@ -10,7 +10,7 @@ import Menu from '@/Components/Menu/Menu' import MenuItem from '@/Components/Menu/MenuItem' import MenuItemSeparator from '@/Components/Menu/MenuItemSeparator' import WorkspaceSwitcherOption from './WorkspaceSwitcher/WorkspaceSwitcherOption' -import { ApplicationGroup } from '@/Application/ApplicationGroup' +import { WebApplicationGroup } from '@/Application/WebApplicationGroup' import { formatLastSyncDate } from '@/Utils/DateUtils' import Spinner from '@/Components/Spinner/Spinner' import { MenuItemIconSize } from '@/Constants/TailwindClassNames' @@ -18,7 +18,7 @@ import { MenuItemIconSize } from '@/Constants/TailwindClassNames' type Props = { viewControllerManager: ViewControllerManager application: WebApplication - mainApplicationGroup: ApplicationGroup + mainApplicationGroup: WebApplicationGroup setMenuPane: (pane: AccountMenuPane) => void closeMenu: () => void } diff --git a/packages/web/src/javascripts/Components/AccountMenu/MenuPaneSelector.tsx b/packages/web/src/javascripts/Components/AccountMenu/MenuPaneSelector.tsx index 4f05dd120..06a586afa 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/MenuPaneSelector.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/MenuPaneSelector.tsx @@ -1,5 +1,5 @@ -import { WebApplication } from '@/Application/Application' -import { ApplicationGroup } from '@/Application/ApplicationGroup' +import { WebApplication } from '@/Application/WebApplication' +import { WebApplicationGroup } from '@/Application/WebApplicationGroup' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { observer } from 'mobx-react-lite' import { FunctionComponent, useState } from 'react' @@ -12,7 +12,7 @@ import SignInPane from './SignIn' type Props = { viewControllerManager: ViewControllerManager application: WebApplication - mainApplicationGroup: ApplicationGroup + mainApplicationGroup: WebApplicationGroup menuPane: AccountMenuPane setMenuPane: (pane: AccountMenuPane) => void closeMenu: () => void diff --git a/packages/web/src/javascripts/Components/AccountMenu/SignIn.tsx b/packages/web/src/javascripts/Components/AccountMenu/SignIn.tsx index 3d41df18a..0ed7b92e5 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/SignIn.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/SignIn.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { isDev } from '@/Utils' import { observer } from 'mobx-react-lite' diff --git a/packages/web/src/javascripts/Components/AccountMenu/User.tsx b/packages/web/src/javascripts/Components/AccountMenu/User.tsx index 0b8a27e90..7a7310f71 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/User.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/User.tsx @@ -1,6 +1,6 @@ import { observer } from 'mobx-react-lite' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { User as UserType } from '@standardnotes/snjs' type Props = { diff --git a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx index e6f3e791d..f65171bce 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx @@ -1,4 +1,4 @@ -import { ApplicationGroup } from '@/Application/ApplicationGroup' +import { WebApplicationGroup } from '@/Application/WebApplicationGroup' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { ApplicationDescriptor, ApplicationGroupEvent, ButtonType } from '@standardnotes/snjs' import { observer } from 'mobx-react-lite' @@ -10,7 +10,7 @@ import MenuItemSeparator from '@/Components/Menu/MenuItemSeparator' import WorkspaceMenuItem from './WorkspaceMenuItem' type Props = { - mainApplicationGroup: ApplicationGroup + mainApplicationGroup: WebApplicationGroup viewControllerManager: ViewControllerManager isOpen: boolean hideWorkspaceOptions?: boolean diff --git a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx index 44fc47645..6c5e7f15c 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx @@ -1,5 +1,5 @@ import { FOCUSABLE_BUT_NOT_TABBABLE } from '@/Constants/Constants' -import { ApplicationGroup } from '@/Application/ApplicationGroup' +import { WebApplicationGroup } from '@/Application/WebApplicationGroup' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { observer } from 'mobx-react-lite' import { FunctionComponent, useCallback, useRef, useState } from 'react' @@ -10,7 +10,7 @@ import Popover from '@/Components/Popover/Popover' import { MenuItemIconSize } from '@/Constants/TailwindClassNames' type Props = { - mainApplicationGroup: ApplicationGroup + mainApplicationGroup: WebApplicationGroup viewControllerManager: ViewControllerManager } diff --git a/packages/web/src/javascripts/Components/ApplicationGroupView/ApplicationGroupView.tsx b/packages/web/src/javascripts/Components/ApplicationGroupView/ApplicationGroupView.tsx index 019b22cda..ec4df3941 100644 --- a/packages/web/src/javascripts/Components/ApplicationGroupView/ApplicationGroupView.tsx +++ b/packages/web/src/javascripts/Components/ApplicationGroupView/ApplicationGroupView.tsx @@ -1,5 +1,5 @@ -import { ApplicationGroup } from '@/Application/ApplicationGroup' -import { WebApplication } from '@/Application/Application' +import { WebApplicationGroup } from '@/Application/WebApplicationGroup' +import { WebApplication } from '@/Application/WebApplication' import { Component } from 'react' import ApplicationView from '@/Components/ApplicationView/ApplicationView' import { WebOrDesktopDevice } from '@/Application/Device/WebOrDesktopDevice' @@ -38,7 +38,7 @@ const renderDialog = (message: string) => { class ApplicationGroupView extends Component { applicationObserverRemover?: () => void - private group?: ApplicationGroup + private group?: WebApplicationGroup private application?: WebApplication constructor(props: Props) { @@ -52,7 +52,7 @@ class ApplicationGroupView extends Component { return } - this.group = new ApplicationGroup(props.server, props.device, props.websocketUrl) + this.group = new WebApplicationGroup(props.server, props.device, props.websocketUrl) window.mainApplicationGroup = this.group diff --git a/packages/web/src/javascripts/Components/ApplicationProvider.tsx b/packages/web/src/javascripts/Components/ApplicationProvider.tsx index 52b5f7bf3..f6f1104c1 100644 --- a/packages/web/src/javascripts/Components/ApplicationProvider.tsx +++ b/packages/web/src/javascripts/Components/ApplicationProvider.tsx @@ -1,7 +1,7 @@ import { ReactNode, createContext, useContext, memo } from 'react' import { observer } from 'mobx-react-lite' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' const ApplicationContext = createContext(undefined) diff --git a/packages/web/src/javascripts/Components/ApplicationView/ApplicationView.tsx b/packages/web/src/javascripts/Components/ApplicationView/ApplicationView.tsx index 47caa73ab..8a515556c 100644 --- a/packages/web/src/javascripts/Components/ApplicationView/ApplicationView.tsx +++ b/packages/web/src/javascripts/Components/ApplicationView/ApplicationView.tsx @@ -1,8 +1,8 @@ -import { ApplicationGroup } from '@/Application/ApplicationGroup' +import { WebApplicationGroup } from '@/Application/WebApplicationGroup' import { getPlatformString, isIOS } from '@/Utils' import { ApplicationEvent, Challenge, removeFromArray, WebAppEvent } from '@standardnotes/snjs' import { alertDialog, RouteType } from '@standardnotes/ui-services' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import Footer from '@/Components/Footer/Footer' import SessionsModal from '@/Components/SessionsModal/SessionsModal' import PreferencesViewWrapper from '@/Components/Preferences/PreferencesViewWrapper' @@ -33,7 +33,7 @@ import IosKeyboardClose from '../IosKeyboardClose/IosKeyboardClose' type Props = { application: WebApplication - mainApplicationGroup: ApplicationGroup + mainApplicationGroup: WebApplicationGroup } const LazyLoadedClipperView = lazy(() => import('../ClipperView/ClipperView')) diff --git a/packages/web/src/javascripts/Components/ChallengeModal/BiometricsPrompt.tsx b/packages/web/src/javascripts/Components/ChallengeModal/BiometricsPrompt.tsx index 5f27ce0f8..6c81be8a6 100644 --- a/packages/web/src/javascripts/Components/ChallengeModal/BiometricsPrompt.tsx +++ b/packages/web/src/javascripts/Components/ChallengeModal/BiometricsPrompt.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ChallengePrompt } from '@standardnotes/services' import { RefObject, useState } from 'react' import Button from '../Button/Button' diff --git a/packages/web/src/javascripts/Components/ChallengeModal/ChallengeModal.tsx b/packages/web/src/javascripts/Components/ChallengeModal/ChallengeModal.tsx index 4274edef9..1845f0e2e 100644 --- a/packages/web/src/javascripts/Components/ChallengeModal/ChallengeModal.tsx +++ b/packages/web/src/javascripts/Components/ChallengeModal/ChallengeModal.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ButtonType, Challenge, @@ -14,7 +14,7 @@ import Button from '@/Components/Button/Button' import Icon from '@/Components/Icon/Icon' import ChallengeModalPrompt from './ChallengePrompt' import LockscreenWorkspaceSwitcher from './LockscreenWorkspaceSwitcher' -import { ApplicationGroup } from '@/Application/ApplicationGroup' +import { WebApplicationGroup } from '@/Application/WebApplicationGroup' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { ChallengeModalValues } from './ChallengeModalValues' import { InputValue } from './InputValue' @@ -27,7 +27,7 @@ import { useAutoElementRect } from '@/Hooks/useElementRect' type Props = { application: WebApplication viewControllerManager: ViewControllerManager - mainApplicationGroup: ApplicationGroup + mainApplicationGroup: WebApplicationGroup challenge: Challenge onDismiss?: (challenge: Challenge) => void } diff --git a/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx b/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx index 39c7dc2fd..61a27a851 100644 --- a/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx +++ b/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx @@ -8,7 +8,7 @@ import { FunctionComponent, useCallback, useEffect, useRef } from 'react' import DecoratedInput from '@/Components/Input/DecoratedInput' import DecoratedPasswordInput from '@/Components/Input/DecoratedPasswordInput' import { ChallengeModalValues } from './ChallengeModalValues' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { InputValue } from './InputValue' import BiometricsPrompt from './BiometricsPrompt' import U2FPrompt from './U2FPrompt' diff --git a/packages/web/src/javascripts/Components/ChallengeModal/LockscreenWorkspaceSwitcher.tsx b/packages/web/src/javascripts/Components/ChallengeModal/LockscreenWorkspaceSwitcher.tsx index cdda2d239..bd53957fb 100644 --- a/packages/web/src/javascripts/Components/ChallengeModal/LockscreenWorkspaceSwitcher.tsx +++ b/packages/web/src/javascripts/Components/ChallengeModal/LockscreenWorkspaceSwitcher.tsx @@ -1,4 +1,4 @@ -import { ApplicationGroup } from '@/Application/ApplicationGroup' +import { WebApplicationGroup } from '@/Application/WebApplicationGroup' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { FunctionComponent, useCallback, useRef, useState } from 'react' import WorkspaceSwitcherMenu from '@/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu' @@ -7,7 +7,7 @@ import Icon from '@/Components/Icon/Icon' import Popover from '../Popover/Popover' type Props = { - mainApplicationGroup: ApplicationGroup + mainApplicationGroup: WebApplicationGroup viewControllerManager: ViewControllerManager } diff --git a/packages/web/src/javascripts/Components/ChallengeModal/U2FPrompt.tsx b/packages/web/src/javascripts/Components/ChallengeModal/U2FPrompt.tsx index c74c9ee71..f939cd42a 100644 --- a/packages/web/src/javascripts/Components/ChallengeModal/U2FPrompt.tsx +++ b/packages/web/src/javascripts/Components/ChallengeModal/U2FPrompt.tsx @@ -2,7 +2,7 @@ import { Username } from '@standardnotes/snjs' import { ChallengePrompt } from '@standardnotes/services' import { RefObject, useState } from 'react' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { isAndroid } from '@/Utils' import Button from '../Button/Button' diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx index bf5db7a11..b6fbfaaac 100644 --- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx +++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx @@ -2,7 +2,7 @@ import Icon from '@/Components/Icon/Icon' import Menu from '@/Components/Menu/Menu' import { usePremiumModal } from '@/Hooks/usePremiumModal' import { STRING_EDIT_LOCKED_ATTEMPT } from '@/Constants/Strings' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ComponentArea, NoteMutator, NoteType, PrefKey, SNComponent, SNNote } from '@standardnotes/snjs' import { Fragment, FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react' import { EditorMenuGroup } from '@/Components/NotesOptions/EditorMenuGroup' diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeMultipleButton.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeMultipleButton.tsx index 42a5696ca..f61327c06 100644 --- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeMultipleButton.tsx +++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeMultipleButton.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { NotesController } from '@/Controllers/NotesController/NotesController' import { useRef, useState } from 'react' import RoundIconButton from '../Button/RoundIconButton' diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeMultipleMenu.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeMultipleMenu.tsx index cc6333b87..ed82cee56 100644 --- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeMultipleMenu.tsx +++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeMultipleMenu.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { STRING_EDIT_LOCKED_ATTEMPT } from '@/Constants/Strings' import { usePremiumModal } from '@/Hooks/usePremiumModal' import { createEditorMenuGroups } from '@/Utils/createEditorMenuGroups' diff --git a/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx b/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx index f0a04edbb..701dfbb7b 100644 --- a/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx +++ b/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx @@ -1,4 +1,4 @@ -import { ApplicationGroup } from '@/Application/ApplicationGroup' +import { WebApplicationGroup } from '@/Application/WebApplicationGroup' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { SNLogoFull } from '@standardnotes/icons' import { useCallback, useEffect, useState } from 'react' @@ -48,7 +48,7 @@ const ClipperView = ({ applicationGroup, }: { viewControllerManager: ViewControllerManager - applicationGroup: ApplicationGroup + applicationGroup: WebApplicationGroup }) => { const application = useApplication() diff --git a/packages/web/src/javascripts/Components/ComponentView/ComponentView.tsx b/packages/web/src/javascripts/Components/ComponentView/ComponentView.tsx index 6844db7e6..f1a7d4d37 100644 --- a/packages/web/src/javascripts/Components/ComponentView/ComponentView.tsx +++ b/packages/web/src/javascripts/Components/ComponentView/ComponentView.tsx @@ -7,7 +7,7 @@ import { ComponentViewerEvent, ComponentViewerError, } from '@standardnotes/snjs' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { FunctionComponent, useCallback, useEffect, useRef, useState } from 'react' import { observer } from 'mobx-react-lite' import OfflineRestricted from '@/Components/ComponentView/OfflineRestricted' diff --git a/packages/web/src/javascripts/Components/ConfirmDeleteAccountModal/ConfirmDeleteAccountModal.tsx b/packages/web/src/javascripts/Components/ConfirmDeleteAccountModal/ConfirmDeleteAccountModal.tsx index bf3c6c212..d9d89d5e1 100644 --- a/packages/web/src/javascripts/Components/ConfirmDeleteAccountModal/ConfirmDeleteAccountModal.tsx +++ b/packages/web/src/javascripts/Components/ConfirmDeleteAccountModal/ConfirmDeleteAccountModal.tsx @@ -3,7 +3,7 @@ import { ViewControllerManager } from '@Controllers/ViewControllerManager' import { useCallback, useRef } from 'react' import { STRING_DELETE_ACCOUNT_CONFIRMATION } from '@/Constants/Strings' import Button from '@/Components/Button/Button' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import Icon from '../Icon/Icon' import AlertDialog from '../AlertDialog/AlertDialog' diff --git a/packages/web/src/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx b/packages/web/src/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx index 0c8eaafe3..65abfb186 100644 --- a/packages/web/src/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx +++ b/packages/web/src/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx @@ -1,9 +1,9 @@ import { FunctionComponent, useCallback, useRef } from 'react' import { STRING_SIGN_OUT_CONFIRMATION } from '@/Constants/Strings' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { observer } from 'mobx-react-lite' -import { ApplicationGroup } from '@/Application/ApplicationGroup' +import { WebApplicationGroup } from '@/Application/WebApplicationGroup' import { isDesktopApplication } from '@/Utils' import Button from '@/Components/Button/Button' import Icon from '../Icon/Icon' @@ -13,7 +13,7 @@ import HorizontalSeparator from '../Shared/HorizontalSeparator' type Props = { application: WebApplication viewControllerManager: ViewControllerManager - applicationGroup: ApplicationGroup + applicationGroup: WebApplicationGroup } const ConfirmSignoutModal: FunctionComponent = ({ application, viewControllerManager, applicationGroup }) => { diff --git a/packages/web/src/javascripts/Components/ContentListView/ContentList.tsx b/packages/web/src/javascripts/Components/ContentListView/ContentList.tsx index 1d6065adf..7e2504f15 100644 --- a/packages/web/src/javascripts/Components/ContentListView/ContentList.tsx +++ b/packages/web/src/javascripts/Components/ContentListView/ContentList.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { KeyboardKey } from '@standardnotes/ui-services' import { observer } from 'mobx-react-lite' import { FunctionComponent, KeyboardEventHandler, UIEventHandler, useCallback } from 'react' diff --git a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx index 5e89b32a2..9bf177f8b 100644 --- a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx +++ b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx @@ -7,7 +7,7 @@ import { SEARCH_KEYBOARD_COMMAND, SELECT_ALL_ITEMS_KEYBOARD_COMMAND, } from '@standardnotes/ui-services' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { PANEL_NAME_NOTES } from '@/Constants/Constants' import { FileItem, PrefKey, WebAppEvent } from '@standardnotes/snjs' import { observer } from 'mobx-react-lite' diff --git a/packages/web/src/javascripts/Components/ContentListView/Header/ContentListHeader.tsx b/packages/web/src/javascripts/Components/ContentListView/Header/ContentListHeader.tsx index 05cb7fbc4..6d81823c8 100644 --- a/packages/web/src/javascripts/Components/ContentListView/Header/ContentListHeader.tsx +++ b/packages/web/src/javascripts/Components/ContentListView/Header/ContentListHeader.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { memo, useCallback, useMemo, useRef, useState } from 'react' import Icon from '../../Icon/Icon' import { classNames } from '@standardnotes/utils' diff --git a/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenuProps.tsx b/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenuProps.tsx index 3047fd665..bf35db5f6 100644 --- a/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenuProps.tsx +++ b/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenuProps.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { AnyTag } from '@/Controllers/Navigation/AnyTagType' import { PaneController } from '@/Controllers/PaneController/PaneController' diff --git a/packages/web/src/javascripts/Components/ContentListView/Header/NewNotePreferences.tsx b/packages/web/src/javascripts/Components/ContentListView/Header/NewNotePreferences.tsx index d5dab3437..2c10e9897 100644 --- a/packages/web/src/javascripts/Components/ContentListView/Header/NewNotePreferences.tsx +++ b/packages/web/src/javascripts/Components/ContentListView/Header/NewNotePreferences.tsx @@ -13,7 +13,7 @@ import { ChangeEventHandler, FunctionComponent, useCallback, useEffect, useRef, import { PrefDefaults } from '@/Constants/PrefDefaults' import Dropdown from '@/Components/Dropdown/Dropdown' import { DropdownItem } from '@/Components/Dropdown/DropdownItem' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { AnyTag } from '@/Controllers/Navigation/AnyTagType' import { PreferenceMode } from './PreferenceMode' import dayjs from 'dayjs' diff --git a/packages/web/src/javascripts/Components/ContentListView/Types/AbstractListItemProps.ts b/packages/web/src/javascripts/Components/ContentListView/Types/AbstractListItemProps.ts index 8a0df8437..53398a183 100644 --- a/packages/web/src/javascripts/Components/ContentListView/Types/AbstractListItemProps.ts +++ b/packages/web/src/javascripts/Components/ContentListView/Types/AbstractListItemProps.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { FilesController } from '@/Controllers/FilesController' import { NotesController } from '@/Controllers/NotesController/NotesController' import { SortableItem, SNTag, Uuids } from '@standardnotes/snjs' diff --git a/packages/web/src/javascripts/Components/ContentTableView/ContentTableView.tsx b/packages/web/src/javascripts/Components/ContentTableView/ContentTableView.tsx index 4013efa91..b764021e3 100644 --- a/packages/web/src/javascripts/Components/ContentTableView/ContentTableView.tsx +++ b/packages/web/src/javascripts/Components/ContentTableView/ContentTableView.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { FilesController } from '@/Controllers/FilesController' import { formatDateForContextMenu } from '@/Utils/DateUtils' import { getIconForFileType } from '@/Utils/Items/Icons/getIconForFileType' diff --git a/packages/web/src/javascripts/Components/DarkModeHandler/DarkModeHandler.tsx b/packages/web/src/javascripts/Components/DarkModeHandler/DarkModeHandler.tsx index 8b797088d..d5f53ede6 100644 --- a/packages/web/src/javascripts/Components/DarkModeHandler/DarkModeHandler.tsx +++ b/packages/web/src/javascripts/Components/DarkModeHandler/DarkModeHandler.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { PrefDefaults } from '@/Constants/PrefDefaults' import { ApplicationEvent, PrefKey } from '@standardnotes/snjs' import { useEffect } from 'react' diff --git a/packages/web/src/javascripts/Components/DeallocateHandler/DeallocateHandler.tsx b/packages/web/src/javascripts/Components/DeallocateHandler/DeallocateHandler.tsx index c2bfcf93e..eea591a52 100644 --- a/packages/web/src/javascripts/Components/DeallocateHandler/DeallocateHandler.tsx +++ b/packages/web/src/javascripts/Components/DeallocateHandler/DeallocateHandler.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { observer } from 'mobx-react-lite' import { FunctionComponent, ReactNode } from 'react' diff --git a/packages/web/src/javascripts/Components/FileDragNDropProvider.tsx b/packages/web/src/javascripts/Components/FileDragNDropProvider.tsx index 323e607f1..dacab493c 100644 --- a/packages/web/src/javascripts/Components/FileDragNDropProvider.tsx +++ b/packages/web/src/javascripts/Components/FileDragNDropProvider.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { FeaturesController } from '@/Controllers/FeaturesController' import { FilesController } from '@/Controllers/FilesController' import { usePremiumModal } from '@/Hooks/usePremiumModal' diff --git a/packages/web/src/javascripts/Components/FilePreview/FilePreview.tsx b/packages/web/src/javascripts/Components/FilePreview/FilePreview.tsx index f3854356b..61b6d19d3 100644 --- a/packages/web/src/javascripts/Components/FilePreview/FilePreview.tsx +++ b/packages/web/src/javascripts/Components/FilePreview/FilePreview.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { concatenateUint8Arrays } from '@/Utils' import { ApplicationEvent, diff --git a/packages/web/src/javascripts/Components/FilePreview/FilePreviewModal.tsx b/packages/web/src/javascripts/Components/FilePreview/FilePreviewModal.tsx index d932ae132..dcb4290e2 100644 --- a/packages/web/src/javascripts/Components/FilePreview/FilePreviewModal.tsx +++ b/packages/web/src/javascripts/Components/FilePreview/FilePreviewModal.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { FunctionComponent, KeyboardEventHandler, useCallback, useMemo, useRef, useState } from 'react' import { getFileIconComponent } from './getFileIconComponent' import Icon from '@/Components/Icon/Icon' diff --git a/packages/web/src/javascripts/Components/FilePreview/PreviewComponent.tsx b/packages/web/src/javascripts/Components/FilePreview/PreviewComponent.tsx index 96a88b7ef..837ebb0fe 100644 --- a/packages/web/src/javascripts/Components/FilePreview/PreviewComponent.tsx +++ b/packages/web/src/javascripts/Components/FilePreview/PreviewComponent.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { getBase64FromBlob } from '@/Utils' import { FileItem } from '@standardnotes/snjs' import { FunctionComponent, useCallback, useEffect, useMemo, useRef } from 'react' diff --git a/packages/web/src/javascripts/Components/FileView/FileViewProps.tsx b/packages/web/src/javascripts/Components/FileView/FileViewProps.tsx index 818f11d35..90566bee3 100644 --- a/packages/web/src/javascripts/Components/FileView/FileViewProps.tsx +++ b/packages/web/src/javascripts/Components/FileView/FileViewProps.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { FileItem } from '@standardnotes/snjs' diff --git a/packages/web/src/javascripts/Components/Footer/Footer.tsx b/packages/web/src/javascripts/Components/Footer/Footer.tsx index 0f0013462..15bb34f81 100644 --- a/packages/web/src/javascripts/Components/Footer/Footer.tsx +++ b/packages/web/src/javascripts/Components/Footer/Footer.tsx @@ -1,5 +1,5 @@ -import { WebApplication } from '@/Application/Application' -import { ApplicationGroup } from '@/Application/ApplicationGroup' +import { WebApplication } from '@/Application/WebApplication' +import { WebApplicationGroup } from '@/Application/WebApplicationGroup' import { AbstractComponent } from '@/Components/Abstract/PureComponent' import { destroyAllObjectProperties, preventRefreshing } from '@/Utils' import { ApplicationEvent, ApplicationDescriptor, WebAppEvent } from '@standardnotes/snjs' @@ -24,7 +24,7 @@ import PreferencesButton from './PreferencesButton' type Props = { application: WebApplication - applicationGroup: ApplicationGroup + applicationGroup: WebApplicationGroup } type State = { diff --git a/packages/web/src/javascripts/Components/Footer/QuickSettingsButton.tsx b/packages/web/src/javascripts/Components/Footer/QuickSettingsButton.tsx index a15bafd8f..07b86a5eb 100644 --- a/packages/web/src/javascripts/Components/Footer/QuickSettingsButton.tsx +++ b/packages/web/src/javascripts/Components/Footer/QuickSettingsButton.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { QuickSettingsController } from '@/Controllers/QuickSettingsController' import { FeatureIdentifier, SNTheme } from '@standardnotes/snjs' import { TOGGLE_DARK_MODE_COMMAND } from '@standardnotes/ui-services' diff --git a/packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx b/packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx index 4bef35d24..086c4849c 100644 --- a/packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx +++ b/packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { FeaturesController } from '@/Controllers/FeaturesController' import { SubscriptionController } from '@/Controllers/Subscription/SubscriptionController' import { observer } from 'mobx-react-lite' diff --git a/packages/web/src/javascripts/Components/MultipleSelectedNotes/MultipleSelectedNotes.tsx b/packages/web/src/javascripts/Components/MultipleSelectedNotes/MultipleSelectedNotes.tsx index b53d4b92d..ed904fb5d 100644 --- a/packages/web/src/javascripts/Components/MultipleSelectedNotes/MultipleSelectedNotes.tsx +++ b/packages/web/src/javascripts/Components/MultipleSelectedNotes/MultipleSelectedNotes.tsx @@ -1,7 +1,7 @@ import { IlNotesIcon } from '@standardnotes/icons' import { observer } from 'mobx-react-lite' import NotesOptionsPanel from '@/Components/NotesOptions/NotesOptionsPanel' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import PinNoteButton from '@/Components/PinNoteButton/PinNoteButton' import Button from '../Button/Button' import { useCallback } from 'react' diff --git a/packages/web/src/javascripts/Components/NoSubscriptionBanner/NoSubscriptionBanner.tsx b/packages/web/src/javascripts/Components/NoSubscriptionBanner/NoSubscriptionBanner.tsx index afd1aaa4a..ad2054f3f 100644 --- a/packages/web/src/javascripts/Components/NoSubscriptionBanner/NoSubscriptionBanner.tsx +++ b/packages/web/src/javascripts/Components/NoSubscriptionBanner/NoSubscriptionBanner.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { classNames } from '@standardnotes/utils' import Button from '../Button/Button' import Icon from '../Icon/Icon' diff --git a/packages/web/src/javascripts/Components/NoteGroupView/EditorPane.tsx b/packages/web/src/javascripts/Components/NoteGroupView/EditorPane.tsx index 9e1842b8d..896d54c5f 100644 --- a/packages/web/src/javascripts/Components/NoteGroupView/EditorPane.tsx +++ b/packages/web/src/javascripts/Components/NoteGroupView/EditorPane.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { PaneLayout } from '@/Controllers/PaneController/PaneLayout' import { mergeRefs } from '@/Hooks/mergeRefs' import { ForwardedRef, forwardRef } from 'react' diff --git a/packages/web/src/javascripts/Components/NoteGroupView/NoteGroupView.tsx b/packages/web/src/javascripts/Components/NoteGroupView/NoteGroupView.tsx index 28b282e5c..75822680a 100644 --- a/packages/web/src/javascripts/Components/NoteGroupView/NoteGroupView.tsx +++ b/packages/web/src/javascripts/Components/NoteGroupView/NoteGroupView.tsx @@ -1,6 +1,6 @@ import { FileItem } from '@standardnotes/snjs' import { AbstractComponent } from '@/Components/Abstract/PureComponent' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import MultipleSelectedNotes from '@/Components/MultipleSelectedNotes/MultipleSelectedNotes' import MultipleSelectedFiles from '../MultipleSelectedFiles/MultipleSelectedFiles' import { AppPaneId } from '../Panes/AppPaneMetadata' diff --git a/packages/web/src/javascripts/Components/NoteView/Controller/ItemGroupController.ts b/packages/web/src/javascripts/Components/NoteView/Controller/ItemGroupController.ts index 1cbf6aac0..8d8324f6e 100644 --- a/packages/web/src/javascripts/Components/NoteView/Controller/ItemGroupController.ts +++ b/packages/web/src/javascripts/Components/NoteView/Controller/ItemGroupController.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { removeFromArray } from '@standardnotes/utils' import { FileItem, SNNote } from '@standardnotes/snjs' import { NoteViewController } from './NoteViewController' diff --git a/packages/web/src/javascripts/Components/NoteView/Controller/NoteViewController.spec.ts b/packages/web/src/javascripts/Components/NoteView/Controller/NoteViewController.spec.ts index 6792ab92d..e481028e2 100644 --- a/packages/web/src/javascripts/Components/NoteView/Controller/NoteViewController.spec.ts +++ b/packages/web/src/javascripts/Components/NoteView/Controller/NoteViewController.spec.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ContentType } from '@standardnotes/common' import { MutatorService, diff --git a/packages/web/src/javascripts/Components/NoteView/Controller/NoteViewController.ts b/packages/web/src/javascripts/Components/NoteView/Controller/NoteViewController.ts index 346514e67..714a8d8be 100644 --- a/packages/web/src/javascripts/Components/NoteView/Controller/NoteViewController.ts +++ b/packages/web/src/javascripts/Components/NoteView/Controller/NoteViewController.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { noteTypeForEditorIdentifier } from '@standardnotes/features' import { SNNote, SNTag, NoteContent, DecryptedItemInterface, PayloadEmitSource, PrefKey } from '@standardnotes/models' import { UuidString } from '@standardnotes/snjs' diff --git a/packages/web/src/javascripts/Components/NoteView/NoteView.test.ts b/packages/web/src/javascripts/Components/NoteView/NoteView.test.ts index c39492322..1c3aa3eb9 100644 --- a/packages/web/src/javascripts/Components/NoteView/NoteView.test.ts +++ b/packages/web/src/javascripts/Components/NoteView/NoteView.test.ts @@ -2,7 +2,7 @@ * @jest-environment jsdom */ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { NotesController } from '@/Controllers/NotesController/NotesController' import { diff --git a/packages/web/src/javascripts/Components/NoteView/NoteViewProps.ts b/packages/web/src/javascripts/Components/NoteView/NoteViewProps.ts index b39885dca..b8003e39c 100644 --- a/packages/web/src/javascripts/Components/NoteView/NoteViewProps.ts +++ b/packages/web/src/javascripts/Components/NoteView/NoteViewProps.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { NoteViewController } from './Controller/NoteViewController' export interface NoteViewProps { diff --git a/packages/web/src/javascripts/Components/NoteView/PlainEditor/PlainEditor.tsx b/packages/web/src/javascripts/Components/NoteView/PlainEditor/PlainEditor.tsx index d6ec82d55..bee0dcfff 100644 --- a/packages/web/src/javascripts/Components/NoteView/PlainEditor/PlainEditor.tsx +++ b/packages/web/src/javascripts/Components/NoteView/PlainEditor/PlainEditor.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { usePrevious } from '@/Components/ContentListView/Calendar/usePrevious' import { ElementIds } from '@/Constants/ElementIDs' import { PrefDefaults } from '@/Constants/PrefDefaults' diff --git a/packages/web/src/javascripts/Components/NotesOptions/ChangeEditorOption.tsx b/packages/web/src/javascripts/Components/NotesOptions/ChangeEditorOption.tsx index 049b52232..83d5dd9e8 100644 --- a/packages/web/src/javascripts/Components/NotesOptions/ChangeEditorOption.tsx +++ b/packages/web/src/javascripts/Components/NotesOptions/ChangeEditorOption.tsx @@ -1,5 +1,5 @@ import { CHANGE_EDITOR_COMMAND, KeyboardKey } from '@standardnotes/ui-services' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { SNNote } from '@standardnotes/snjs' import { FunctionComponent, useCallback, useMemo, useRef, useState } from 'react' import Icon from '@/Components/Icon/Icon' diff --git a/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedActionsMenu.tsx b/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedActionsMenu.tsx index e49d0bf57..cc5cd6325 100644 --- a/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedActionsMenu.tsx +++ b/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedActionsMenu.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { Action, SNNote } from '@standardnotes/snjs' import { Fragment, useCallback, useEffect, useState } from 'react' import Icon from '@/Components/Icon/Icon' diff --git a/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedActionsOption.tsx b/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedActionsOption.tsx index cc8664874..6ac1587d1 100644 --- a/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedActionsOption.tsx +++ b/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedActionsOption.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { SNNote } from '@standardnotes/snjs' import { FunctionComponent, useCallback, useRef, useState } from 'react' import Icon from '@/Components/Icon/Icon' diff --git a/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedMenuItem.tsx b/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedMenuItem.tsx index 0f3658be3..baa4f8474 100644 --- a/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedMenuItem.tsx +++ b/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedMenuItem.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { Action, SNNote } from '@standardnotes/snjs' import { FunctionComponent, useCallback, useState } from 'react' import Spinner from '@/Components/Spinner/Spinner' diff --git a/packages/web/src/javascripts/Components/OtherSessionsSignOut/OtherSessionsSignOut.tsx b/packages/web/src/javascripts/Components/OtherSessionsSignOut/OtherSessionsSignOut.tsx index 74d39ecb7..eb4092d8b 100644 --- a/packages/web/src/javascripts/Components/OtherSessionsSignOut/OtherSessionsSignOut.tsx +++ b/packages/web/src/javascripts/Components/OtherSessionsSignOut/OtherSessionsSignOut.tsx @@ -1,5 +1,5 @@ import { useCallback, useRef } from 'react' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { observer } from 'mobx-react-lite' import Button from '@/Components/Button/Button' diff --git a/packages/web/src/javascripts/Components/PasswordWizard/PasswordWizard.tsx b/packages/web/src/javascripts/Components/PasswordWizard/PasswordWizard.tsx index dcd004b72..a4caf5363 100644 --- a/packages/web/src/javascripts/Components/PasswordWizard/PasswordWizard.tsx +++ b/packages/web/src/javascripts/Components/PasswordWizard/PasswordWizard.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { createRef } from 'react' import { AbstractComponent } from '@/Components/Abstract/PureComponent' import DecoratedPasswordInput from '../Input/DecoratedPasswordInput' diff --git a/packages/web/src/javascripts/Components/PermissionsModal/PermissionsModalWrapper.tsx b/packages/web/src/javascripts/Components/PermissionsModal/PermissionsModalWrapper.tsx index e6cc15cb5..d0213fa57 100644 --- a/packages/web/src/javascripts/Components/PermissionsModal/PermissionsModalWrapper.tsx +++ b/packages/web/src/javascripts/Components/PermissionsModal/PermissionsModalWrapper.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ApplicationEvent, PermissionDialog } from '@standardnotes/snjs' import { FunctionComponent, useCallback, useEffect, useState } from 'react' import ModalOverlay from '../Modal/ModalOverlay' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx index 8ffbce119..1e40c21a5 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx @@ -1,5 +1,5 @@ import { observer } from 'mobx-react-lite' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import Authentication from './Authentication' import Credentials from './Credentials' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Authentication.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Authentication.tsx index 8717f36a3..d82a7c7d2 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Authentication.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Authentication.tsx @@ -1,6 +1,6 @@ import Button from '@/Components/Button/Button' import { Title } from '@/Components/Preferences/PreferencesComponents/Content' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'react' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmail.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmail.tsx index f857c0c07..baa853ba7 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmail.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmail.tsx @@ -1,5 +1,5 @@ import { FunctionComponent, useCallback, useMemo, useState } from 'react' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { useBeforeUnload } from '@/Hooks/useBeforeUnload' import ChangeEmailForm from './ChangeEmailForm' import ChangeEmailSuccess from './ChangeEmailSuccess' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Credentials.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Credentials.tsx index 308efea5d..b635f46d9 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Credentials.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Credentials.tsx @@ -1,6 +1,6 @@ import { Subtitle, Text, Title } from '@/Components/Preferences/PreferencesComponents/Content' import Button from '@/Components/Button/Button' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { observer } from 'mobx-react-lite' import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator' import { dateToLocalizedString } from '@standardnotes/snjs' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/DeleteAccount.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/DeleteAccount.tsx index 4340e0003..c3c6bc6ac 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/DeleteAccount.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/DeleteAccount.tsx @@ -4,7 +4,7 @@ import { Text, Title } from '@/Components/Preferences/PreferencesComponents/Cont import Button from '@/Components/Button/Button' import PreferencesGroup from '@/Components/Preferences/PreferencesComponents/PreferencesGroup' import { ViewControllerManager } from '@Controllers/ViewControllerManager' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' type Props = { application: WebApplication diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email/Email.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email/Email.tsx index bf30ec0b0..40e8354a7 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email/Email.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email/Email.tsx @@ -11,7 +11,7 @@ import { FunctionComponent, useCallback, useEffect, useState } from 'react' import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator' import Switch from '@/Components/Switch/Switch' import { Subtitle, Text, Title } from '@/Components/Preferences/PreferencesComponents/Content' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { STRING_FAILED_TO_UPDATE_USER_SETTING } from '@/Constants/Strings' import PreferencesGroup from '@/Components/Preferences/PreferencesComponents/PreferencesGroup' import PreferencesSegment from '@/Components/Preferences/PreferencesComponents/PreferencesSegment' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Files.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Files.tsx index 19a415867..d7d102d90 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Files.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Files.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import Spinner from '@/Components/Spinner/Spinner' import { formatSizeToReadableString } from '@standardnotes/filepicker' import { SettingName } from '@standardnotes/snjs' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/NoProSubscription.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/NoProSubscription.tsx index ef971c586..c1560e4e2 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/NoProSubscription.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/NoProSubscription.tsx @@ -1,7 +1,7 @@ import { FunctionComponent, ReactNode, useState } from 'react' import { LinkButton, Text } from '@/Components/Preferences/PreferencesComponents/Content' import Button from '@/Components/Button/Button' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' type Props = { application: WebApplication diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SignOutView.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SignOutView.tsx index dcba67bf8..68172c59f 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SignOutView.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SignOutView.tsx @@ -1,7 +1,7 @@ import Button from '@/Components/Button/Button' import OtherSessionsSignOutContainer from '@/Components/OtherSessionsSignOut/OtherSessionsSignOut' import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'react' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/NoSubscription.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/NoSubscription.tsx index 0b22b6a69..131dbb7de 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/NoSubscription.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/NoSubscription.tsx @@ -1,7 +1,7 @@ import { FunctionComponent, useState } from 'react' import { LinkButton, Text } from '@/Components/Preferences/PreferencesComponents/Content' import Button from '@/Components/Button/Button' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' type Props = { application: WebApplication diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/Subscription.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/Subscription.tsx index f8b111167..7b1ac3d5d 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/Subscription.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/Subscription.tsx @@ -1,5 +1,5 @@ import { Title } from '@/Components/Preferences/PreferencesComponents/Content' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import SubscriptionInformation from './SubscriptionInformation' import NoSubscription from './NoSubscription' import { observer } from 'mobx-react-lite' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx index 8052d562e..2b742081f 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/SubscriptionInformation.tsx @@ -1,7 +1,7 @@ import { observer } from 'mobx-react-lite' import { SubscriptionController } from '@/Controllers/Subscription/SubscriptionController' import Button from '@/Components/Button/Button' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { openSubscriptionDashboard } from '@/Utils/ManageSubscription' import StatusText from './StatusText' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/InvitationsList.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/InvitationsList.tsx index ec3bb4d32..f11037c1f 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/InvitationsList.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/InvitationsList.tsx @@ -5,7 +5,7 @@ import { InvitationStatus } from '@standardnotes/snjs' import { SubtitleLight, Text } from '@/Components/Preferences/PreferencesComponents/Content' import { SubscriptionController } from '@/Controllers/Subscription/SubscriptionController' import Button from '@/Components/Button/Button' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator' type Props = { diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/Invite.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/Invite.tsx index d9c463448..040628492 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/Invite.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/Invite/Invite.tsx @@ -1,6 +1,6 @@ import { FunctionComponent, useCallback, useMemo, useState } from 'react' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { isEmailValid } from '@/Utils' import { SubscriptionController } from '@/Controllers/Subscription/SubscriptionController' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/SubscriptionSharing.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/SubscriptionSharing.tsx index 87becc7cf..8d09ee04b 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/SubscriptionSharing.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/SubscriptionSharing.tsx @@ -3,7 +3,7 @@ import { observer } from 'mobx-react-lite' import { FunctionComponent, useState } from 'react' import { Title } from '@/Components/Preferences/PreferencesComponents/Content' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import PreferencesGroup from '@/Components/Preferences/PreferencesComponents/PreferencesGroup' import PreferencesSegment from '@/Components/Preferences/PreferencesComponents/PreferencesSegment' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Sync.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Sync.tsx index 9bd67ef92..4b40dcf63 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Sync.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Sync.tsx @@ -3,7 +3,7 @@ import Button from '@/Components/Button/Button' import { SyncQueueStrategy } from '@standardnotes/snjs' import { STRING_GENERIC_SYNC_ERROR } from '@/Constants/Strings' import { observer } from 'mobx-react-lite' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { FunctionComponent, useState } from 'react' import { formatLastSyncDate } from '@/Utils/DateUtils' import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Appearance.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Appearance.tsx index 2ef38f2d0..b0f0e844c 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Appearance.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Appearance.tsx @@ -3,7 +3,7 @@ import { DropdownItem } from '@/Components/Dropdown/DropdownItem' import { usePremiumModal } from '@/Hooks/usePremiumModal' import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator' import Switch from '@/Components/Switch/Switch' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ContentType, FeatureIdentifier, diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Appearance/EditorAppearance.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Appearance/EditorAppearance.tsx index 3171fec9a..3a178b7f0 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Appearance/EditorAppearance.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Appearance/EditorAppearance.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import Dropdown from '@/Components/Dropdown/Dropdown' import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator' import Switch from '@/Components/Switch/Switch' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Backups.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Backups.tsx index 22b8dcab0..a5cde0f33 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Backups.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Backups.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { FunctionComponent } from 'react' import PreferencesPane from '@/Components/Preferences/PreferencesComponents/PreferencesPane' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/DataBackups.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/DataBackups.tsx index 4bf234efe..677a1ed41 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/DataBackups.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/DataBackups.tsx @@ -11,7 +11,7 @@ import { } from '@/Constants/Strings' import { BackupFile } from '@standardnotes/snjs' import { ChangeEventHandler, MouseEventHandler, useCallback, useEffect, useRef, useState } from 'react' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { observer } from 'mobx-react-lite' import { Title, Subtitle } from '@/Components/Preferences/PreferencesComponents/Content' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx index a13c1ced9..e3d66b930 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx @@ -1,7 +1,7 @@ import { convertStringifiedBooleanToBoolean, isDesktopApplication } from '@/Utils' import { STRING_FAILED_TO_UPDATE_USER_SETTING } from '@/Constants/Strings' import { useCallback, useEffect, useState } from 'react' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { observer } from 'mobx-react-lite' import { Subtitle, Text, Title } from '@/Components/Preferences/PreferencesComponents/Content' import Dropdown from '@/Components/Dropdown/Dropdown' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx index aa1ba3a49..606e7444c 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx @@ -5,7 +5,7 @@ import { FileBackupMetadataFile, FileBackupsConstantsV1, FileItem, FileHandleRea import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator' import Icon from '@/Components/Icon/Icon' import { ClassicFileReader, StreamingFileApi } from '@standardnotes/filepicker' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import EncryptionStatusItem from '../../Security/EncryptionStatusItem' import PreferencesSegment from '@/Components/Preferences/PreferencesComponents/PreferencesSegment' import Spinner from '@/Components/Spinner/Spinner' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsCrossPlatform.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsCrossPlatform.tsx index 77e12f55f..e8a6de1c0 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsCrossPlatform.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/Files/FileBackupsCrossPlatform.tsx @@ -1,7 +1,7 @@ import { Subtitle, Title, Text } from '@/Components/Preferences/PreferencesComponents/Content' import PreferencesGroup from '@/Components/Preferences/PreferencesComponents/PreferencesGroup' import PreferencesSegment from '@/Components/Preferences/PreferencesComponents/PreferencesSegment' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { useMemo } from 'react' import BackupsDropZone from './BackupsDropZone' import FileBackupsDesktop from './FileBackupsDesktop' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/TextBackups/TextBackupsCrossPlatform.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/TextBackups/TextBackupsCrossPlatform.tsx index e3c53426c..22669637a 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/TextBackups/TextBackupsCrossPlatform.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/TextBackups/TextBackupsCrossPlatform.tsx @@ -1,7 +1,7 @@ import { Subtitle, Title, Text } from '@/Components/Preferences/PreferencesComponents/Content' import PreferencesGroup from '@/Components/Preferences/PreferencesComponents/PreferencesGroup' import PreferencesSegment from '@/Components/Preferences/PreferencesComponents/PreferencesSegment' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { useMemo } from 'react' import TextBackupsDesktop from './TextBackupsDesktop' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/AdvancedSection.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/AdvancedSection.tsx index f2b86ef59..944d6bd18 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/AdvancedSection.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/AdvancedSection.tsx @@ -1,6 +1,6 @@ import { FunctionComponent } from 'react' import OfflineSubscription from '@/Components/Preferences/Panes/General/Advanced/OfflineSubscription' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { observer } from 'mobx-react-lite' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import PackagesPreferencesSection from '@/Components/Preferences/Panes/General/Advanced/Packages/Section' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/OfflineSubscription.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/OfflineSubscription.tsx index 4c967475b..87287b2b4 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/OfflineSubscription.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/OfflineSubscription.tsx @@ -2,7 +2,7 @@ import React, { FunctionComponent, useEffect, useState } from 'react' import { Subtitle } from '@/Components/Preferences/PreferencesComponents/Content' import DecoratedInput from '@/Components/Input/DecoratedInput' import Button from '@/Components/Button/Button' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { observer } from 'mobx-react-lite' import { STRING_REMOVE_OFFLINE_KEY_CONFIRMATION } from '@/Constants/Strings' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/PackageEntry.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/PackageEntry.tsx index 0f30c09a5..777b9c0a1 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/PackageEntry.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/PackageEntry.tsx @@ -5,7 +5,7 @@ import Switch from '@/Components/Switch/Switch' import Button from '@/Components/Button/Button' import PackageEntrySubInfo from './PackageEntrySubInfo' import PreferencesSegment from '../../../../PreferencesComponents/PreferencesSegment' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { AnyPackageType } from './Types/AnyPackageType' const UseHosted: FunctionComponent<{ diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/Provider/PackageProvider.ts b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/Provider/PackageProvider.ts index c2ab019e6..c5c9173cb 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/Provider/PackageProvider.ts +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/Provider/PackageProvider.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ClientDisplayableError, FeatureDescription } from '@standardnotes/snjs' import { makeAutoObservable, observable } from 'mobx' import { AnyPackageType } from '../Types/AnyPackageType' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/Section.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/Section.tsx index e677a3b08..3321a7749 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/Section.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/Section.tsx @@ -1,7 +1,7 @@ import { ButtonType, ContentType, SNComponent } from '@standardnotes/snjs' import Button from '@/Components/Button/Button' import DecoratedInput from '@/Components/Input/DecoratedInput' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { FunctionComponent, useEffect, useRef, useState } from 'react' import { Subtitle } from '@/Components/Preferences/PreferencesComponents/Content' import { observer } from 'mobx-react-lite' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Defaults.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/Defaults.tsx index aae2663d9..dd3cfc33b 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Defaults.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Defaults.tsx @@ -1,6 +1,6 @@ import { PrefKey, Platform } from '@standardnotes/snjs' import { Subtitle, Text, Title } from '@/Components/Preferences/PreferencesComponents/Content' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { FunctionComponent, useState } from 'react' import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator' import Switch from '@/Components/Switch/Switch' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/General.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/General.tsx index 18432e148..e3f50bda3 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/General.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/General.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { FunctionComponent } from 'react' import { PackageProvider } from '@/Components/Preferences/Panes/General/Advanced/Packages/Provider/PackageProvider' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Labs/Labs.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/Labs/Labs.tsx index cab02a1cc..ce3aea59f 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Labs/Labs.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Labs/Labs.tsx @@ -1,5 +1,5 @@ import { Text, Title } from '@/Components/Preferences/PreferencesComponents/Content' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ApplicationEvent, FeatureIdentifier, FeatureStatus, FindNativeFeature, PrefKey } from '@standardnotes/snjs' import { Fragment, FunctionComponent, useCallback, useEffect, useState } from 'react' import { usePremiumModal } from '@/Hooks/usePremiumModal' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Moments.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/Moments.tsx index d9a2f47c6..11fc3812a 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Moments.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Moments.tsx @@ -1,5 +1,5 @@ import { Pill, Subtitle, Text, Title } from '@/Components/Preferences/PreferencesComponents/Content' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { observer } from 'mobx-react-lite' import { FunctionComponent, useCallback, useEffect, useState } from 'react' import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Persistence.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/Persistence.tsx index 0e2e6571a..0f3e64615 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Persistence.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Persistence.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import StyledRadioInput from '@/Components/Radio/StyledRadioInput' import { useState } from 'react' import { Title } from '../../PreferencesComponents/Content' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/SmartViews/EditSmartViewModalController.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/SmartViews/EditSmartViewModalController.tsx index a7d545b6e..1f01da0b5 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/SmartViews/EditSmartViewModalController.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/SmartViews/EditSmartViewModalController.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { STRING_DELETE_TAG } from '@/Constants/Strings' import { predicateFromJson, diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/SmartViews/SmartViews.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/SmartViews/SmartViews.tsx index a4d3731a3..9e36dcae7 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/SmartViews/SmartViews.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/SmartViews/SmartViews.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import Button from '@/Components/Button/Button' import { ContentType, isSystemView, SmartView } from '@standardnotes/snjs' import { observer } from 'mobx-react-lite' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Tools.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/Tools.tsx index a86ce3ba0..ba4ed1441 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Tools.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Tools.tsx @@ -1,6 +1,6 @@ import Switch from '@/Components/Switch/Switch' import { Subtitle, Text, Title } from '@/Components/Preferences/PreferencesComponents/Content' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { PrefKey } from '@standardnotes/snjs' import { observer } from 'mobx-react-lite' import { FunctionComponent, useState } from 'react' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/HelpFeedback.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/HelpFeedback.tsx index 092461f68..c502fb7c4 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/HelpFeedback.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/HelpFeedback.tsx @@ -3,7 +3,7 @@ import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator' import PreferencesPane from '../PreferencesComponents/PreferencesPane' import PreferencesGroup from '../PreferencesComponents/PreferencesGroup' import PreferencesSegment from '../PreferencesComponents/PreferencesSegment' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { MouseEventHandler } from 'react' const HelpAndFeedback = ({ application }: { application: WebApplication }) => { diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Listed/Listed.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Listed/Listed.tsx index 571db01ff..58742004c 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Listed/Listed.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Listed/Listed.tsx @@ -1,6 +1,6 @@ import { Title, Subtitle, Text } from '@/Components/Preferences/PreferencesComponents/Content' import { observer } from 'mobx-react-lite' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ButtonType, ListedAccount } from '@standardnotes/snjs' import { useCallback, useEffect, useState } from 'react' import ListedAccountItem from './ListedAccountItem' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Listed/ListedAccountItem.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Listed/ListedAccountItem.tsx index ef7a07586..b7e73360f 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Listed/ListedAccountItem.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Listed/ListedAccountItem.tsx @@ -1,6 +1,6 @@ import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator' import { LinkButton, Subtitle } from '@/Components/Preferences/PreferencesComponents/Content' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ListedAccount, ListedAccountInfo } from '@standardnotes/snjs' import { FunctionComponent, useEffect, useState } from 'react' import Spinner from '@/Components/Spinner/Spinner' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/BiometricsLock.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/BiometricsLock.tsx index fb9246782..3adcb9423 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/BiometricsLock.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/BiometricsLock.tsx @@ -1,6 +1,6 @@ import { observer } from 'mobx-react-lite' import { useCallback, useEffect, useState } from 'react' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { MobileDeviceInterface } from '@standardnotes/services' import { MobileUnlockTiming } from '@standardnotes/snjs' import PreferencesSegment from '@/Components/Preferences/PreferencesComponents/PreferencesSegment' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/MultitaskingPrivacy.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/MultitaskingPrivacy.tsx index ba6088333..274888f14 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/MultitaskingPrivacy.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/MultitaskingPrivacy.tsx @@ -1,5 +1,5 @@ import { observer } from 'mobx-react-lite' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { isIOS } from '@/Utils' import { useEffect, useState } from 'react' import { MobileDeviceInterface } from '@standardnotes/services' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/PasscodeLock.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/PasscodeLock.tsx index 37cc4c433..9de3264c7 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/PasscodeLock.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/PasscodeLock.tsx @@ -8,7 +8,7 @@ import { StringUtils, Strings, } from '@/Constants/Strings' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { preventRefreshing } from '@/Utils' import { alertDialog } from '@standardnotes/ui-services' import { FormEvent, useCallback, useEffect, useRef, useState } from 'react' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/Privacy.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/Privacy.tsx index b14c9ebe1..319fe6640 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/Privacy.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/Privacy.tsx @@ -1,6 +1,6 @@ import Switch from '@/Components/Switch/Switch' import { Subtitle, Text, Title } from '@/Components/Preferences/PreferencesComponents/Content' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { LogSessionUserAgentOption, SettingName } from '@standardnotes/snjs' import { observer } from 'mobx-react-lite' import { FunctionComponent, useCallback, useEffect, useState } from 'react' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/Protections.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/Protections.tsx index 618840b19..098d6a93e 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/Protections.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/Protections.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { FunctionComponent, useCallback, useState, useEffect } from 'react' import { ApplicationEvent } from '@standardnotes/snjs' import { isSameDay } from '@/Utils' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/Security.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/Security.tsx index 920015358..e2b64205e 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/Security.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/Security.tsx @@ -1,6 +1,6 @@ import { FeatureIdentifier, FeatureStatus } from '@standardnotes/snjs' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { FunctionComponent } from 'react' import TwoFactorAuthWrapper from './TwoFactorAuth/TwoFactorAuthWrapper' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/MfaProps.ts b/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/MfaProps.ts index 800e66bd0..0a39c894b 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/MfaProps.ts +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/MfaProps.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { MfaProvider, UserProvider } from '@/Components/Preferences/Providers' export interface MfaProps { diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/TwoFactorAuthView/TwoFactorAuthView.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/TwoFactorAuthView/TwoFactorAuthView.tsx index 1f5a8e6bd..2f9276739 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/TwoFactorAuthView/TwoFactorAuthView.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/TwoFactorAuth/TwoFactorAuthView/TwoFactorAuthView.tsx @@ -8,7 +8,7 @@ import TwoFactorDescription from './TwoFactorDescription' import TwoFactorSwitch from './TwoFactorSwitch' import PreferencesGroup from '@/Components/Preferences/PreferencesComponents/PreferencesGroup' import PreferencesSegment from '@/Components/Preferences/PreferencesComponents/PreferencesSegment' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import RecoveryCodeBanner from '@/Components/RecoveryCodeBanner/RecoveryCodeBanner' import Modal, { ModalAction } from '@/Components/Modal/Modal' import ModalOverlay from '@/Components/Modal/ModalOverlay' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FProps.ts b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FProps.ts index b868594f7..232630959 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FProps.ts +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FProps.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { UserProvider } from '@/Components/Preferences/Providers' export interface U2FProps { diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FDevicesList.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FDevicesList.tsx index 9de4bb648..ee11e44c6 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FDevicesList.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FDevicesList.tsx @@ -2,7 +2,7 @@ import { FunctionComponent, useCallback } from 'react' import { observer } from 'mobx-react-lite' import { Subtitle } from '@/Components/Preferences/PreferencesComponents/Content' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import Button from '@/Components/Button/Button' import Icon from '@/Components/Icon/Icon' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FView.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FView.tsx index c8ea3817c..015caa345 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FView.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/U2F/U2FView/U2FView.tsx @@ -3,7 +3,7 @@ import { observer } from 'mobx-react-lite' import PreferencesGroup from '@/Components/Preferences/PreferencesComponents/PreferencesGroup' import PreferencesSegment from '@/Components/Preferences/PreferencesComponents/PreferencesSegment' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { UserProvider } from '@/Components/Preferences/Providers' import U2FTitle from './U2FTitle' diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Security/securityPrefsHasBubble.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Security/securityPrefsHasBubble.tsx index 8b5a423c6..00d491368 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Security/securityPrefsHasBubble.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Security/securityPrefsHasBubble.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' export const securityPrefsHasBubble = (application: WebApplication): boolean => { return application.items.invalidItems.length > 0 diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/WhatsNew/WhatsNew.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/WhatsNew/WhatsNew.tsx index 9b8b2ea01..c8f835746 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/WhatsNew/WhatsNew.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/WhatsNew/WhatsNew.tsx @@ -1,6 +1,6 @@ import PreferencesPane from '../../PreferencesComponents/PreferencesPane' import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { useEffect, useMemo, useState } from 'react' import { Changelog } from '@standardnotes/ui-services' import { LinkButton, Subtitle, Title } from '@/Components/Preferences/PreferencesComponents/Content' diff --git a/packages/web/src/javascripts/Components/Preferences/PreferencesMenu.ts b/packages/web/src/javascripts/Components/Preferences/PreferencesMenu.ts index 1f344d32d..1ebca9152 100644 --- a/packages/web/src/javascripts/Components/Preferences/PreferencesMenu.ts +++ b/packages/web/src/javascripts/Components/Preferences/PreferencesMenu.ts @@ -1,6 +1,6 @@ import { action, makeAutoObservable, observable } from 'mobx' import { IconType } from '@standardnotes/snjs' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { PackageProvider } from './Panes/General/Advanced/Packages/Provider/PackageProvider' import { securityPrefsHasBubble } from './Panes/Security/securityPrefsHasBubble' import { PreferenceId } from '@standardnotes/ui-services' diff --git a/packages/web/src/javascripts/Components/Preferences/PreferencesProps.tsx b/packages/web/src/javascripts/Components/Preferences/PreferencesProps.tsx index 432b06992..27428f76f 100644 --- a/packages/web/src/javascripts/Components/Preferences/PreferencesProps.tsx +++ b/packages/web/src/javascripts/Components/Preferences/PreferencesProps.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { MfaProps } from './Panes/Security/TwoFactorAuth/MfaProps' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' diff --git a/packages/web/src/javascripts/Components/Preferences/PreferencesViewWrapperProps.tsx b/packages/web/src/javascripts/Components/Preferences/PreferencesViewWrapperProps.tsx index 7d9c44f77..33ae0a8f6 100644 --- a/packages/web/src/javascripts/Components/Preferences/PreferencesViewWrapperProps.tsx +++ b/packages/web/src/javascripts/Components/Preferences/PreferencesViewWrapperProps.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' export interface PreferencesViewWrapperProps { diff --git a/packages/web/src/javascripts/Components/PremiumFeaturesModal/PremiumFeaturesModal.tsx b/packages/web/src/javascripts/Components/PremiumFeaturesModal/PremiumFeaturesModal.tsx index 7a87ae7e1..018dd130e 100644 --- a/packages/web/src/javascripts/Components/PremiumFeaturesModal/PremiumFeaturesModal.tsx +++ b/packages/web/src/javascripts/Components/PremiumFeaturesModal/PremiumFeaturesModal.tsx @@ -1,6 +1,6 @@ import AlertDialog from '../AlertDialog/AlertDialog' import { FunctionComponent, useRef } from 'react' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { PremiumFeatureModalType } from './PremiumFeatureModalType' import { FeatureName } from '@/Controllers/FeatureName' import { SuccessPrompt } from './Subviews/SuccessPrompt' diff --git a/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/UpgradePrompt.tsx b/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/UpgradePrompt.tsx index 011155a90..5d2414636 100644 --- a/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/UpgradePrompt.tsx +++ b/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/UpgradePrompt.tsx @@ -1,5 +1,5 @@ import { useCallback } from 'react' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { openSubscriptionDashboard } from '@/Utils/ManageSubscription' import Icon from '@/Components/Icon/Icon' import { PremiumFeatureIconClass, PremiumFeatureIconName } from '@/Components/Icon/PremiumFeatureIcon' diff --git a/packages/web/src/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx b/packages/web/src/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx index 46a715423..828d21504 100644 --- a/packages/web/src/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx +++ b/packages/web/src/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx @@ -1,5 +1,5 @@ import Button from '@/Components/Button/Button' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { PurchaseFlowPane } from '@/Controllers/PurchaseFlow/PurchaseFlowPane' import { observer } from 'mobx-react-lite' diff --git a/packages/web/src/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx b/packages/web/src/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx index c6c9f4d32..0bb907603 100644 --- a/packages/web/src/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx +++ b/packages/web/src/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx @@ -1,5 +1,5 @@ import Button from '@/Components/Button/Button' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { PurchaseFlowPane } from '@/Controllers/PurchaseFlow/PurchaseFlowPane' import { observer } from 'mobx-react-lite' diff --git a/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowFunctions.ts b/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowFunctions.ts index e2ba7bf7a..5b199b29d 100644 --- a/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowFunctions.ts +++ b/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowFunctions.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { isDesktopApplication } from '@/Utils' import { Environment } from '@standardnotes/snjs' import { RouteType } from '@standardnotes/ui-services' diff --git a/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowView.tsx b/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowView.tsx index 2f7ab5c43..d234e7109 100644 --- a/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowView.tsx +++ b/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowView.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { PurchaseFlowPane } from '@/Controllers/PurchaseFlow/PurchaseFlowPane' import { observer } from 'mobx-react-lite' diff --git a/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowWrapperProps.tsx b/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowWrapperProps.tsx index 9947bc014..4f50c7f08 100644 --- a/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowWrapperProps.tsx +++ b/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowWrapperProps.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ViewControllerManager } from '@/Controllers/ViewControllerManager' export type PurchaseFlowWrapperProps = { diff --git a/packages/web/src/javascripts/Components/QuickSettingsMenu/FocusModeSwitch.tsx b/packages/web/src/javascripts/Components/QuickSettingsMenu/FocusModeSwitch.tsx index 17a3ff5f1..dbb7b3a9d 100644 --- a/packages/web/src/javascripts/Components/QuickSettingsMenu/FocusModeSwitch.tsx +++ b/packages/web/src/javascripts/Components/QuickSettingsMenu/FocusModeSwitch.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { FunctionComponent, useCallback, useMemo } from 'react' import { isMobileScreen } from '@/Utils' import { TOGGLE_FOCUS_MODE_COMMAND } from '@standardnotes/ui-services' diff --git a/packages/web/src/javascripts/Components/QuickSettingsMenu/QuickSettingsMenu.tsx b/packages/web/src/javascripts/Components/QuickSettingsMenu/QuickSettingsMenu.tsx index 245f22bf3..9154ab118 100644 --- a/packages/web/src/javascripts/Components/QuickSettingsMenu/QuickSettingsMenu.tsx +++ b/packages/web/src/javascripts/Components/QuickSettingsMenu/QuickSettingsMenu.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ApplicationEvent, ComponentArea, diff --git a/packages/web/src/javascripts/Components/QuickSettingsMenu/ThemesMenuButton.tsx b/packages/web/src/javascripts/Components/QuickSettingsMenu/ThemesMenuButton.tsx index 95f793143..130d95d99 100644 --- a/packages/web/src/javascripts/Components/QuickSettingsMenu/ThemesMenuButton.tsx +++ b/packages/web/src/javascripts/Components/QuickSettingsMenu/ThemesMenuButton.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { FeatureIdentifier, FeatureStatus } from '@standardnotes/snjs' import { FunctionComponent, MouseEventHandler, useCallback, useMemo } from 'react' import Icon from '@/Components/Icon/Icon' diff --git a/packages/web/src/javascripts/Components/RecoveryCodeBanner/RecoveryCodeBanner.tsx b/packages/web/src/javascripts/Components/RecoveryCodeBanner/RecoveryCodeBanner.tsx index bf961cfee..7f0e26ad6 100644 --- a/packages/web/src/javascripts/Components/RecoveryCodeBanner/RecoveryCodeBanner.tsx +++ b/packages/web/src/javascripts/Components/RecoveryCodeBanner/RecoveryCodeBanner.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { useState } from 'react' import Button from '../Button/Button' diff --git a/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalContentPane.tsx b/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalContentPane.tsx index 91828e5c9..2b266f57f 100644 --- a/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalContentPane.tsx +++ b/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalContentPane.tsx @@ -1,7 +1,7 @@ import RevisionContentLocked from './RevisionContentLocked' import SelectedRevisionContent from './SelectedRevisionContent' import { observer } from 'mobx-react-lite' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { NotesController } from '@/Controllers/NotesController/NotesController' import { SubscriptionController } from '@/Controllers/Subscription/SubscriptionController' import { NoteHistoryController, RevisionContentState } from '@/Controllers/NoteHistory/NoteHistoryController' diff --git a/packages/web/src/javascripts/Components/RevisionHistoryModal/RevisionHistoryModalProps.tsx b/packages/web/src/javascripts/Components/RevisionHistoryModal/RevisionHistoryModalProps.tsx index c66cce320..639d3ec29 100644 --- a/packages/web/src/javascripts/Components/RevisionHistoryModal/RevisionHistoryModalProps.tsx +++ b/packages/web/src/javascripts/Components/RevisionHistoryModal/RevisionHistoryModalProps.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { HistoryModalController } from '@/Controllers/NoteHistory/HistoryModalController' import { NotesController } from '@/Controllers/NotesController/NotesController' import { SelectedItemsController } from '@/Controllers/SelectedItemsController' diff --git a/packages/web/src/javascripts/Components/RevisionHistoryModal/SelectedRevisionContent.tsx b/packages/web/src/javascripts/Components/RevisionHistoryModal/SelectedRevisionContent.tsx index ded55e22b..d992e6a29 100644 --- a/packages/web/src/javascripts/Components/RevisionHistoryModal/SelectedRevisionContent.tsx +++ b/packages/web/src/javascripts/Components/RevisionHistoryModal/SelectedRevisionContent.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ContentType, NoteType, SNNote } from '@standardnotes/snjs' import { observer } from 'mobx-react-lite' import { FunctionComponent, useEffect, useMemo } from 'react' diff --git a/packages/web/src/javascripts/Components/SessionsModal/SessionsModal.tsx b/packages/web/src/javascripts/Components/SessionsModal/SessionsModal.tsx index 5d97cadb1..e88ebeccd 100644 --- a/packages/web/src/javascripts/Components/SessionsModal/SessionsModal.tsx +++ b/packages/web/src/javascripts/Components/SessionsModal/SessionsModal.tsx @@ -1,7 +1,7 @@ import { ViewControllerManager } from '@/Controllers/ViewControllerManager' import { SNApplication, SessionStrings, UuidString, SessionListEntry, isErrorResponse } from '@standardnotes/snjs' import { FunctionComponent, useState, useEffect, useRef, useMemo, useCallback } from 'react' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { observer } from 'mobx-react-lite' import Spinner from '@/Components/Spinner/Spinner' import Button from '@/Components/Button/Button' diff --git a/packages/web/src/javascripts/Components/SmartViewBuilder/AddSmartViewModalController.ts b/packages/web/src/javascripts/Components/SmartViewBuilder/AddSmartViewModalController.ts index d6f53c650..ce38f7d78 100644 --- a/packages/web/src/javascripts/Components/SmartViewBuilder/AddSmartViewModalController.ts +++ b/packages/web/src/javascripts/Components/SmartViewBuilder/AddSmartViewModalController.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { CompoundPredicateBuilderController } from '@/Components/SmartViewBuilder/CompoundPredicateBuilderController' import { predicateFromJson, diff --git a/packages/web/src/javascripts/Components/SuperEditor/SuperEditor.tsx b/packages/web/src/javascripts/Components/SuperEditor/SuperEditor.tsx index db87d34d3..d35eae251 100644 --- a/packages/web/src/javascripts/Components/SuperEditor/SuperEditor.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/SuperEditor.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ApplicationEvent, classNames, diff --git a/packages/web/src/javascripts/Components/SuperEditor/SuperNoteImporter.tsx b/packages/web/src/javascripts/Components/SuperEditor/SuperNoteImporter.tsx index 06b8e3230..0582237ee 100644 --- a/packages/web/src/javascripts/Components/SuperEditor/SuperNoteImporter.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/SuperNoteImporter.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { NoteType, SNNote } from '@standardnotes/snjs' import { FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react' import { ErrorBoundary } from '@/Utils/ErrorBoundary' diff --git a/packages/web/src/javascripts/Components/SyncResolutionMenu/SyncResolutionMenu.tsx b/packages/web/src/javascripts/Components/SyncResolutionMenu/SyncResolutionMenu.tsx index 6dffee17e..527867366 100644 --- a/packages/web/src/javascripts/Components/SyncResolutionMenu/SyncResolutionMenu.tsx +++ b/packages/web/src/javascripts/Components/SyncResolutionMenu/SyncResolutionMenu.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { AbstractComponent } from '@/Components/Abstract/PureComponent' type Props = { diff --git a/packages/web/src/javascripts/Components/Tags/Navigation.tsx b/packages/web/src/javascripts/Components/Tags/Navigation.tsx index bea87acc1..024376330 100644 --- a/packages/web/src/javascripts/Components/Tags/Navigation.tsx +++ b/packages/web/src/javascripts/Components/Tags/Navigation.tsx @@ -1,6 +1,6 @@ import SmartViewsSection from '@/Components/Tags/SmartViewsSection' import TagsSection from '@/Components/Tags/TagsSection' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ApplicationEvent, PrefKey, WebAppEvent } from '@standardnotes/snjs' import { observer } from 'mobx-react-lite' import { forwardRef, useEffect, useMemo, useState } from 'react' diff --git a/packages/web/src/javascripts/Components/Tags/SmartViewsSection.tsx b/packages/web/src/javascripts/Components/Tags/SmartViewsSection.tsx index 5e21883cb..fd44bac09 100644 --- a/packages/web/src/javascripts/Components/Tags/SmartViewsSection.tsx +++ b/packages/web/src/javascripts/Components/Tags/SmartViewsSection.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { SMART_TAGS_FEATURE_NAME } from '@/Constants/Constants' import { FeaturesController } from '@/Controllers/FeaturesController' import { NavigationController } from '@/Controllers/Navigation/NavigationController' diff --git a/packages/web/src/javascripts/Controllers/Abstract/AbstractViewController.ts b/packages/web/src/javascripts/Controllers/Abstract/AbstractViewController.ts index ed2fd8021..e55ceda2d 100644 --- a/packages/web/src/javascripts/Controllers/Abstract/AbstractViewController.ts +++ b/packages/web/src/javascripts/Controllers/Abstract/AbstractViewController.ts @@ -1,6 +1,6 @@ import { CrossControllerEvent } from '../CrossControllerEvent' import { InternalEventBusInterface, InternalEventPublishStrategy, removeFromArray } from '@standardnotes/snjs' -import { WebApplication } from '../../Application/Application' +import { WebApplication } from '../../Application/WebApplication' import { Disposer } from '@/Types/Disposer' type ControllerEventObserver = (event: Event, data: EventData) => void diff --git a/packages/web/src/javascripts/Controllers/Abstract/PersistenceService.ts b/packages/web/src/javascripts/Controllers/Abstract/PersistenceService.ts index 61987bfa1..4c4fa167c 100644 --- a/packages/web/src/javascripts/Controllers/Abstract/PersistenceService.ts +++ b/packages/web/src/javascripts/Controllers/Abstract/PersistenceService.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ShouldPersistNoteStateKey } from '@/Components/Preferences/Panes/General/Persistence' import { ApplicationEvent, ContentType, InternalEventBus } from '@standardnotes/snjs' import { PersistedStateValue, StorageKey } from '@standardnotes/ui-services' diff --git a/packages/web/src/javascripts/Controllers/AccountMenu/AccountMenuController.ts b/packages/web/src/javascripts/Controllers/AccountMenu/AccountMenuController.ts index 5188a8c4d..5efd73696 100644 --- a/packages/web/src/javascripts/Controllers/AccountMenu/AccountMenuController.ts +++ b/packages/web/src/javascripts/Controllers/AccountMenu/AccountMenuController.ts @@ -1,7 +1,7 @@ import { destroyAllObjectProperties, isDev } from '@/Utils' import { action, computed, makeObservable, observable, runInAction } from 'mobx' import { ApplicationEvent, ContentType, InternalEventBus, SNNote, SNTag } from '@standardnotes/snjs' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { AccountMenuPane } from '@/Components/AccountMenu/AccountMenuPane' import { AbstractViewController } from '../Abstract/AbstractViewController' diff --git a/packages/web/src/javascripts/Controllers/FeaturesController.ts b/packages/web/src/javascripts/Controllers/FeaturesController.ts index b9bedbace..b8d49bc98 100644 --- a/packages/web/src/javascripts/Controllers/FeaturesController.ts +++ b/packages/web/src/javascripts/Controllers/FeaturesController.ts @@ -1,5 +1,5 @@ import { FeatureName } from './FeatureName' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { PremiumFeatureModalType } from '@/Components/PremiumFeaturesModal/PremiumFeatureModalType' import { destroyAllObjectProperties } from '@/Utils' import { diff --git a/packages/web/src/javascripts/Controllers/FilePreviewModalController.ts b/packages/web/src/javascripts/Controllers/FilePreviewModalController.ts index 4da39ab10..2b8d7907b 100644 --- a/packages/web/src/javascripts/Controllers/FilePreviewModalController.ts +++ b/packages/web/src/javascripts/Controllers/FilePreviewModalController.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ContentType, FileItem } from '@standardnotes/snjs' import { action, makeObservable, observable } from 'mobx' diff --git a/packages/web/src/javascripts/Controllers/FilesController.ts b/packages/web/src/javascripts/Controllers/FilesController.ts index d14e4eb17..027ff08c3 100644 --- a/packages/web/src/javascripts/Controllers/FilesController.ts +++ b/packages/web/src/javascripts/Controllers/FilesController.ts @@ -27,7 +27,7 @@ import { } from '@standardnotes/snjs' import { addToast, dismissToast, ToastType, updateToast } from '@standardnotes/toast' import { action, makeObservable, observable, reaction } from 'mobx' -import { WebApplication } from '../Application/Application' +import { WebApplication } from '../Application/WebApplication' import { AbstractViewController } from './Abstract/AbstractViewController' import { NotesController } from './NotesController/NotesController' import { downloadOrShareBlobBasedOnPlatform } from '@/Utils/DownloadOrShareBasedOnPlatform' diff --git a/packages/web/src/javascripts/Controllers/ImportModalController.ts b/packages/web/src/javascripts/Controllers/ImportModalController.ts index 7564b6e74..d88f62918 100644 --- a/packages/web/src/javascripts/Controllers/ImportModalController.ts +++ b/packages/web/src/javascripts/Controllers/ImportModalController.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { DecryptedTransferPayload, SNTag, TagContent } from '@standardnotes/models' import { ContentType, pluralize, UuidGenerator } from '@standardnotes/snjs' import { Importer, NoteImportType } from '@standardnotes/ui-services' diff --git a/packages/web/src/javascripts/Controllers/ItemList/ItemListController.spec.ts b/packages/web/src/javascripts/Controllers/ItemList/ItemListController.spec.ts index 2dde45732..eb4a88d81 100644 --- a/packages/web/src/javascripts/Controllers/ItemList/ItemListController.spec.ts +++ b/packages/web/src/javascripts/Controllers/ItemList/ItemListController.spec.ts @@ -1,7 +1,7 @@ import { SNTag } from '@standardnotes/snjs' import { ContentType } from '@standardnotes/common' import { InternalEventBus } from '@standardnotes/services' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { LinkingController } from '../LinkingController' import { NavigationController } from '../Navigation/NavigationController' import { NotesController } from '../NotesController/NotesController' diff --git a/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts b/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts index 2972d159c..6dbbf0092 100644 --- a/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts +++ b/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts @@ -24,7 +24,7 @@ import { isSystemView, } from '@standardnotes/snjs' import { action, computed, makeObservable, observable, reaction, runInAction } from 'mobx' -import { WebApplication } from '../../Application/Application' +import { WebApplication } from '../../Application/WebApplication' import { WebDisplayOptions } from './WebDisplayOptions' import { NavigationController } from '../Navigation/NavigationController' import { CrossControllerEvent } from '../CrossControllerEvent' diff --git a/packages/web/src/javascripts/Controllers/LinkingController.spec.ts b/packages/web/src/javascripts/Controllers/LinkingController.spec.ts index 4ecde0585..83b8e1fd0 100644 --- a/packages/web/src/javascripts/Controllers/LinkingController.spec.ts +++ b/packages/web/src/javascripts/Controllers/LinkingController.spec.ts @@ -1,5 +1,5 @@ import { isSearchResultAlreadyLinkedToItem } from '@/Utils/Items/Search/isSearchResultAlreadyLinkedToItem' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { doesItemMatchSearchQuery } from '@/Utils/Items/Search/doesItemMatchSearchQuery' import { AnonymousReference, diff --git a/packages/web/src/javascripts/Controllers/LinkingController.tsx b/packages/web/src/javascripts/Controllers/LinkingController.tsx index 43b43c933..c844e0c81 100644 --- a/packages/web/src/javascripts/Controllers/LinkingController.tsx +++ b/packages/web/src/javascripts/Controllers/LinkingController.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { FileItemActionType } from '@/Components/AttachedFilesPopover/PopoverFileItemAction' import { NoteViewController } from '@/Components/NoteView/Controller/NoteViewController' import { AppPaneId } from '@/Components/Panes/AppPaneMetadata' diff --git a/packages/web/src/javascripts/Controllers/Moments/MomentsService.ts b/packages/web/src/javascripts/Controllers/Moments/MomentsService.ts index 26c870b81..13b900a79 100644 --- a/packages/web/src/javascripts/Controllers/Moments/MomentsService.ts +++ b/packages/web/src/javascripts/Controllers/Moments/MomentsService.ts @@ -5,7 +5,7 @@ import { FileItem, PrefKey, sleep, SNTag } from '@standardnotes/snjs' import { FilesController } from '../FilesController' import { action, makeObservable, observable } from 'mobx' import { AbstractViewController } from '@/Controllers/Abstract/AbstractViewController' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { dateToStringStyle1 } from '@/Utils/DateUtils' import { PhotoRecorder } from './PhotoRecorder' diff --git a/packages/web/src/javascripts/Controllers/Navigation/NavigationController.ts b/packages/web/src/javascripts/Controllers/Navigation/NavigationController.ts index df418f412..0a2850af7 100644 --- a/packages/web/src/javascripts/Controllers/Navigation/NavigationController.ts +++ b/packages/web/src/javascripts/Controllers/Navigation/NavigationController.ts @@ -17,7 +17,7 @@ import { PrefKey, } from '@standardnotes/snjs' import { action, computed, makeAutoObservable, makeObservable, observable, reaction, runInAction } from 'mobx' -import { WebApplication } from '../../Application/Application' +import { WebApplication } from '../../Application/WebApplication' import { FeaturesController } from '../FeaturesController' import { destroyAllObjectProperties } from '@/Utils' import { isValidFutureSiblings, rootTags, tagSiblings } from './Utils' diff --git a/packages/web/src/javascripts/Controllers/NoAccountWarningController.ts b/packages/web/src/javascripts/Controllers/NoAccountWarningController.ts index f3a5a9ce0..77c80b039 100644 --- a/packages/web/src/javascripts/Controllers/NoAccountWarningController.ts +++ b/packages/web/src/javascripts/Controllers/NoAccountWarningController.ts @@ -1,7 +1,7 @@ import { storage, StorageKey } from '@standardnotes/ui-services' import { ApplicationEvent, InternalEventBus } from '@standardnotes/snjs' import { runInAction, makeObservable, observable, action } from 'mobx' -import { WebApplication } from '../Application/Application' +import { WebApplication } from '../Application/WebApplication' import { AbstractViewController } from './Abstract/AbstractViewController' export class NoAccountWarningController extends AbstractViewController { diff --git a/packages/web/src/javascripts/Controllers/NoteHistory/HistoryModalController.ts b/packages/web/src/javascripts/Controllers/NoteHistory/HistoryModalController.ts index 945277c29..58ca4b002 100644 --- a/packages/web/src/javascripts/Controllers/NoteHistory/HistoryModalController.ts +++ b/packages/web/src/javascripts/Controllers/NoteHistory/HistoryModalController.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { InternalEventBus, SNNote } from '@standardnotes/snjs' import { OPEN_NOTE_HISTORY_COMMAND } from '@standardnotes/ui-services' import { action, makeObservable, observable } from 'mobx' diff --git a/packages/web/src/javascripts/Controllers/NoteHistory/NoteHistoryController.ts b/packages/web/src/javascripts/Controllers/NoteHistory/NoteHistoryController.ts index 4616ce862..e3ea4e779 100644 --- a/packages/web/src/javascripts/Controllers/NoteHistory/NoteHistoryController.ts +++ b/packages/web/src/javascripts/Controllers/NoteHistory/NoteHistoryController.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { RevisionType } from '@/Components/RevisionHistoryModal/RevisionType' import { LegacyHistoryEntry, diff --git a/packages/web/src/javascripts/Controllers/NoteSyncController.ts b/packages/web/src/javascripts/Controllers/NoteSyncController.ts index 7ededf4d8..225c1c17a 100644 --- a/packages/web/src/javascripts/Controllers/NoteSyncController.ts +++ b/packages/web/src/javascripts/Controllers/NoteSyncController.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { NoteMutator, SNNote } from '@standardnotes/models' import { InfoStrings } from '@standardnotes/snjs' import { Deferred } from '@standardnotes/utils' diff --git a/packages/web/src/javascripts/Controllers/NotesController/NotesController.ts b/packages/web/src/javascripts/Controllers/NotesController/NotesController.ts index 368cc8f40..de1c0fea2 100644 --- a/packages/web/src/javascripts/Controllers/NotesController/NotesController.ts +++ b/packages/web/src/javascripts/Controllers/NotesController/NotesController.ts @@ -12,7 +12,7 @@ import { ApplicationEvent, } from '@standardnotes/snjs' import { makeObservable, observable, action, computed, runInAction } from 'mobx' -import { WebApplication } from '../../Application/Application' +import { WebApplication } from '../../Application/WebApplication' import { AbstractViewController } from '../Abstract/AbstractViewController' import { SelectedItemsController } from '../SelectedItemsController' import { ItemListController } from '../ItemList/ItemListController' diff --git a/packages/web/src/javascripts/Controllers/PaneController/PaneController.ts b/packages/web/src/javascripts/Controllers/PaneController/PaneController.ts index a2a527e1f..31c1c16d6 100644 --- a/packages/web/src/javascripts/Controllers/PaneController/PaneController.ts +++ b/packages/web/src/javascripts/Controllers/PaneController/PaneController.ts @@ -9,7 +9,7 @@ import { isMobileScreen } from '@/Utils' import { makeObservable, observable, action, computed } from 'mobx' import { Disposer } from '@/Types/Disposer' import { MediaQueryBreakpoints } from '@/Hooks/useMediaQuery' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { AbstractViewController } from '../Abstract/AbstractViewController' import { PrefDefaults } from '@/Constants/PrefDefaults' import { log, LoggingDomain } from '@/Logging' diff --git a/packages/web/src/javascripts/Controllers/PaneController/panesForLayout.ts b/packages/web/src/javascripts/Controllers/PaneController/panesForLayout.ts index 9543fe250..13a8a467e 100644 --- a/packages/web/src/javascripts/Controllers/PaneController/panesForLayout.ts +++ b/packages/web/src/javascripts/Controllers/PaneController/panesForLayout.ts @@ -1,6 +1,6 @@ import { AppPaneId } from '../../Components/Panes/AppPaneMetadata' import { PaneLayout } from './PaneLayout' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { getIsTabletOrMobileScreen } from '@/Hooks/useIsTabletOrMobileScreen' export function panesForLayout(layout: PaneLayout, application: WebApplication): AppPaneId[] { diff --git a/packages/web/src/javascripts/Controllers/PreferencesController.ts b/packages/web/src/javascripts/Controllers/PreferencesController.ts index 4e0c823ac..2a5feed23 100644 --- a/packages/web/src/javascripts/Controllers/PreferencesController.ts +++ b/packages/web/src/javascripts/Controllers/PreferencesController.ts @@ -2,7 +2,7 @@ import { InternalEventBus } from '@standardnotes/snjs' import { action, computed, makeObservable, observable } from 'mobx' import { PreferenceId, RootQueryParam } from '@standardnotes/ui-services' import { AbstractViewController } from './Abstract/AbstractViewController' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' const DEFAULT_PANE: PreferenceId = 'account' diff --git a/packages/web/src/javascripts/Controllers/PurchaseFlow/PurchaseFlowController.ts b/packages/web/src/javascripts/Controllers/PurchaseFlow/PurchaseFlowController.ts index 6782594ff..9d5be73d7 100644 --- a/packages/web/src/javascripts/Controllers/PurchaseFlow/PurchaseFlowController.ts +++ b/packages/web/src/javascripts/Controllers/PurchaseFlow/PurchaseFlowController.ts @@ -2,7 +2,7 @@ import { LoggingDomain, log } from '@/Logging' import { loadPurchaseFlowUrl } from '@/Components/PurchaseFlow/PurchaseFlowFunctions' import { InternalEventBus, AppleIAPProductId } from '@standardnotes/snjs' import { action, makeObservable, observable } from 'mobx' -import { WebApplication } from '../../Application/Application' +import { WebApplication } from '../../Application/WebApplication' import { AbstractViewController } from '../Abstract/AbstractViewController' import { PurchaseFlowPane } from './PurchaseFlowPane' diff --git a/packages/web/src/javascripts/Controllers/QuickSettingsController.ts b/packages/web/src/javascripts/Controllers/QuickSettingsController.ts index 99e989b49..8bf5fc660 100644 --- a/packages/web/src/javascripts/Controllers/QuickSettingsController.ts +++ b/packages/web/src/javascripts/Controllers/QuickSettingsController.ts @@ -1,5 +1,5 @@ import { InternalEventBus } from '@standardnotes/snjs' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { action, makeObservable, observable } from 'mobx' import { AbstractViewController } from './Abstract/AbstractViewController' diff --git a/packages/web/src/javascripts/Controllers/SearchOptionsController.ts b/packages/web/src/javascripts/Controllers/SearchOptionsController.ts index 3f7d7914e..ce0aa85ba 100644 --- a/packages/web/src/javascripts/Controllers/SearchOptionsController.ts +++ b/packages/web/src/javascripts/Controllers/SearchOptionsController.ts @@ -1,6 +1,6 @@ import { ApplicationEvent, InternalEventBus } from '@standardnotes/snjs' import { makeObservable, observable, action, runInAction } from 'mobx' -import { WebApplication } from '../Application/Application' +import { WebApplication } from '../Application/WebApplication' import { AbstractViewController } from './Abstract/AbstractViewController' export class SearchOptionsController extends AbstractViewController { diff --git a/packages/web/src/javascripts/Controllers/SelectedItemsController.ts b/packages/web/src/javascripts/Controllers/SelectedItemsController.ts index b832481af..6c4e48a73 100644 --- a/packages/web/src/javascripts/Controllers/SelectedItemsController.ts +++ b/packages/web/src/javascripts/Controllers/SelectedItemsController.ts @@ -15,7 +15,7 @@ import { } from '@standardnotes/snjs' import { SelectionControllerPersistableValue } from '@standardnotes/ui-services' import { action, computed, makeObservable, observable, reaction, runInAction } from 'mobx' -import { WebApplication } from '../Application/Application' +import { WebApplication } from '../Application/WebApplication' import { AbstractViewController } from './Abstract/AbstractViewController' import { Persistable } from './Abstract/Persistable' import { CrossControllerEvent } from './CrossControllerEvent' diff --git a/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts b/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts index c52da0f08..1b303ebc4 100644 --- a/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts +++ b/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts @@ -9,7 +9,7 @@ import { SubscriptionClientInterface, } from '@standardnotes/snjs' import { action, computed, makeObservable, observable, runInAction } from 'mobx' -import { WebApplication } from '../../Application/Application' +import { WebApplication } from '../../Application/WebApplication' import { AbstractViewController } from '../Abstract/AbstractViewController' import { AvailableSubscriptions } from './AvailableSubscriptionsType' import { Subscription } from './SubscriptionType' diff --git a/packages/web/src/javascripts/Controllers/ViewControllerManager.ts b/packages/web/src/javascripts/Controllers/ViewControllerManager.ts index 832147323..9a3d2fcf6 100644 --- a/packages/web/src/javascripts/Controllers/ViewControllerManager.ts +++ b/packages/web/src/javascripts/Controllers/ViewControllerManager.ts @@ -7,7 +7,7 @@ import { ToastService, ToastServiceInterface, } from '@standardnotes/ui-services' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { AccountMenuController } from '@/Controllers/AccountMenu/AccountMenuController' import { destroyAllObjectProperties } from '@/Utils' import { diff --git a/packages/web/src/javascripts/Event/ApplicationEventObserver.spec.ts b/packages/web/src/javascripts/Event/ApplicationEventObserver.spec.ts index a46b1719d..8a2beef61 100644 --- a/packages/web/src/javascripts/Event/ApplicationEventObserver.spec.ts +++ b/packages/web/src/javascripts/Event/ApplicationEventObserver.spec.ts @@ -28,7 +28,7 @@ import { SyncStatusController } from '@/Controllers/SyncStatusController' import { AccountMenuPane } from '@/Components/AccountMenu/AccountMenuPane' import { ApplicationEventObserver, JoinWorkspaceSuccessString } from './ApplicationEventObserver' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' describe('ApplicationEventObserver', () => { let application: WebApplication diff --git a/packages/web/src/javascripts/Event/ApplicationEventObserver.ts b/packages/web/src/javascripts/Event/ApplicationEventObserver.ts index f3468b044..062b63f85 100644 --- a/packages/web/src/javascripts/Event/ApplicationEventObserver.ts +++ b/packages/web/src/javascripts/Event/ApplicationEventObserver.ts @@ -21,7 +21,7 @@ import { SyncStatusController } from '@/Controllers/SyncStatusController' import { AccountMenuPane } from '@/Components/AccountMenu/AccountMenuPane' import { EventObserverInterface } from './EventObserverInterface' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' export const JoinWorkspaceSuccessString = 'Successfully joined a shared subscription.' diff --git a/packages/web/src/javascripts/Hooks/useIsTabletOrMobileScreen.tsx b/packages/web/src/javascripts/Hooks/useIsTabletOrMobileScreen.tsx index ab6d92bb6..db948ed1c 100644 --- a/packages/web/src/javascripts/Hooks/useIsTabletOrMobileScreen.tsx +++ b/packages/web/src/javascripts/Hooks/useIsTabletOrMobileScreen.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { useApplication } from '@/Components/ApplicationProvider' import { debounce, isMobileScreen, isTabletOrMobileScreen, isTabletScreen } from '@/Utils' import { useEffect, useState } from 'react' diff --git a/packages/web/src/javascripts/Hooks/usePremiumModal.tsx b/packages/web/src/javascripts/Hooks/usePremiumModal.tsx index 0266226c2..2979f28a5 100644 --- a/packages/web/src/javascripts/Hooks/usePremiumModal.tsx +++ b/packages/web/src/javascripts/Hooks/usePremiumModal.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { observer } from 'mobx-react-lite' import { FunctionComponent, createContext, useCallback, useContext, ReactNode } from 'react' import PremiumFeaturesModal from '@/Components/PremiumFeaturesModal/PremiumFeaturesModal' diff --git a/packages/web/src/javascripts/NativeMobileWeb/DownloadBlobOnAndroid.tsx b/packages/web/src/javascripts/NativeMobileWeb/DownloadBlobOnAndroid.tsx index 324b51f85..1f0c3d00c 100644 --- a/packages/web/src/javascripts/NativeMobileWeb/DownloadBlobOnAndroid.tsx +++ b/packages/web/src/javascripts/NativeMobileWeb/DownloadBlobOnAndroid.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { getBase64FromBlob } from '@/Utils' import { Platform } from '@standardnotes/snjs' import { addToast, ToastType, dismissToast } from '@standardnotes/toast' diff --git a/packages/web/src/javascripts/NativeMobileWeb/DownloadSelectedNotesOnAndroid.tsx b/packages/web/src/javascripts/NativeMobileWeb/DownloadSelectedNotesOnAndroid.tsx index 69808b13c..3dd623d92 100644 --- a/packages/web/src/javascripts/NativeMobileWeb/DownloadSelectedNotesOnAndroid.tsx +++ b/packages/web/src/javascripts/NativeMobileWeb/DownloadSelectedNotesOnAndroid.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { getNoteBlob, getNoteFileName } from '@/Utils/NoteExportUtils' import { parseFileName } from '@standardnotes/filepicker' import { Platform, SNNote } from '@standardnotes/snjs' diff --git a/packages/web/src/javascripts/NativeMobileWeb/ShareBlobOnMobile.ts b/packages/web/src/javascripts/NativeMobileWeb/ShareBlobOnMobile.ts index 8ddbafa88..92bf8bad6 100644 --- a/packages/web/src/javascripts/NativeMobileWeb/ShareBlobOnMobile.ts +++ b/packages/web/src/javascripts/NativeMobileWeb/ShareBlobOnMobile.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { getBase64FromBlob } from '@/Utils' export const shareBlobOnMobile = async (application: WebApplication, blob: Blob, filename: string) => { diff --git a/packages/web/src/javascripts/NativeMobileWeb/ShareSelectedNotes.tsx b/packages/web/src/javascripts/NativeMobileWeb/ShareSelectedNotes.tsx index a71aa7016..671afdda6 100644 --- a/packages/web/src/javascripts/NativeMobileWeb/ShareSelectedNotes.tsx +++ b/packages/web/src/javascripts/NativeMobileWeb/ShareSelectedNotes.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { getNoteBlob, getNoteFileName } from '@/Utils/NoteExportUtils' import { parseFileName } from '@standardnotes/filepicker' import { SNNote } from '@standardnotes/snjs' diff --git a/packages/web/src/javascripts/NativeMobileWeb/useAndroidBackHandler.tsx b/packages/web/src/javascripts/NativeMobileWeb/useAndroidBackHandler.tsx index be291f478..b78ac443a 100644 --- a/packages/web/src/javascripts/NativeMobileWeb/useAndroidBackHandler.tsx +++ b/packages/web/src/javascripts/NativeMobileWeb/useAndroidBackHandler.tsx @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { AndroidConfirmBeforeExitKey } from '@/Components/Preferences/Panes/General/Defaults' import { observer } from 'mobx-react-lite' import { createContext, memo, ReactNode, useCallback, useContext, useEffect } from 'react' diff --git a/packages/web/src/javascripts/Utils/DownloadOrShareBasedOnPlatform.ts b/packages/web/src/javascripts/Utils/DownloadOrShareBasedOnPlatform.ts index af3b182d8..4ebd00395 100644 --- a/packages/web/src/javascripts/Utils/DownloadOrShareBasedOnPlatform.ts +++ b/packages/web/src/javascripts/Utils/DownloadOrShareBasedOnPlatform.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { downloadBlobOnAndroid } from '@/NativeMobileWeb/DownloadBlobOnAndroid' import { shareBlobOnMobile } from '@/NativeMobileWeb/ShareBlobOnMobile' import { Platform } from '@standardnotes/snjs' diff --git a/packages/web/src/javascripts/Utils/DragTypeCheck.ts b/packages/web/src/javascripts/Utils/DragTypeCheck.ts index 9c1d3a309..d24a53ee2 100644 --- a/packages/web/src/javascripts/Utils/DragTypeCheck.ts +++ b/packages/web/src/javascripts/Utils/DragTypeCheck.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' const isBackupRelatedFile = (item: DataTransferItem, application: WebApplication): boolean => { const fileName = item.getAsFile()?.name || '' diff --git a/packages/web/src/javascripts/Utils/DropdownItemsForEditors.ts b/packages/web/src/javascripts/Utils/DropdownItemsForEditors.ts index 623ae8c29..74a689561 100644 --- a/packages/web/src/javascripts/Utils/DropdownItemsForEditors.ts +++ b/packages/web/src/javascripts/Utils/DropdownItemsForEditors.ts @@ -1,6 +1,6 @@ import { FeatureIdentifier, FeatureStatus } from '@standardnotes/snjs' import { ComponentArea, NoteType } from '@standardnotes/features' -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { PlainEditorMetadata, SuperEditorMetadata } from '@/Constants/Constants' import { getIconAndTintForNoteType } from './Items/Icons/getIconAndTintForNoteType' import { DropdownItem } from '@/Components/Dropdown/DropdownItem' diff --git a/packages/web/src/javascripts/Utils/NoteExportUtils.ts b/packages/web/src/javascripts/Utils/NoteExportUtils.ts index 7b1f278aa..1f1f5471a 100644 --- a/packages/web/src/javascripts/Utils/NoteExportUtils.ts +++ b/packages/web/src/javascripts/Utils/NoteExportUtils.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { InvisibleSuperConverter } from '@/Components/SuperEditor/Tools/InvisibleMarkdownConverter' import { NoteType, PrefKey, SNNote } from '@standardnotes/snjs' diff --git a/packages/web/src/javascripts/Utils/createEditorMenuGroups.ts b/packages/web/src/javascripts/Utils/createEditorMenuGroups.ts index c0152ccf5..312447b30 100644 --- a/packages/web/src/javascripts/Utils/createEditorMenuGroups.ts +++ b/packages/web/src/javascripts/Utils/createEditorMenuGroups.ts @@ -1,4 +1,4 @@ -import { WebApplication } from '@/Application/Application' +import { WebApplication } from '@/Application/WebApplication' import { ContentType, FeatureStatus,