From 88c3cd5cdd2a1e8bf49ca3a5a398e07460a2e127 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 24 Aug 2025 20:16:58 +0300 Subject: [PATCH] refactor(react/ribbon): move files around & remove imports --- apps/client/src/layouts/desktop_layout.tsx | 20 +------------- apps/client/src/layouts/layout_commons.tsx | 2 +- apps/client/src/layouts/mobile_layout.ts | 5 ++-- .../promoted_attributes.ts | 26 +++++++++---------- .../ribbon/CollectionPropertiesTab.tsx | 2 +- .../collection-properties-config.ts} | 0 .../ckeditor}/mobile_editor_toolbar.ts | 4 +-- 7 files changed, 20 insertions(+), 39 deletions(-) rename apps/client/src/widgets/{ribbon_widgets => }/promoted_attributes.ts (95%) rename apps/client/src/widgets/{ribbon_widgets/book_properties_config.ts => ribbon/collection-properties-config.ts} (100%) rename apps/client/src/widgets/{ribbon_widgets => type_widgets/ckeditor}/mobile_editor_toolbar.ts (96%) diff --git a/apps/client/src/layouts/desktop_layout.tsx b/apps/client/src/layouts/desktop_layout.tsx index 6452dfb63..64e0c0d08 100644 --- a/apps/client/src/layouts/desktop_layout.tsx +++ b/apps/client/src/layouts/desktop_layout.tsx @@ -5,19 +5,11 @@ import TitleBarButtonsWidget from "../widgets/title_bar_buttons.js"; import LeftPaneContainer from "../widgets/containers/left_pane_container.js"; import NoteTreeWidget from "../widgets/note_tree.js"; import NoteTitleWidget from "../widgets/note_title.jsx"; -import OwnedAttributeListWidget from "../widgets/ribbon_widgets/owned_attribute_list.js"; -import NoteActionsWidget from "../widgets/buttons/note_actions.js"; import NoteDetailWidget from "../widgets/note_detail.js"; -import RibbonContainer from "../widgets/containers/ribbon_container.js"; -import PromotedAttributesWidget from "../widgets/ribbon_widgets/promoted_attributes.js"; -import InheritedAttributesWidget from "../widgets/ribbon_widgets/inherited_attribute_list.js"; +import PromotedAttributesWidget from "../widgets/promoted_attributes.js"; import NoteListWidget from "../widgets/note_list.js"; -import SearchDefinitionWidget from "../widgets/ribbon_widgets/search_definition.js"; import SqlResultWidget from "../widgets/sql_result.js"; import SqlTableSchemasWidget from "../widgets/sql_table_schemas.js"; -import FilePropertiesWidget from "../widgets/ribbon_widgets/file_properties.js"; -import ImagePropertiesWidget from "../widgets/ribbon_widgets/image_properties.js"; -import NotePropertiesWidget from "../widgets/ribbon_widgets/note_properties.js"; import NoteIconWidget from "../widgets/note_icon.jsx"; import SearchResultWidget from "../widgets/search_result.js"; import ScrollingContainer from "../widgets/containers/scrolling_container.js"; @@ -29,15 +21,8 @@ import SplitNoteContainer from "../widgets/containers/split_note_container.js"; import LeftPaneToggleWidget from "../widgets/buttons/left_pane_toggle.js"; import CreatePaneButton from "../widgets/buttons/create_pane_button.js"; import ClosePaneButton from "../widgets/buttons/close_pane_button.js"; -import BasicPropertiesWidget from "../widgets/ribbon_widgets/basic_properties.js"; -import NoteInfoWidget from "../widgets/ribbon_widgets/note_info_widget.js"; -import BookPropertiesWidget from "../widgets/ribbon_widgets/book_properties.js"; -import NoteMapRibbonWidget from "../widgets/ribbon_widgets/note_map.js"; -import NotePathsWidget from "../widgets/ribbon_widgets/note_paths.js"; -import SimilarNotesWidget from "../widgets/ribbon_widgets/similar_notes.js"; import RightPaneContainer from "../widgets/containers/right_pane_container.js"; import EditButton from "../widgets/floating_buttons/edit_button.js"; -import EditedNotesWidget from "../widgets/ribbon_widgets/edited_notes.js"; import ShowTocWidgetButton from "../widgets/buttons/show_toc_widget_button.js"; import ShowHighlightsListWidgetButton from "../widgets/buttons/show_highlights_list_widget_button.js"; import NoteWrapperWidget from "../widgets/note_wrapper.js"; @@ -51,16 +36,13 @@ import FloatingButtons from "../widgets/floating_buttons/floating_buttons.js"; import RelationMapButtons from "../widgets/floating_buttons/relation_map_buttons.js"; import SvgExportButton from "../widgets/floating_buttons/svg_export_button.js"; import LauncherContainer from "../widgets/containers/launcher_container.js"; -import RevisionsButton from "../widgets/buttons/revisions_button.js"; import CodeButtonsWidget from "../widgets/floating_buttons/code_buttons.js"; import ApiLogWidget from "../widgets/api_log.js"; import HideFloatingButtonsButton from "../widgets/floating_buttons/hide_floating_buttons_button.js"; -import ScriptExecutorWidget from "../widgets/ribbon_widgets/script_executor.js"; import MovePaneButton from "../widgets/buttons/move_pane_button.js"; import UploadAttachmentsDialog from "../widgets/dialogs/upload_attachments.js"; import CopyImageReferenceButton from "../widgets/floating_buttons/copy_image_reference_button.js"; import ScrollPaddingWidget from "../widgets/scroll_padding.js"; -import ClassicEditorToolbar from "../widgets/ribbon_widgets/classic_editor_toolbar.js"; import options from "../services/options.js"; import utils from "../services/utils.js"; import GeoMapButtons from "../widgets/floating_buttons/geo_map_button.js"; diff --git a/apps/client/src/layouts/layout_commons.tsx b/apps/client/src/layouts/layout_commons.tsx index 9b9ac886f..0239e7db0 100644 --- a/apps/client/src/layouts/layout_commons.tsx +++ b/apps/client/src/layouts/layout_commons.tsx @@ -25,7 +25,7 @@ import IncorrectCpuArchDialog from "../widgets/dialogs/incorrect_cpu_arch.js"; import PopupEditorDialog from "../widgets/dialogs/popup_editor.js"; import FlexContainer from "../widgets/containers/flex_container.js"; import NoteIconWidget from "../widgets/note_icon"; -import PromotedAttributesWidget from "../widgets/ribbon_widgets/promoted_attributes.js"; +import PromotedAttributesWidget from "../widgets/promoted_attributes.js"; import NoteDetailWidget from "../widgets/note_detail.js"; import NoteListWidget from "../widgets/note_list.js"; import { CallToActionDialog } from "../widgets/dialogs/call_to_action.jsx"; diff --git a/apps/client/src/layouts/mobile_layout.ts b/apps/client/src/layouts/mobile_layout.ts index 10b6d2ebe..fb0d275d2 100644 --- a/apps/client/src/layouts/mobile_layout.ts +++ b/apps/client/src/layouts/mobile_layout.ts @@ -7,7 +7,6 @@ import ToggleSidebarButtonWidget from "../widgets/mobile_widgets/toggle_sidebar_ import MobileDetailMenuWidget from "../widgets/mobile_widgets/mobile_detail_menu.js"; import ScreenContainer from "../widgets/mobile_widgets/screen_container.js"; import ScrollingContainer from "../widgets/containers/scrolling_container.js"; -import FilePropertiesWidget from "../widgets/ribbon_widgets/file_properties.js"; import FloatingButtons from "../widgets/floating_buttons/floating_buttons.js"; import EditButton from "../widgets/floating_buttons/edit_button.js"; import RelationMapButtons from "../widgets/floating_buttons/relation_map_buttons.js"; @@ -19,12 +18,12 @@ import GlobalMenuWidget from "../widgets/buttons/global_menu.js"; import LauncherContainer from "../widgets/containers/launcher_container.js"; import RootContainer from "../widgets/containers/root_container.js"; import SharedInfoWidget from "../widgets/shared_info.js"; -import PromotedAttributesWidget from "../widgets/ribbon_widgets/promoted_attributes.js"; +import PromotedAttributesWidget from "../widgets/promoted_attributes.js"; import SidebarContainer from "../widgets/mobile_widgets/sidebar_container.js"; import type AppContext from "../components/app_context.js"; import TabRowWidget from "../widgets/tab_row.js"; import RefreshButton from "../widgets/floating_buttons/refresh_button.js"; -import MobileEditorToolbar from "../widgets/ribbon_widgets/mobile_editor_toolbar.js"; +import MobileEditorToolbar from "../widgets/type_widgets/ckeditor/mobile_editor_toolbar.js"; import { applyModals } from "./layout_commons.js"; import CloseZenButton from "../widgets/close_zen_button.js"; diff --git a/apps/client/src/widgets/ribbon_widgets/promoted_attributes.ts b/apps/client/src/widgets/promoted_attributes.ts similarity index 95% rename from apps/client/src/widgets/ribbon_widgets/promoted_attributes.ts rename to apps/client/src/widgets/promoted_attributes.ts index f661356ed..1b67ecec1 100644 --- a/apps/client/src/widgets/ribbon_widgets/promoted_attributes.ts +++ b/apps/client/src/widgets/promoted_attributes.ts @@ -1,16 +1,16 @@ -import { t } from "../../services/i18n.js"; -import server from "../../services/server.js"; -import ws from "../../services/ws.js"; -import treeService from "../../services/tree.js"; -import noteAutocompleteService from "../../services/note_autocomplete.js"; -import NoteContextAwareWidget from "../note_context_aware_widget.js"; -import attributeService from "../../services/attributes.js"; -import options from "../../services/options.js"; -import utils from "../../services/utils.js"; -import type FNote from "../../entities/fnote.js"; -import type { Attribute } from "../../services/attribute_parser.js"; -import type FAttribute from "../../entities/fattribute.js"; -import type { EventData } from "../../components/app_context.js"; +import { t } from "../services/i18n.js"; +import server from "../services/server.js"; +import ws from "../services/ws.js"; +import treeService from "../services/tree.js"; +import noteAutocompleteService from "../services/note_autocomplete.js"; +import NoteContextAwareWidget from "./note_context_aware_widget.js"; +import attributeService from "../services/attributes.js"; +import options from "../services/options.js"; +import utils from "../services/utils.js"; +import type FNote from "../entities/fnote.js"; +import type { Attribute } from "../services/attribute_parser.js"; +import type FAttribute from "../entities/fattribute.js"; +import type { EventData } from "../components/app_context.js"; const TPL = /*html*/`