diff --git a/app/assets/javascripts/App.tsx b/app/assets/javascripts/App.tsx index 1222efb87..1f13151db 100644 --- a/app/assets/javascripts/App.tsx +++ b/app/assets/javascripts/App.tsx @@ -23,7 +23,7 @@ declare global { import { IsWebPlatform, WebAppVersion } from '@/Version' import { DesktopManagerInterface, SNLog } from '@standardnotes/snjs' import { render } from 'preact' -import { ApplicationGroupView } from './Components/ApplicationGroupView' +import { ApplicationGroupView } from './Components/ApplicationGroupView/ApplicationGroupView' import { WebDevice } from './Device/WebDevice' import { StartApplication } from './Device/StartApplication' import { ApplicationGroup } from './UIModels/ApplicationGroup' diff --git a/app/assets/javascripts/Components/AccountMenu/index.tsx b/app/assets/javascripts/Components/AccountMenu/AccountMenu.tsx similarity index 100% rename from app/assets/javascripts/Components/AccountMenu/index.tsx rename to app/assets/javascripts/Components/AccountMenu/AccountMenu.tsx diff --git a/app/assets/javascripts/Components/AccountMenu/AdvancedOptions.tsx b/app/assets/javascripts/Components/AccountMenu/AdvancedOptions.tsx index 7aa70e5dc..03ae5f2ea 100644 --- a/app/assets/javascripts/Components/AccountMenu/AdvancedOptions.tsx +++ b/app/assets/javascripts/Components/AccountMenu/AdvancedOptions.tsx @@ -3,9 +3,9 @@ import { AppState } from '@/UIModels/AppState' import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useCallback, useEffect, useState } from 'preact/hooks' -import { Checkbox } from '@/Components/Checkbox' +import { Checkbox } from '@/Components/Checkbox/Checkbox' import { DecoratedInput } from '@/Components/Input/DecoratedInput' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' type Props = { application: WebApplication diff --git a/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx b/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx index 67774a613..659cf87a1 100644 --- a/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx +++ b/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx @@ -4,11 +4,11 @@ import { AppState } from '@/UIModels/AppState' import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' -import { AccountMenuPane } from '.' +import { AccountMenuPane } from './AccountMenu' import { Button } from '@/Components/Button/Button' -import { Checkbox } from '@/Components/Checkbox' +import { Checkbox } from '@/Components/Checkbox/Checkbox' import { DecoratedPasswordInput } from '@/Components/Input/DecoratedPasswordInput' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { IconButton } from '@/Components/Button/IconButton' type Props = { diff --git a/app/assets/javascripts/Components/AccountMenu/CreateAccount.tsx b/app/assets/javascripts/Components/AccountMenu/CreateAccount.tsx index 23ee0be3b..8b5e38456 100644 --- a/app/assets/javascripts/Components/AccountMenu/CreateAccount.tsx +++ b/app/assets/javascripts/Components/AccountMenu/CreateAccount.tsx @@ -3,11 +3,11 @@ import { AppState } from '@/UIModels/AppState' import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { StateUpdater, useCallback, useEffect, useRef, useState } from 'preact/hooks' -import { AccountMenuPane } from '.' +import { AccountMenuPane } from './AccountMenu' import { Button } from '@/Components/Button/Button' import { DecoratedInput } from '@/Components/Input/DecoratedInput' import { DecoratedPasswordInput } from '@/Components/Input/DecoratedPasswordInput' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { IconButton } from '@/Components/Button/IconButton' import { AdvancedOptions } from './AdvancedOptions' diff --git a/app/assets/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx b/app/assets/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx index 48f6c2509..8d41d281e 100644 --- a/app/assets/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx +++ b/app/assets/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx @@ -1,12 +1,12 @@ import { WebApplication } from '@/UIModels/Application' import { AppState } from '@/UIModels/AppState' import { observer } from 'mobx-react-lite' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { formatLastSyncDate } from '@/Components/Preferences/Panes/Account/Sync' import { SyncQueueStrategy } from '@standardnotes/snjs' import { STRING_GENERIC_SYNC_ERROR } from '@/Strings' import { useCallback, useMemo, useState } from 'preact/hooks' -import { AccountMenuPane } from '.' +import { AccountMenuPane } from './AccountMenu' import { FunctionComponent } from 'preact' import { Menu } from '@/Components/Menu/Menu' import { MenuItem, MenuItemSeparator, MenuItemType } from '@/Components/Menu/MenuItem' diff --git a/app/assets/javascripts/Components/AccountMenu/SignIn.tsx b/app/assets/javascripts/Components/AccountMenu/SignIn.tsx index f03e0949e..ebe5f6e98 100644 --- a/app/assets/javascripts/Components/AccountMenu/SignIn.tsx +++ b/app/assets/javascripts/Components/AccountMenu/SignIn.tsx @@ -4,12 +4,12 @@ import { isDev } from '@/Utils' import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' -import { AccountMenuPane } from '.' +import { AccountMenuPane } from './AccountMenu' import { Button } from '@/Components/Button/Button' -import { Checkbox } from '@/Components/Checkbox' +import { Checkbox } from '@/Components/Checkbox/Checkbox' import { DecoratedInput } from '@/Components/Input/DecoratedInput' import { DecoratedPasswordInput } from '@/Components/Input/DecoratedPasswordInput' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { IconButton } from '@/Components/Button/IconButton' import { AdvancedOptions } from './AdvancedOptions' diff --git a/app/assets/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx b/app/assets/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx index 065785670..893842aa1 100644 --- a/app/assets/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx +++ b/app/assets/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { MenuItem, MenuItemType } from '@/Components/Menu/MenuItem' import { KeyboardKey } from '@/Services/IOService' import { ApplicationDescriptor } from '@standardnotes/snjs' diff --git a/app/assets/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx b/app/assets/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx index 9b49e1ebd..f9300e65f 100644 --- a/app/assets/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx +++ b/app/assets/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx @@ -4,7 +4,7 @@ import { ApplicationDescriptor, ApplicationGroupEvent, ButtonType } from '@stand import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useCallback, useEffect, useState } from 'preact/hooks' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { Menu } from '@/Components/Menu/Menu' import { MenuItem, MenuItemSeparator, MenuItemType } from '@/Components/Menu/MenuItem' import { WorkspaceMenuItem } from './WorkspaceMenuItem' diff --git a/app/assets/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx b/app/assets/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx index a8881180c..312669ff2 100644 --- a/app/assets/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx +++ b/app/assets/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx @@ -5,7 +5,7 @@ import { calculateSubmenuStyle, SubmenuStyle } from '@/Utils/CalculateSubmenuSty import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { WorkspaceSwitcherMenu } from './WorkspaceSwitcherMenu' type Props = { diff --git a/app/assets/javascripts/Components/ApplicationGroupView/index.tsx b/app/assets/javascripts/Components/ApplicationGroupView/ApplicationGroupView.tsx similarity index 98% rename from app/assets/javascripts/Components/ApplicationGroupView/index.tsx rename to app/assets/javascripts/Components/ApplicationGroupView/ApplicationGroupView.tsx index f486a924c..498c070c4 100644 --- a/app/assets/javascripts/Components/ApplicationGroupView/index.tsx +++ b/app/assets/javascripts/Components/ApplicationGroupView/ApplicationGroupView.tsx @@ -1,7 +1,7 @@ import { ApplicationGroup } from '@/UIModels/ApplicationGroup' import { WebApplication } from '@/UIModels/Application' import { Component } from 'preact' -import { ApplicationView } from '@/Components/ApplicationView' +import { ApplicationView } from '@/Components/ApplicationView/ApplicationView' import { WebOrDesktopDevice } from '@/Device/WebOrDesktopDevice' import { ApplicationGroupEvent, Runtime, ApplicationGroupEventData, DeinitSource } from '@standardnotes/snjs' import { unmountComponentAtNode, findDOMNode } from 'preact/compat' diff --git a/app/assets/javascripts/Components/ApplicationView/index.tsx b/app/assets/javascripts/Components/ApplicationView/ApplicationView.tsx similarity index 94% rename from app/assets/javascripts/Components/ApplicationView/index.tsx rename to app/assets/javascripts/Components/ApplicationView/ApplicationView.tsx index 80f6d1def..2d1d23f3f 100644 --- a/app/assets/javascripts/Components/ApplicationView/index.tsx +++ b/app/assets/javascripts/Components/ApplicationView/ApplicationView.tsx @@ -5,20 +5,20 @@ import { ApplicationEvent, Challenge, PermissionDialog, removeFromArray } from ' import { PANEL_NAME_NOTES, PANEL_NAME_NAVIGATION } from '@/Constants' import { alertDialog } from '@/Services/AlertService' import { WebApplication } from '@/UIModels/Application' -import { Navigation } from '@/Components/Navigation' -import { NotesView } from '@/Components/NotesView' -import { NoteGroupView } from '@/Components/NoteGroupView' -import { Footer } from '@/Components/Footer' +import { Navigation } from '@/Components/Navigation/Navigation' +import { NotesView } from '@/Components/NotesView/NotesView' +import { NoteGroupView } from '@/Components/NoteGroupView/NoteGroupView' +import { Footer } from '@/Components/Footer/Footer' import { SessionsModal } from '@/Components/SessionsModal' import { PreferencesViewWrapper } from '@/Components/Preferences/PreferencesViewWrapper' import { ChallengeModal } from '@/Components/ChallengeModal/ChallengeModal' -import { NotesContextMenu } from '@/Components/NotesContextMenu' +import { NotesContextMenu } from '@/Components/NotesContextMenu/NotesContextMenu' import { PurchaseFlowWrapper } from '@/Components/PurchaseFlow/PurchaseFlowWrapper' import { render, FunctionComponent } from 'preact' -import { PermissionsModal } from '@/Components/PermissionsModal' +import { PermissionsModal } from '@/Components/PermissionsModal/PermissionsModal' import { RevisionHistoryModalWrapper } from '@/Components/RevisionHistoryModal/RevisionHistoryModalWrapper' import { PremiumModalProvider } from '@/Hooks/usePremiumModal' -import { ConfirmSignoutContainer } from '@/Components/ConfirmSignoutModal' +import { ConfirmSignoutContainer } from '@/Components/ConfirmSignoutModal/ConfirmSignoutModal' import { TagsContextMenu } from '@/Components/Tags/TagContextMenu' import { ToastContainer } from '@standardnotes/stylekit' import { FilePreviewModal } from '../Files/FilePreviewModal' diff --git a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx index 988dd2b6a..4cd469e54 100644 --- a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx +++ b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx @@ -6,7 +6,7 @@ import VisuallyHidden from '@reach/visually-hidden' import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { useCloseOnBlur } from '@/Hooks/useCloseOnBlur' import { ChallengeReason, CollectionSort, ContentType, FileItem, SNNote } from '@standardnotes/snjs' import { confirmDialog } from '@/Services/AlertService' diff --git a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx index 6c978617e..6bf91dce8 100644 --- a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx +++ b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx @@ -7,7 +7,7 @@ import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { StateUpdater, useRef, useState } from 'preact/hooks' import { Button } from '@/Components/Button/Button' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { PopoverFileItem } from './PopoverFileItem' import { PopoverFileItemAction, PopoverFileItemActionType } from './PopoverFileItemAction' import { PopoverTabs } from './PopoverTabs' diff --git a/app/assets/javascripts/Components/AttachedFilesPopover/PopoverFileItem.tsx b/app/assets/javascripts/Components/AttachedFilesPopover/PopoverFileItem.tsx index 1516b4f3a..df0881ebe 100644 --- a/app/assets/javascripts/Components/AttachedFilesPopover/PopoverFileItem.tsx +++ b/app/assets/javascripts/Components/AttachedFilesPopover/PopoverFileItem.tsx @@ -4,7 +4,7 @@ import { formatSizeToReadableString } from '@standardnotes/filepicker' import { IconType, FileItem } from '@standardnotes/snjs' import { FunctionComponent } from 'preact' import { useEffect, useRef, useState } from 'preact/hooks' -import { Icon, ICONS } from '@/Components/Icon' +import { Icon, ICONS } from '@/Components/Icon/Icon' import { PopoverFileItemAction, PopoverFileItemActionType } from './PopoverFileItemAction' import { PopoverFileSubmenu } from './PopoverFileSubmenu' diff --git a/app/assets/javascripts/Components/AttachedFilesPopover/PopoverFileSubmenu.tsx b/app/assets/javascripts/Components/AttachedFilesPopover/PopoverFileSubmenu.tsx index 649ab903c..1963b9fca 100644 --- a/app/assets/javascripts/Components/AttachedFilesPopover/PopoverFileSubmenu.tsx +++ b/app/assets/javascripts/Components/AttachedFilesPopover/PopoverFileSubmenu.tsx @@ -3,7 +3,7 @@ import { calculateSubmenuStyle, SubmenuStyle } from '@/Utils/CalculateSubmenuSty import { Disclosure, DisclosureButton, DisclosurePanel } from '@reach/disclosure' import { FunctionComponent } from 'preact' import { StateUpdater, useCallback, useEffect, useRef, useState } from 'preact/hooks' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { Switch } from '@/Components/Switch' import { useCloseOnBlur } from '@/Hooks/useCloseOnBlur' import { PopoverFileItemProps } from './PopoverFileItem' diff --git a/app/assets/javascripts/Components/Bubble/index.tsx b/app/assets/javascripts/Components/Bubble/Bubble.tsx similarity index 100% rename from app/assets/javascripts/Components/Bubble/index.tsx rename to app/assets/javascripts/Components/Bubble/Bubble.tsx diff --git a/app/assets/javascripts/Components/Button/IconButton.tsx b/app/assets/javascripts/Components/Button/IconButton.tsx index 62180d5bb..95b45a4d2 100644 --- a/app/assets/javascripts/Components/Button/IconButton.tsx +++ b/app/assets/javascripts/Components/Button/IconButton.tsx @@ -1,5 +1,5 @@ import { FunctionComponent } from 'preact' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { IconType } from '@standardnotes/snjs' interface Props { diff --git a/app/assets/javascripts/Components/Button/RoundIconButton.tsx b/app/assets/javascripts/Components/Button/RoundIconButton.tsx index 55882f655..31bb848c5 100644 --- a/app/assets/javascripts/Components/Button/RoundIconButton.tsx +++ b/app/assets/javascripts/Components/Button/RoundIconButton.tsx @@ -1,5 +1,5 @@ import { FunctionComponent } from 'preact' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { IconType } from '@standardnotes/snjs' type ButtonType = 'normal' | 'primary' diff --git a/app/assets/javascripts/Components/ChallengeModal/ChallengeModal.tsx b/app/assets/javascripts/Components/ChallengeModal/ChallengeModal.tsx index 93c4586f4..b29e8edce 100644 --- a/app/assets/javascripts/Components/ChallengeModal/ChallengeModal.tsx +++ b/app/assets/javascripts/Components/ChallengeModal/ChallengeModal.tsx @@ -12,7 +12,7 @@ import { ProtectedIllustration } from '@standardnotes/icons' import { FunctionComponent } from 'preact' import { useCallback, useEffect, useState } from 'preact/hooks' import { Button } from '@/Components/Button/Button' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { ChallengeModalPrompt } from './ChallengePrompt' import { LockscreenWorkspaceSwitcher } from './LockscreenWorkspaceSwitcher' import { ApplicationGroup } from '@/UIModels/ApplicationGroup' diff --git a/app/assets/javascripts/Components/ChallengeModal/LockscreenWorkspaceSwitcher.tsx b/app/assets/javascripts/Components/ChallengeModal/LockscreenWorkspaceSwitcher.tsx index ece6735ab..117633c74 100644 --- a/app/assets/javascripts/Components/ChallengeModal/LockscreenWorkspaceSwitcher.tsx +++ b/app/assets/javascripts/Components/ChallengeModal/LockscreenWorkspaceSwitcher.tsx @@ -5,7 +5,7 @@ import { FunctionComponent } from 'preact' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' import { WorkspaceSwitcherMenu } from '@/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu' import { Button } from '@/Components/Button/Button' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { useCloseOnClickOutside } from '@/Hooks/useCloseOnClickOutside' type Props = { diff --git a/app/assets/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx b/app/assets/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx index bc77f8d65..c8f3f019a 100644 --- a/app/assets/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx +++ b/app/assets/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx @@ -6,7 +6,7 @@ import VisuallyHidden from '@reach/visually-hidden' import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useRef, useState } from 'preact/hooks' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { ChangeEditorMenu } from './ChangeEditorMenu' import { useCloseOnBlur } from '@/Hooks/useCloseOnBlur' import { isStateDealloced } from '@/UIModels/AppState/AbstractState' diff --git a/app/assets/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx b/app/assets/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx index d5c9f5e44..91c352e81 100644 --- a/app/assets/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx +++ b/app/assets/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { Menu } from '@/Components/Menu/Menu' import { MenuItem, MenuItemType } from '@/Components/Menu/MenuItem' import { diff --git a/app/assets/javascripts/Components/Checkbox/index.tsx b/app/assets/javascripts/Components/Checkbox/Checkbox.tsx similarity index 100% rename from app/assets/javascripts/Components/Checkbox/index.tsx rename to app/assets/javascripts/Components/Checkbox/Checkbox.tsx diff --git a/app/assets/javascripts/Components/ComponentView/index.tsx b/app/assets/javascripts/Components/ComponentView/ComponentView.tsx similarity index 100% rename from app/assets/javascripts/Components/ComponentView/index.tsx rename to app/assets/javascripts/Components/ComponentView/ComponentView.tsx diff --git a/app/assets/javascripts/Components/ConfirmSignoutModal/index.tsx b/app/assets/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx similarity index 100% rename from app/assets/javascripts/Components/ConfirmSignoutModal/index.tsx rename to app/assets/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx diff --git a/app/assets/javascripts/Components/Dropdown/index.tsx b/app/assets/javascripts/Components/Dropdown/Dropdown.tsx similarity index 98% rename from app/assets/javascripts/Components/Dropdown/index.tsx rename to app/assets/javascripts/Components/Dropdown/Dropdown.tsx index 15667b7e6..580a4bc0d 100644 --- a/app/assets/javascripts/Components/Dropdown/index.tsx +++ b/app/assets/javascripts/Components/Dropdown/Dropdown.tsx @@ -1,7 +1,7 @@ import { ListboxArrow, ListboxButton, ListboxInput, ListboxList, ListboxOption, ListboxPopover } from '@reach/listbox' import VisuallyHidden from '@reach/visually-hidden' import { FunctionComponent } from 'preact' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { IconType } from '@standardnotes/snjs' export type DropdownItem = { diff --git a/app/assets/javascripts/Components/Files/FilePreviewInfoPanel.tsx b/app/assets/javascripts/Components/Files/FilePreviewInfoPanel.tsx index 6db5878cf..c12f9e356 100644 --- a/app/assets/javascripts/Components/Files/FilePreviewInfoPanel.tsx +++ b/app/assets/javascripts/Components/Files/FilePreviewInfoPanel.tsx @@ -1,7 +1,7 @@ import { formatSizeToReadableString } from '@standardnotes/filepicker' import { FileItem } from '@standardnotes/snjs' import { FunctionComponent } from 'preact' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' type Props = { file: FileItem diff --git a/app/assets/javascripts/Components/Files/FilePreviewModal.tsx b/app/assets/javascripts/Components/Files/FilePreviewModal.tsx index e1facb053..fd8451bcf 100644 --- a/app/assets/javascripts/Components/Files/FilePreviewModal.tsx +++ b/app/assets/javascripts/Components/Files/FilePreviewModal.tsx @@ -7,7 +7,7 @@ import { FunctionComponent } from 'preact' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' import { getFileIconComponent } from '@/Components/AttachedFilesPopover/PopoverFileItem' import { Button } from '@/Components/Button/Button' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { FilePreviewInfoPanel } from './FilePreviewInfoPanel' import { isFileTypePreviewable } from './isFilePreviewable' import { PreviewComponent } from './PreviewComponent' diff --git a/app/assets/javascripts/Components/Footer/index.tsx b/app/assets/javascripts/Components/Footer/Footer.tsx similarity index 99% rename from app/assets/javascripts/Components/Footer/index.tsx rename to app/assets/javascripts/Components/Footer/Footer.tsx index 0ca9fe746..848f698eb 100644 --- a/app/assets/javascripts/Components/Footer/index.tsx +++ b/app/assets/javascripts/Components/Footer/Footer.tsx @@ -11,10 +11,10 @@ import { STRING_UPGRADE_ACCOUNT_CONFIRM_BUTTON, } from '@/Strings' import { alertDialog, confirmDialog } from '@/Services/AlertService' -import { AccountMenu, AccountMenuPane } from '@/Components/AccountMenu' +import { AccountMenu, AccountMenuPane } from '@/Components/AccountMenu/AccountMenu' import { AppStateEvent, EventSource } from '@/UIModels/AppState' -import { Icon } from '@/Components/Icon' -import { QuickSettingsMenu } from '@/Components/QuickSettingsMenu' +import { Icon } from '@/Components/Icon/Icon' +import { QuickSettingsMenu } from '@/Components/QuickSettingsMenu/QuickSettingsMenu' import { SyncResolutionMenu } from '@/Components/SyncResolutionMenu' import { Fragment } from 'preact' diff --git a/app/assets/javascripts/Components/Icon/index.tsx b/app/assets/javascripts/Components/Icon/Icon.tsx similarity index 100% rename from app/assets/javascripts/Components/Icon/index.tsx rename to app/assets/javascripts/Components/Icon/Icon.tsx diff --git a/app/assets/javascripts/Components/Menu/MenuItem.tsx b/app/assets/javascripts/Components/Menu/MenuItem.tsx index ad2a9b072..0afc42f57 100644 --- a/app/assets/javascripts/Components/Menu/MenuItem.tsx +++ b/app/assets/javascripts/Components/Menu/MenuItem.tsx @@ -1,7 +1,7 @@ import { ComponentChildren, FunctionComponent, VNode } from 'preact' import { forwardRef, Ref } from 'preact/compat' import { JSXInternal } from 'preact/src/jsx' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { Switch, SwitchProps } from '@/Components/Switch' import { IconType } from '@standardnotes/snjs' import { FOCUSABLE_BUT_NOT_TABBABLE } from '@/Constants' diff --git a/app/assets/javascripts/Components/MultipleSelectedNotes/index.tsx b/app/assets/javascripts/Components/MultipleSelectedNotes/MultipleSelectedNotes.tsx similarity index 94% rename from app/assets/javascripts/Components/MultipleSelectedNotes/index.tsx rename to app/assets/javascripts/Components/MultipleSelectedNotes/MultipleSelectedNotes.tsx index 432672c6c..229c7d7a7 100644 --- a/app/assets/javascripts/Components/MultipleSelectedNotes/index.tsx +++ b/app/assets/javascripts/Components/MultipleSelectedNotes/MultipleSelectedNotes.tsx @@ -3,7 +3,7 @@ import { IlNotesIcon } from '@standardnotes/icons' import { observer } from 'mobx-react-lite' import { NotesOptionsPanel } from '@/Components/NotesOptions/NotesOptionsPanel' import { WebApplication } from '@/UIModels/Application' -import { PinNoteButton } from '@/Components/PinNoteButton' +import { PinNoteButton } from '@/Components/PinNoteButton/PinNoteButton' type Props = { application: WebApplication diff --git a/app/assets/javascripts/Components/Navigation/index.tsx b/app/assets/javascripts/Components/Navigation/Navigation.tsx similarity index 97% rename from app/assets/javascripts/Components/Navigation/index.tsx rename to app/assets/javascripts/Components/Navigation/Navigation.tsx index 6f1d3e408..648a9890f 100644 --- a/app/assets/javascripts/Components/Navigation/index.tsx +++ b/app/assets/javascripts/Components/Navigation/Navigation.tsx @@ -6,7 +6,7 @@ import { ApplicationEvent, PrefKey } from '@standardnotes/snjs' import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useCallback, useEffect, useMemo, useState } from 'preact/hooks' -import { PanelSide, ResizeFinishCallback, PanelResizer, PanelResizeType } from '@/Components/PanelResizer' +import { PanelSide, ResizeFinishCallback, PanelResizer, PanelResizeType } from '@/Components/PanelResizer/PanelResizer' type Props = { application: WebApplication diff --git a/app/assets/javascripts/Components/NoAccountWarning/index.tsx b/app/assets/javascripts/Components/NoAccountWarning/NoAccountWarning.tsx similarity index 96% rename from app/assets/javascripts/Components/NoAccountWarning/index.tsx rename to app/assets/javascripts/Components/NoAccountWarning/NoAccountWarning.tsx index 9a222cfcc..48625ae95 100644 --- a/app/assets/javascripts/Components/NoAccountWarning/index.tsx +++ b/app/assets/javascripts/Components/NoAccountWarning/NoAccountWarning.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { AppState } from '@/UIModels/AppState' import { observer } from 'mobx-react-lite' import { useCallback } from 'preact/hooks' diff --git a/app/assets/javascripts/Components/NoteGroupView/index.tsx b/app/assets/javascripts/Components/NoteGroupView/NoteGroupView.tsx similarity index 98% rename from app/assets/javascripts/Components/NoteGroupView/index.tsx rename to app/assets/javascripts/Components/NoteGroupView/NoteGroupView.tsx index 5824aba6e..e2b184cbf 100644 --- a/app/assets/javascripts/Components/NoteGroupView/index.tsx +++ b/app/assets/javascripts/Components/NoteGroupView/NoteGroupView.tsx @@ -1,7 +1,7 @@ import { NoteViewController } from '@standardnotes/snjs' import { PureComponent } from '@/Components/Abstract/PureComponent' import { WebApplication } from '@/UIModels/Application' -import { MultipleSelectedNotes } from '@/Components/MultipleSelectedNotes' +import { MultipleSelectedNotes } from '@/Components/MultipleSelectedNotes/MultipleSelectedNotes' import { NoteView } from '@/Components/NoteView/NoteView' import { ElementIds } from '@/ElementIDs' diff --git a/app/assets/javascripts/Components/NoteTags/NoteTag.tsx b/app/assets/javascripts/Components/NoteTags/NoteTag.tsx index fd61345b2..2c9d52845 100644 --- a/app/assets/javascripts/Components/NoteTags/NoteTag.tsx +++ b/app/assets/javascripts/Components/NoteTags/NoteTag.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' import { AppState } from '@/UIModels/AppState' import { SNTag } from '@standardnotes/snjs' diff --git a/app/assets/javascripts/Components/NoteView/NoteView.tsx b/app/assets/javascripts/Components/NoteView/NoteView.tsx index 2f6d9475b..74f9a53e0 100644 --- a/app/assets/javascripts/Components/NoteView/NoteView.tsx +++ b/app/assets/javascripts/Components/NoteView/NoteView.tsx @@ -23,13 +23,13 @@ import { EventSource } from '@/UIModels/AppState' import { STRING_DELETE_PLACEHOLDER_ATTEMPT, STRING_DELETE_LOCKED_ATTEMPT, StringDeleteNote } from '@/Strings' import { confirmDialog } from '@/Services/AlertService' import { PureComponent } from '@/Components/Abstract/PureComponent' -import { ProtectedNoteOverlay } from '@/Components/ProtectedNoteOverlay' -import { Icon } from '@/Components/Icon' -import { PinNoteButton } from '@/Components/PinNoteButton' +import { ProtectedNoteOverlay } from '@/Components/ProtectedNoteOverlay/ProtectedNoteOverlay' +import { Icon } from '@/Components/Icon/Icon' +import { PinNoteButton } from '@/Components/PinNoteButton/PinNoteButton' import { NotesOptionsPanel } from '@/Components/NotesOptions/NotesOptionsPanel' import { NoteTagsContainer } from '@/Components/NoteTags/NoteTagsContainer' -import { ComponentView } from '@/Components/ComponentView' -import { PanelSide, PanelResizer, PanelResizeType } from '@/Components/PanelResizer' +import { ComponentView } from '@/Components/ComponentView/ComponentView' +import { PanelSide, PanelResizer, PanelResizeType } from '@/Components/PanelResizer/PanelResizer' import { ElementIds } from '@/ElementIDs' import { ChangeEditorButton } from '@/Components/ChangeEditor/ChangeEditorButton' import { AttachedFilesButton } from '@/Components/AttachedFilesPopover/AttachedFilesButton' diff --git a/app/assets/javascripts/Components/NotesContextMenu/index.tsx b/app/assets/javascripts/Components/NotesContextMenu/NotesContextMenu.tsx similarity index 100% rename from app/assets/javascripts/Components/NotesContextMenu/index.tsx rename to app/assets/javascripts/Components/NotesContextMenu/NotesContextMenu.tsx diff --git a/app/assets/javascripts/Components/NotesList/index.tsx b/app/assets/javascripts/Components/NotesList/NotesList.tsx similarity index 100% rename from app/assets/javascripts/Components/NotesList/index.tsx rename to app/assets/javascripts/Components/NotesList/NotesList.tsx diff --git a/app/assets/javascripts/Components/NotesList/NotesListItem.tsx b/app/assets/javascripts/Components/NotesList/NotesListItem.tsx index d8a9740b6..4b2506536 100644 --- a/app/assets/javascripts/Components/NotesList/NotesListItem.tsx +++ b/app/assets/javascripts/Components/NotesList/NotesListItem.tsx @@ -1,7 +1,7 @@ import { WebApplication } from '@/UIModels/Application' import { CollectionSort, CollectionSortProperty, sanitizeHtmlString, SNNote } from '@standardnotes/snjs' import { FunctionComponent } from 'preact' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { PLAIN_EDITOR_NAME } from '@/Constants' type Props = { diff --git a/app/assets/javascripts/Components/NotesList/NotesListOptionsMenu.tsx b/app/assets/javascripts/Components/NotesList/NotesListOptionsMenu.tsx index 367eddecd..23bd29e1b 100644 --- a/app/assets/javascripts/Components/NotesList/NotesListOptionsMenu.tsx +++ b/app/assets/javascripts/Components/NotesList/NotesListOptionsMenu.tsx @@ -3,7 +3,7 @@ import { CollectionSort, CollectionSortProperty, PrefKey } from '@standardnotes/ import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useCallback, useState } from 'preact/hooks' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { Menu } from '@/Components/Menu/Menu' import { MenuItem, MenuItemSeparator, MenuItemType } from '@/Components/Menu/MenuItem' diff --git a/app/assets/javascripts/Components/NotesOptions/AddTagOption.tsx b/app/assets/javascripts/Components/NotesOptions/AddTagOption.tsx index 461549827..f409eb62a 100644 --- a/app/assets/javascripts/Components/NotesOptions/AddTagOption.tsx +++ b/app/assets/javascripts/Components/NotesOptions/AddTagOption.tsx @@ -4,7 +4,7 @@ import { Disclosure, DisclosureButton, DisclosurePanel } from '@reach/disclosure import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { useCloseOnBlur } from '@/Hooks/useCloseOnBlur' type Props = { diff --git a/app/assets/javascripts/Components/NotesOptions/ChangeEditorOption.tsx b/app/assets/javascripts/Components/NotesOptions/ChangeEditorOption.tsx index aadec84b4..344661488 100644 --- a/app/assets/javascripts/Components/NotesOptions/ChangeEditorOption.tsx +++ b/app/assets/javascripts/Components/NotesOptions/ChangeEditorOption.tsx @@ -5,7 +5,7 @@ import { Disclosure, DisclosureButton, DisclosurePanel } from '@reach/disclosure import { IconType, SNComponent, SNNote } from '@standardnotes/snjs' import { FunctionComponent } from 'preact' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { ChangeEditorMenu } from '@/Components/ChangeEditor/ChangeEditorMenu' import { calculateSubmenuStyle, SubmenuStyle } from '@/Utils/CalculateSubmenuStyle' import { useCloseOnBlur } from '@/Hooks/useCloseOnBlur' diff --git a/app/assets/javascripts/Components/NotesOptions/ListedActionsOption.tsx b/app/assets/javascripts/Components/NotesOptions/ListedActionsOption.tsx index ac4f02068..7e31352e2 100644 --- a/app/assets/javascripts/Components/NotesOptions/ListedActionsOption.tsx +++ b/app/assets/javascripts/Components/NotesOptions/ListedActionsOption.tsx @@ -4,7 +4,7 @@ import { Disclosure, DisclosureButton, DisclosurePanel } from '@reach/disclosure import { Action, ListedAccount, SNNote } from '@standardnotes/snjs' import { Fragment, FunctionComponent } from 'preact' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { useCloseOnBlur } from '@/Hooks/useCloseOnBlur' type Props = { diff --git a/app/assets/javascripts/Components/NotesOptions/NotesOptions.tsx b/app/assets/javascripts/Components/NotesOptions/NotesOptions.tsx index 8cd1af663..d8a823b8c 100644 --- a/app/assets/javascripts/Components/NotesOptions/NotesOptions.tsx +++ b/app/assets/javascripts/Components/NotesOptions/NotesOptions.tsx @@ -1,5 +1,5 @@ import { AppState } from '@/UIModels/AppState' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { Switch } from '@/Components/Switch' import { observer } from 'mobx-react-lite' import { useState, useEffect, useMemo, useCallback } from 'preact/hooks' diff --git a/app/assets/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx b/app/assets/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx index 519b1bd80..33c26269b 100644 --- a/app/assets/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx +++ b/app/assets/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx @@ -1,5 +1,5 @@ import { AppState } from '@/UIModels/AppState' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import VisuallyHidden from '@reach/visually-hidden' import { useCloseOnBlur } from '@/Hooks/useCloseOnBlur' import { Disclosure, DisclosureButton, DisclosurePanel } from '@reach/disclosure' diff --git a/app/assets/javascripts/Components/NotesView/index.tsx b/app/assets/javascripts/Components/NotesView/NotesView.tsx similarity index 97% rename from app/assets/javascripts/Components/NotesView/index.tsx rename to app/assets/javascripts/Components/NotesView/NotesView.tsx index ada7d5408..0fed68a54 100644 --- a/app/assets/javascripts/Components/NotesView/index.tsx +++ b/app/assets/javascripts/Components/NotesView/NotesView.tsx @@ -6,11 +6,11 @@ import { PrefKey } from '@standardnotes/snjs' import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' -import { NoAccountWarning } from '@/Components/NoAccountWarning' -import { NotesList } from '@/Components/NotesList' +import { NoAccountWarning } from '@/Components/NoAccountWarning/NoAccountWarning' +import { NotesList } from '@/Components/NotesList/NotesList' import { NotesListOptionsMenu } from '@/Components/NotesList/NotesListOptionsMenu' -import { SearchOptions } from '@/Components/SearchOptions' -import { PanelSide, ResizeFinishCallback, PanelResizer, PanelResizeType } from '@/Components/PanelResizer' +import { SearchOptions } from '@/Components/SearchOptions/SearchOptions' +import { PanelSide, ResizeFinishCallback, PanelResizer, PanelResizeType } from '@/Components/PanelResizer/PanelResizer' import { Disclosure, DisclosureButton, DisclosurePanel } from '@reach/disclosure' import { useCloseOnBlur } from '@/Hooks/useCloseOnBlur' import { isStateDealloced } from '@/UIModels/AppState/AbstractState' diff --git a/app/assets/javascripts/Components/OtherSessionsSignOut/index.tsx b/app/assets/javascripts/Components/OtherSessionsSignOut/OtherSessionsSignOut.tsx similarity index 100% rename from app/assets/javascripts/Components/OtherSessionsSignOut/index.tsx rename to app/assets/javascripts/Components/OtherSessionsSignOut/OtherSessionsSignOut.tsx diff --git a/app/assets/javascripts/Components/PanelResizer/index.tsx b/app/assets/javascripts/Components/PanelResizer/PanelResizer.tsx similarity index 100% rename from app/assets/javascripts/Components/PanelResizer/index.tsx rename to app/assets/javascripts/Components/PanelResizer/PanelResizer.tsx diff --git a/app/assets/javascripts/Components/PasswordWizard/index.tsx b/app/assets/javascripts/Components/PasswordWizard/PasswordWizard.tsx similarity index 100% rename from app/assets/javascripts/Components/PasswordWizard/index.tsx rename to app/assets/javascripts/Components/PasswordWizard/PasswordWizard.tsx diff --git a/app/assets/javascripts/Components/PermissionsModal/index.tsx b/app/assets/javascripts/Components/PermissionsModal/PermissionsModal.tsx similarity index 100% rename from app/assets/javascripts/Components/PermissionsModal/index.tsx rename to app/assets/javascripts/Components/PermissionsModal/PermissionsModal.tsx diff --git a/app/assets/javascripts/Components/PinNoteButton/index.tsx b/app/assets/javascripts/Components/PinNoteButton/PinNoteButton.tsx similarity index 96% rename from app/assets/javascripts/Components/PinNoteButton/index.tsx rename to app/assets/javascripts/Components/PinNoteButton/PinNoteButton.tsx index e126c0894..bd18546d1 100644 --- a/app/assets/javascripts/Components/PinNoteButton/index.tsx +++ b/app/assets/javascripts/Components/PinNoteButton/PinNoteButton.tsx @@ -2,7 +2,7 @@ import { AppState } from '@/UIModels/AppState' import VisuallyHidden from '@reach/visually-hidden' import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { useCallback } from 'preact/hooks' import { isStateDealloced } from '@/UIModels/AppState/AbstractState' diff --git a/app/assets/javascripts/Components/Preferences/Panes/Account/index.tsx b/app/assets/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx similarity index 100% rename from app/assets/javascripts/Components/Preferences/Panes/Account/index.tsx rename to app/assets/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx diff --git a/app/assets/javascripts/Components/Preferences/Panes/Account/Advanced.tsx b/app/assets/javascripts/Components/Preferences/Panes/Account/Advanced.tsx index 3a13cf63a..ce00ff781 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/Account/Advanced.tsx +++ b/app/assets/javascripts/Components/Preferences/Panes/Account/Advanced.tsx @@ -4,7 +4,7 @@ import { OfflineSubscription } from '@/Components/Preferences/Panes/Account/Offl import { WebApplication } from '@/UIModels/Application' import { observer } from 'mobx-react-lite' import { AppState } from '@/UIModels/AppState' -import { Extensions } from '@/Components/Preferences/Panes/Extensions' +import { Extensions } from '@/Components/Preferences/Panes/Extensions/Extensions' import { ExtensionsLatestVersions } from '@/Components/Preferences/Panes/Extensions/ExtensionsLatestVersions' import { AccordionItem } from '@/Components/Shared/AccordionItem' diff --git a/app/assets/javascripts/Components/Preferences/Panes/Account/Authentication.tsx b/app/assets/javascripts/Components/Preferences/Panes/Account/Authentication.tsx index 9d982d875..1a6524673 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/Account/Authentication.tsx +++ b/app/assets/javascripts/Components/Preferences/Panes/Account/Authentication.tsx @@ -1,4 +1,4 @@ -import { AccountMenuPane } from '@/Components/AccountMenu' +import { AccountMenuPane } from '@/Components/AccountMenu/AccountMenu' import { Button } from '@/Components/Button/Button' import { PreferencesGroup, PreferencesSegment, Text, Title } from '@/Components/Preferences/PreferencesComponents' import { WebApplication } from '@/UIModels/Application' diff --git a/app/assets/javascripts/Components/Preferences/Panes/Account/ChangeEmail/index.tsx b/app/assets/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmail.tsx similarity index 100% rename from app/assets/javascripts/Components/Preferences/Panes/Account/ChangeEmail/index.tsx rename to app/assets/javascripts/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmail.tsx diff --git a/app/assets/javascripts/Components/Preferences/Panes/Account/Credentials.tsx b/app/assets/javascripts/Components/Preferences/Panes/Account/Credentials.tsx index 86998efe8..05f35951e 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/Account/Credentials.tsx +++ b/app/assets/javascripts/Components/Preferences/Panes/Account/Credentials.tsx @@ -11,10 +11,10 @@ import { observer } from '@node_modules/mobx-react-lite' import { HorizontalSeparator } from '@/Components/Shared/HorizontalSeparator' import { dateToLocalizedString } from '@standardnotes/snjs' import { useCallback, useState } from 'preact/hooks' -import { ChangeEmail } from '@/Components/Preferences/Panes/Account/ChangeEmail' +import { ChangeEmail } from '@/Components/Preferences/Panes/Account/ChangeEmail/ChangeEmail' import { FunctionComponent, render } from 'preact' import { AppState } from '@/UIModels/AppState' -import { PasswordWizard } from '@/Components/PasswordWizard' +import { PasswordWizard } from '@/Components/PasswordWizard/PasswordWizard' type Props = { application: WebApplication diff --git a/app/assets/javascripts/Components/Preferences/Panes/Account/SignOutView.tsx b/app/assets/javascripts/Components/Preferences/Panes/Account/SignOutView.tsx index 087ce9f76..94cef1db1 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/Account/SignOutView.tsx +++ b/app/assets/javascripts/Components/Preferences/Panes/Account/SignOutView.tsx @@ -1,5 +1,5 @@ import { Button } from '@/Components/Button/Button' -import { OtherSessionsSignOutContainer } from '@/Components/OtherSessionsSignOut' +import { OtherSessionsSignOutContainer } from '@/Components/OtherSessionsSignOut/OtherSessionsSignOut' import { PreferencesGroup, PreferencesSegment, diff --git a/app/assets/javascripts/Components/Preferences/Panes/Appearance.tsx b/app/assets/javascripts/Components/Preferences/Panes/Appearance.tsx index 79100c21e..cba7f95ce 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/Appearance.tsx +++ b/app/assets/javascripts/Components/Preferences/Panes/Appearance.tsx @@ -1,4 +1,4 @@ -import { Dropdown, DropdownItem } from '@/Components/Dropdown' +import { Dropdown, DropdownItem } from '@/Components/Dropdown/Dropdown' import { usePremiumModal } from '@/Hooks/usePremiumModal' import { HorizontalSeparator } from '@/Components/Shared/HorizontalSeparator' import { Switch } from '@/Components/Switch' diff --git a/app/assets/javascripts/Components/Preferences/Panes/Backups/index.tsx b/app/assets/javascripts/Components/Preferences/Panes/Backups/Backups.tsx similarity index 93% rename from app/assets/javascripts/Components/Preferences/Panes/Backups/index.tsx rename to app/assets/javascripts/Components/Preferences/Panes/Backups/Backups.tsx index cb1910d96..13e0d3a7c 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/Backups/index.tsx +++ b/app/assets/javascripts/Components/Preferences/Panes/Backups/Backups.tsx @@ -2,7 +2,7 @@ import { WebApplication } from '@/UIModels/Application' import { AppState } from '@/UIModels/AppState' import { FunctionComponent } from 'preact' import { PreferencesPane } from '@/Components/Preferences/PreferencesComponents' -import { CloudLink } from './CloudBackups' +import { CloudLink } from './CloudBackups/CloudBackups' import { DataBackups } from './DataBackups' import { EmailBackups } from './EmailBackups' import { FileBackups } from './Files/FileBackups' diff --git a/app/assets/javascripts/Components/Preferences/Panes/Backups/CloudBackups/index.tsx b/app/assets/javascripts/Components/Preferences/Panes/Backups/CloudBackups/CloudBackups.tsx similarity index 100% rename from app/assets/javascripts/Components/Preferences/Panes/Backups/CloudBackups/index.tsx rename to app/assets/javascripts/Components/Preferences/Panes/Backups/CloudBackups/CloudBackups.tsx diff --git a/app/assets/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx b/app/assets/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx index abdc6fc2e..8eab28e24 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx +++ b/app/assets/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx @@ -10,7 +10,7 @@ import { Text, Title, } from '@/Components/Preferences/PreferencesComponents' -import { Dropdown, DropdownItem } from '@/Components/Dropdown' +import { Dropdown, DropdownItem } from '@/Components/Dropdown/Dropdown' import { Switch } from '@/Components/Switch' import { HorizontalSeparator } from '@/Components/Shared/HorizontalSeparator' import { diff --git a/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx b/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx index 5e65e6631..9dc388cd4 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx +++ b/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/BackupsDropZone.tsx @@ -4,7 +4,7 @@ import { Button } from '@/Components/Button/Button' import { FileBackupMetadataFile, FileBackupsConstantsV1, FileItem, FileHandleRead } from '@standardnotes/snjs' import { HorizontalSeparator } from '@/Components/Shared/HorizontalSeparator' import { EncryptionStatusItem } from '../../Security/Encryption' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { StreamingFileApi } from '@standardnotes/filepicker' import { FunctionComponent } from 'preact' import { isHandlingBackupDrag } from '@/Utils/DragTypeCheck' diff --git a/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/FileBackups.tsx b/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/FileBackups.tsx index 7511b110d..44e657a27 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/FileBackups.tsx +++ b/app/assets/javascripts/Components/Preferences/Panes/Backups/Files/FileBackups.tsx @@ -12,7 +12,7 @@ import { Button } from '@/Components/Button/Button' import { Switch } from '@/Components/Switch' import { HorizontalSeparator } from '@/Components/Shared/HorizontalSeparator' import { EncryptionStatusItem } from '../../Security/Encryption' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { BackupsDropZone } from './BackupsDropZone' type Props = { diff --git a/app/assets/javascripts/Components/Preferences/Panes/Extensions/index.tsx b/app/assets/javascripts/Components/Preferences/Panes/Extensions/Extensions.tsx similarity index 100% rename from app/assets/javascripts/Components/Preferences/Panes/Extensions/index.tsx rename to app/assets/javascripts/Components/Preferences/Panes/Extensions/Extensions.tsx diff --git a/app/assets/javascripts/Components/Preferences/Panes/General/Defaults.tsx b/app/assets/javascripts/Components/Preferences/Panes/General/Defaults.tsx index 19dff0a31..afa3ea097 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/General/Defaults.tsx +++ b/app/assets/javascripts/Components/Preferences/Panes/General/Defaults.tsx @@ -1,4 +1,4 @@ -import { Dropdown, DropdownItem } from '@/Components/Dropdown' +import { Dropdown, DropdownItem } from '@/Components/Dropdown/Dropdown' import { FeatureIdentifier, PrefKey, ComponentArea, ComponentMutator, SNComponent } from '@standardnotes/snjs' import { PreferencesGroup, diff --git a/app/assets/javascripts/Components/Preferences/Panes/General/index.tsx b/app/assets/javascripts/Components/Preferences/Panes/General/General.tsx similarity index 100% rename from app/assets/javascripts/Components/Preferences/Panes/General/index.tsx rename to app/assets/javascripts/Components/Preferences/Panes/General/General.tsx diff --git a/app/assets/javascripts/Components/Preferences/Panes/Listed/index.tsx b/app/assets/javascripts/Components/Preferences/Panes/Listed/Listed.tsx similarity index 100% rename from app/assets/javascripts/Components/Preferences/Panes/Listed/index.tsx rename to app/assets/javascripts/Components/Preferences/Panes/Listed/Listed.tsx diff --git a/app/assets/javascripts/Components/Preferences/Panes/Security/Encryption.tsx b/app/assets/javascripts/Components/Preferences/Panes/Security/Encryption.tsx index 2d9380e71..e95851ed5 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/Security/Encryption.tsx +++ b/app/assets/javascripts/Components/Preferences/Panes/Security/Encryption.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { STRING_E2E_ENABLED, STRING_ENC_NOT_ENABLED, STRING_LOCAL_ENC_ENABLED } from '@/Strings' import { AppState } from '@/UIModels/AppState' import { observer } from 'mobx-react-lite' diff --git a/app/assets/javascripts/Components/Preferences/Panes/Security/index.tsx b/app/assets/javascripts/Components/Preferences/Panes/Security/Security.tsx similarity index 94% rename from app/assets/javascripts/Components/Preferences/Panes/Security/index.tsx rename to app/assets/javascripts/Components/Preferences/Panes/Security/Security.tsx index 7d080192e..0d1dbf53d 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/Security/index.tsx +++ b/app/assets/javascripts/Components/Preferences/Panes/Security/Security.tsx @@ -2,7 +2,7 @@ import { WebApplication } from '@/UIModels/Application' import { AppState } from '@/UIModels/AppState' import { FunctionComponent } from 'preact' import { PreferencesPane } from '@/Components/Preferences/PreferencesComponents' -import { TwoFactorAuthWrapper } from '../TwoFactorAuth' +import { TwoFactorAuthWrapper } from '../TwoFactorAuth/TwoFactorAuthWrapper' import { MfaProps } from '../TwoFactorAuth/MfaProps' import { Encryption } from './Encryption' import { PasscodeLock } from './PasscodeLock' diff --git a/app/assets/javascripts/Components/Preferences/Panes/TwoFactorAuth/AuthAppInfoPopup.tsx b/app/assets/javascripts/Components/Preferences/Panes/TwoFactorAuth/AuthAppInfoPopup.tsx index 86d51b00c..3af29b955 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/TwoFactorAuth/AuthAppInfoPopup.tsx +++ b/app/assets/javascripts/Components/Preferences/Panes/TwoFactorAuth/AuthAppInfoPopup.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { Disclosure, DisclosureButton, DisclosurePanel } from '@reach/disclosure' import { FunctionComponent } from 'preact' import { useState, useRef, useEffect } from 'preact/hooks' diff --git a/app/assets/javascripts/Components/Preferences/Panes/TwoFactorAuth/index.tsx b/app/assets/javascripts/Components/Preferences/Panes/TwoFactorAuth/TwoFactorAuthWrapper.tsx similarity index 100% rename from app/assets/javascripts/Components/Preferences/Panes/TwoFactorAuth/index.tsx rename to app/assets/javascripts/Components/Preferences/Panes/TwoFactorAuth/TwoFactorAuthWrapper.tsx diff --git a/app/assets/javascripts/Components/Preferences/Panes/index.ts b/app/assets/javascripts/Components/Preferences/Panes/index.ts index bac3cabd2..d2fdab581 100644 --- a/app/assets/javascripts/Components/Preferences/Panes/index.ts +++ b/app/assets/javascripts/Components/Preferences/Panes/index.ts @@ -1,5 +1,5 @@ export * from './HelpFeedback' -export * from './Security' -export * from './Account' -export * from './Listed' -export * from './General' +export * from './Security/Security' +export * from './Account/AccountPreferences' +export * from './Listed/Listed' +export * from './General/General' diff --git a/app/assets/javascripts/Components/Preferences/PreferencesComponents/MenuItem.tsx b/app/assets/javascripts/Components/Preferences/PreferencesComponents/MenuItem.tsx index 70da7940c..4ba1a277c 100644 --- a/app/assets/javascripts/Components/Preferences/PreferencesComponents/MenuItem.tsx +++ b/app/assets/javascripts/Components/Preferences/PreferencesComponents/MenuItem.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { FunctionComponent } from 'preact' import { IconType } from '@standardnotes/snjs' diff --git a/app/assets/javascripts/Components/Preferences/PreferencesView.tsx b/app/assets/javascripts/Components/Preferences/PreferencesView.tsx index 26bd2bd60..992d67988 100644 --- a/app/assets/javascripts/Components/Preferences/PreferencesView.tsx +++ b/app/assets/javascripts/Components/Preferences/PreferencesView.tsx @@ -10,7 +10,7 @@ import { WebApplication } from '@/UIModels/Application' import { MfaProps } from './Panes/TwoFactorAuth/MfaProps' import { AppState } from '@/UIModels/AppState' import { useEffect, useMemo } from 'preact/hooks' -import { Backups } from '@/Components/Preferences/Panes/Backups' +import { Backups } from '@/Components/Preferences/Panes/Backups/Backups' import { Appearance } from './Panes/Appearance' interface PreferencesProps extends MfaProps { diff --git a/app/assets/javascripts/Components/PremiumFeaturesModal/index.tsx b/app/assets/javascripts/Components/PremiumFeaturesModal/PremiumFeaturesModal.tsx similarity index 98% rename from app/assets/javascripts/Components/PremiumFeaturesModal/index.tsx rename to app/assets/javascripts/Components/PremiumFeaturesModal/PremiumFeaturesModal.tsx index d602475ab..11a4b271f 100644 --- a/app/assets/javascripts/Components/PremiumFeaturesModal/index.tsx +++ b/app/assets/javascripts/Components/PremiumFeaturesModal/PremiumFeaturesModal.tsx @@ -1,6 +1,6 @@ import { AlertDialog, AlertDialogDescription, AlertDialogLabel } from '@reach/alert-dialog' import { FunctionalComponent } from 'preact' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { PremiumIllustration } from '@standardnotes/icons' import { useCallback, useRef } from 'preact/hooks' import { WebApplication } from '@/UIModels/Application' diff --git a/app/assets/javascripts/Components/ProtectedNoteOverlay/index.tsx b/app/assets/javascripts/Components/ProtectedNoteOverlay/ProtectedNoteOverlay.tsx similarity index 100% rename from app/assets/javascripts/Components/ProtectedNoteOverlay/index.tsx rename to app/assets/javascripts/Components/ProtectedNoteOverlay/ProtectedNoteOverlay.tsx diff --git a/app/assets/javascripts/Components/QuickSettingsMenu/FocusModeSwitch.tsx b/app/assets/javascripts/Components/QuickSettingsMenu/FocusModeSwitch.tsx index 8f7ef7545..01f1ba8ef 100644 --- a/app/assets/javascripts/Components/QuickSettingsMenu/FocusModeSwitch.tsx +++ b/app/assets/javascripts/Components/QuickSettingsMenu/FocusModeSwitch.tsx @@ -3,7 +3,7 @@ import { FeatureStatus, FeatureIdentifier } from '@standardnotes/snjs' import { FunctionComponent } from 'preact' import { useCallback } from 'preact/hooks' import { JSXInternal } from 'preact/src/jsx' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { usePremiumModal } from '@/Hooks/usePremiumModal' import { Switch } from '@/Components/Switch' diff --git a/app/assets/javascripts/Components/QuickSettingsMenu/index.tsx b/app/assets/javascripts/Components/QuickSettingsMenu/QuickSettingsMenu.tsx similarity index 99% rename from app/assets/javascripts/Components/QuickSettingsMenu/index.tsx rename to app/assets/javascripts/Components/QuickSettingsMenu/QuickSettingsMenu.tsx index c31a8fca2..3d7d27fe7 100644 --- a/app/assets/javascripts/Components/QuickSettingsMenu/index.tsx +++ b/app/assets/javascripts/Components/QuickSettingsMenu/QuickSettingsMenu.tsx @@ -6,7 +6,7 @@ import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useCallback, useEffect, useRef, useState } from 'preact/hooks' import { JSXInternal } from 'preact/src/jsx' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { Switch } from '@/Components/Switch' import { useCloseOnBlur } from '@/Hooks/useCloseOnBlur' import { quickSettingsKeyDownHandler, themesMenuKeyDownHandler } from './EventHandlers' diff --git a/app/assets/javascripts/Components/QuickSettingsMenu/ThemesMenuButton.tsx b/app/assets/javascripts/Components/QuickSettingsMenu/ThemesMenuButton.tsx index f980a2b33..7770d2f4d 100644 --- a/app/assets/javascripts/Components/QuickSettingsMenu/ThemesMenuButton.tsx +++ b/app/assets/javascripts/Components/QuickSettingsMenu/ThemesMenuButton.tsx @@ -3,7 +3,7 @@ import { FeatureStatus } from '@standardnotes/snjs' import { FunctionComponent } from 'preact' import { useCallback, useMemo } from 'preact/hooks' import { JSXInternal } from 'preact/src/jsx' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { usePremiumModal } from '@/Hooks/usePremiumModal' import { Switch } from '@/Components/Switch' import { ThemeItem } from './ThemeItem' diff --git a/app/assets/javascripts/Components/RevisionHistoryModal/RemoteHistoryList.tsx b/app/assets/javascripts/Components/RevisionHistoryModal/RemoteHistoryList.tsx index ef164d5df..c433bc827 100644 --- a/app/assets/javascripts/Components/RevisionHistoryModal/RemoteHistoryList.tsx +++ b/app/assets/javascripts/Components/RevisionHistoryModal/RemoteHistoryList.tsx @@ -3,7 +3,7 @@ import { RevisionListEntry } from '@standardnotes/snjs' import { observer } from 'mobx-react-lite' import { Fragment, FunctionComponent } from 'preact' import { useCallback, useEffect, useMemo, useRef, useState } from 'preact/hooks' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { useListKeyboardNavigation } from '@/Hooks/useListKeyboardNavigation' import { HistoryListItem } from './HistoryListItem' import { previewHistoryEntryTitle, RemoteRevisionListGroup } from './utils' diff --git a/app/assets/javascripts/Components/RevisionHistoryModal/SelectedRevisionContent.tsx b/app/assets/javascripts/Components/RevisionHistoryModal/SelectedRevisionContent.tsx index 0fa5d620b..57e5f438e 100644 --- a/app/assets/javascripts/Components/RevisionHistoryModal/SelectedRevisionContent.tsx +++ b/app/assets/javascripts/Components/RevisionHistoryModal/SelectedRevisionContent.tsx @@ -4,7 +4,7 @@ import { HistoryEntry, SNComponent, SNNote } from '@standardnotes/snjs' import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useEffect, useMemo } from 'preact/hooks' -import { ComponentView } from '@/Components/ComponentView' +import { ComponentView } from '@/Components/ComponentView/ComponentView' import { LegacyHistoryEntry } from './utils' const ABSOLUTE_CENTER_CLASSNAME = 'absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2' diff --git a/app/assets/javascripts/Components/SearchOptions/index.tsx b/app/assets/javascripts/Components/SearchOptions/SearchOptions.tsx similarity index 95% rename from app/assets/javascripts/Components/SearchOptions/index.tsx rename to app/assets/javascripts/Components/SearchOptions/SearchOptions.tsx index 5f872ecec..3fbd8a6ce 100644 --- a/app/assets/javascripts/Components/SearchOptions/index.tsx +++ b/app/assets/javascripts/Components/SearchOptions/SearchOptions.tsx @@ -1,7 +1,7 @@ import { AppState } from '@/UIModels/AppState' import { WebApplication } from '@/UIModels/Application' import { observer } from 'mobx-react-lite' -import Bubble from '@/Components/Bubble' +import Bubble from '@/Components/Bubble/Bubble' import { useCallback } from 'preact/hooks' type Props = { diff --git a/app/assets/javascripts/Components/TagAutocomplete/AutocompleteTagHint.tsx b/app/assets/javascripts/Components/TagAutocomplete/AutocompleteTagHint.tsx index 4a948d30d..093045639 100644 --- a/app/assets/javascripts/Components/TagAutocomplete/AutocompleteTagHint.tsx +++ b/app/assets/javascripts/Components/TagAutocomplete/AutocompleteTagHint.tsx @@ -1,7 +1,7 @@ import { AppState } from '@/UIModels/AppState' import { observer } from 'mobx-react-lite' import { useRef, useEffect, useCallback } from 'preact/hooks' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' type Props = { appState: AppState diff --git a/app/assets/javascripts/Components/TagAutocomplete/AutocompleteTagResult.tsx b/app/assets/javascripts/Components/TagAutocomplete/AutocompleteTagResult.tsx index 6df45657f..b730de071 100644 --- a/app/assets/javascripts/Components/TagAutocomplete/AutocompleteTagResult.tsx +++ b/app/assets/javascripts/Components/TagAutocomplete/AutocompleteTagResult.tsx @@ -3,7 +3,7 @@ import { splitQueryInString } from '@/Utils/StringUtils' import { SNTag } from '@standardnotes/snjs' import { observer } from 'mobx-react-lite' import { useEffect, useRef } from 'preact/hooks' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' type Props = { appState: AppState diff --git a/app/assets/javascripts/Components/Tags/RootTagDropZone.tsx b/app/assets/javascripts/Components/Tags/RootTagDropZone.tsx index 7981c6d12..a1c43c378 100644 --- a/app/assets/javascripts/Components/Tags/RootTagDropZone.tsx +++ b/app/assets/javascripts/Components/Tags/RootTagDropZone.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { usePremiumModal } from '@/Hooks/usePremiumModal' import { FeaturesState } from '@/UIModels/AppState/FeaturesState' import { TagsState } from '@/UIModels/AppState/TagsState' diff --git a/app/assets/javascripts/Components/Tags/SmartViewsListItem.tsx b/app/assets/javascripts/Components/Tags/SmartViewsListItem.tsx index 5b21b2b89..dab8c38e2 100644 --- a/app/assets/javascripts/Components/Tags/SmartViewsListItem.tsx +++ b/app/assets/javascripts/Components/Tags/SmartViewsListItem.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { FeaturesState } from '@/UIModels/AppState/FeaturesState' import { TagsState } from '@/UIModels/AppState/TagsState' import '@reach/tooltip/styles.css' diff --git a/app/assets/javascripts/Components/Tags/TagContextMenu.tsx b/app/assets/javascripts/Components/Tags/TagContextMenu.tsx index c62c025a6..fc7f6b1f1 100644 --- a/app/assets/javascripts/Components/Tags/TagContextMenu.tsx +++ b/app/assets/javascripts/Components/Tags/TagContextMenu.tsx @@ -2,7 +2,7 @@ import { AppState } from '@/UIModels/AppState' import { observer } from 'mobx-react-lite' import { FunctionComponent } from 'preact' import { useCallback, useEffect, useRef } from 'preact/hooks' -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { Menu } from '@/Components/Menu/Menu' import { MenuItem, MenuItemType } from '@/Components/Menu/MenuItem' import { usePremiumModal } from '@/Hooks/usePremiumModal' diff --git a/app/assets/javascripts/Components/Tags/TagsListItem.tsx b/app/assets/javascripts/Components/Tags/TagsListItem.tsx index 711b5a9bc..40db65e0c 100644 --- a/app/assets/javascripts/Components/Tags/TagsListItem.tsx +++ b/app/assets/javascripts/Components/Tags/TagsListItem.tsx @@ -1,4 +1,4 @@ -import { Icon } from '@/Components/Icon' +import { Icon } from '@/Components/Icon/Icon' import { TAG_FOLDERS_FEATURE_NAME } from '@/Constants' import { usePremiumModal } from '@/Hooks/usePremiumModal' import { KeyboardKey } from '@/Services/IOService' diff --git a/app/assets/javascripts/Hooks/usePremiumModal.tsx b/app/assets/javascripts/Hooks/usePremiumModal.tsx index 41d496ad2..6a0405499 100644 --- a/app/assets/javascripts/Hooks/usePremiumModal.tsx +++ b/app/assets/javascripts/Hooks/usePremiumModal.tsx @@ -4,7 +4,7 @@ import { observer } from 'mobx-react-lite' import { ComponentChildren, FunctionalComponent, createContext } from 'preact' import { useCallback, useContext } from 'preact/hooks' -import { PremiumFeaturesModal } from '@/Components/PremiumFeaturesModal' +import { PremiumFeaturesModal } from '@/Components/PremiumFeaturesModal/PremiumFeaturesModal' type PremiumModalContextData = { activate: (featureName: string) => void diff --git a/app/assets/javascripts/UIModels/AppState/AccountMenuState.ts b/app/assets/javascripts/UIModels/AppState/AccountMenuState.ts index ed0c0075b..33b747bc9 100644 --- a/app/assets/javascripts/UIModels/AppState/AccountMenuState.ts +++ b/app/assets/javascripts/UIModels/AppState/AccountMenuState.ts @@ -2,7 +2,7 @@ import { destroyAllObjectProperties, isDev } from '@/Utils' import { action, computed, makeObservable, observable, runInAction } from 'mobx' import { ApplicationEvent, ContentType, DeinitSource, SNNote, SNTag } from '@standardnotes/snjs' import { WebApplication } from '@/UIModels/Application' -import { AccountMenuPane } from '@/Components/AccountMenu' +import { AccountMenuPane } from '@/Components/AccountMenu/AccountMenu' import { AbstractState } from './AbstractState' type StructuredItemsCount = {