From 8cf95a9a06ebac8892062a75ceacf336192adafe Mon Sep 17 00:00:00 2001 From: 1ilit Date: Fri, 5 Apr 2024 05:12:50 +0300 Subject: [PATCH] Fix imports for hooks --- src/components/EditorCanvas/Note.jsx | 20 +++++++---- src/components/EditorCanvas/Table.jsx | 14 ++++---- src/components/EditorHeader/ControlPanel.jsx | 14 ++++---- src/components/EditorHeader/Todo.jsx | 3 +- .../EditorSidePanel/AreasOverview.jsx | 4 +-- src/components/EditorSidePanel/Issues.jsx | 4 +-- .../EditorSidePanel/NotesOverview.jsx | 3 +- .../EditorSidePanel/RelationshipsOverview.jsx | 3 +- src/components/EditorSidePanel/SidePanel.jsx | 3 +- .../EditorSidePanel/TablesOverview.jsx | 5 +-- .../EditorSidePanel/TypesOverview.jsx | 3 +- src/components/FloatingControls.jsx | 3 +- src/components/Workspace.jsx | 22 ++++++------ src/hooks/index.js | 36 ++++++------------- src/pages/Survey.jsx | 4 +-- src/pages/Templates.jsx | 4 +-- 16 files changed, 66 insertions(+), 79 deletions(-) diff --git a/src/components/EditorCanvas/Note.jsx b/src/components/EditorCanvas/Note.jsx index 9677e00..13fd29d 100644 --- a/src/components/EditorCanvas/Note.jsx +++ b/src/components/EditorCanvas/Note.jsx @@ -1,16 +1,24 @@ import { useState } from "react"; -import { Action, ObjectType, noteThemes, Tab, State } from "../../data/constants"; +import { + Action, + ObjectType, + Tab, + State, + noteThemes, +} from "../../data/constants"; import { Input, Button, Popover, Toast } from "@douyinfe/semi-ui"; import { IconEdit, IconDeleteStroked, IconCheckboxTick, } from "@douyinfe/semi-icons"; -import useLayout from "../../hooks/useLayout"; -import useUndoRedo from "../../hooks/useUndoRedo"; -import useSelect from "../../hooks/useSelect"; -import useNotes from "../../hooks/useNotes"; -import useSaveState from "../../hooks/useSaveState"; +import { + useLayout, + useUndoRedo, + useSelect, + useNotes, + useSaveState, +} from "../../hooks"; export default function Note({ data, onMouseDown }) { const w = 180; diff --git a/src/components/EditorCanvas/Table.jsx b/src/components/EditorCanvas/Table.jsx index 95977bd..2d28f99 100644 --- a/src/components/EditorCanvas/Table.jsx +++ b/src/components/EditorCanvas/Table.jsx @@ -32,12 +32,14 @@ import { Toast, } from "@douyinfe/semi-ui"; import { getSize, hasCheck, hasPrecision, isSized } from "../../utils/toSQL"; -import useLayout from "../../hooks/useLayout"; -import useSettings from "../../hooks/useSettings"; -import useUndoRedo from "../../hooks/useUndoRedo"; -import useTables from "../../hooks/useTables"; -import useSelect from "../../hooks/useSelect"; -import useTypes from "../../hooks/useTypes"; +import { + useLayout, + useSettings, + useUndoRedo, + useTables, + useSelect, + useTypes, +} from "../../hooks"; export default function Table(props) { const [hoveredField, setHoveredField] = useState(-1); diff --git a/src/components/EditorHeader/ControlPanel.jsx b/src/components/EditorHeader/ControlPanel.jsx index 38fe797..7ab8388 100644 --- a/src/components/EditorHeader/ControlPanel.jsx +++ b/src/components/EditorHeader/ControlPanel.jsx @@ -58,12 +58,14 @@ import { db } from "../../data/db"; import { useLiveQuery } from "dexie-react-hooks"; import { Parser } from "node-sql-parser"; import Todo from "./Todo"; -import useLayout from "../../hooks/useLayout"; -import useSettings from "../../hooks/useSettings"; -import useTransform from "../../hooks/useTransform"; -import useTables from "../../hooks/useTables"; -import useUndoRedo from "../../hooks/useUndoRedo"; -import useSelect from "../../hooks/useSelect"; +import { + useLayout, + useSettings, + useTransform, + useTables, + useUndoRedo, + useSelect, +} from "../../hooks"; import { enterFullscreen, exitFullscreen } from "../../utils/fullscreen"; import { ddbDiagramIsValid, diff --git a/src/components/EditorHeader/Todo.jsx b/src/components/EditorHeader/Todo.jsx index a72c585..ba98594 100644 --- a/src/components/EditorHeader/Todo.jsx +++ b/src/components/EditorHeader/Todo.jsx @@ -20,8 +20,7 @@ import { IconCaretdown, } from "@douyinfe/semi-icons"; import { State } from "../../data/constants"; -import useTasks from "../../hooks/useTasks"; -import useSaveState from "../../hooks/useSaveState"; +import { useTasks, useSaveState } from "../../hooks"; const Priority = { NONE: 0, diff --git a/src/components/EditorSidePanel/AreasOverview.jsx b/src/components/EditorSidePanel/AreasOverview.jsx index f1e69df..d1a59e2 100644 --- a/src/components/EditorSidePanel/AreasOverview.jsx +++ b/src/components/EditorSidePanel/AreasOverview.jsx @@ -21,9 +21,7 @@ import { ObjectType, State, } from "../../data/constants"; -import useUndoRedo from "../../hooks/useUndoRedo"; -import useAreas from "../../hooks/useAreas"; -import useSaveState from "../../hooks/useSaveState"; +import { useUndoRedo, useAreas, useSaveState } from "../../hooks"; import Empty from "./Empty"; export default function AreasOverview() { diff --git a/src/components/EditorSidePanel/Issues.jsx b/src/components/EditorSidePanel/Issues.jsx index 5b0821b..7f02c03 100644 --- a/src/components/EditorSidePanel/Issues.jsx +++ b/src/components/EditorSidePanel/Issues.jsx @@ -2,9 +2,7 @@ import { useState, useEffect } from "react"; import { Collapse, Badge } from "@douyinfe/semi-ui"; import { arrayIsEqual } from "../../utils/utils"; import { getIssues } from "../../utils/issues"; -import useSettings from "../../hooks/useSettings"; -import useTables from "../../hooks/useTables"; -import useTypes from "../../hooks/useTypes"; +import { useSettings, useTables, useTypes } from "../../hooks"; export default function Issues() { const { settings } = useSettings(); diff --git a/src/components/EditorSidePanel/NotesOverview.jsx b/src/components/EditorSidePanel/NotesOverview.jsx index e973cc0..df8a912 100644 --- a/src/components/EditorSidePanel/NotesOverview.jsx +++ b/src/components/EditorSidePanel/NotesOverview.jsx @@ -17,8 +17,7 @@ import { IconCheckboxTick, } from "@douyinfe/semi-icons"; import { noteThemes, Action, ObjectType } from "../../data/constants"; -import useUndoRedo from "../../hooks/useUndoRedo"; -import useNotes from "../../hooks/useNotes"; +import { useUndoRedo, useNotes } from "../../hooks"; import Empty from "./Empty"; export default function NotesOverview() { diff --git a/src/components/EditorSidePanel/RelationshipsOverview.jsx b/src/components/EditorSidePanel/RelationshipsOverview.jsx index 5219be5..57491c4 100644 --- a/src/components/EditorSidePanel/RelationshipsOverview.jsx +++ b/src/components/EditorSidePanel/RelationshipsOverview.jsx @@ -21,8 +21,7 @@ import { Action, ObjectType, } from "../../data/constants"; -import useTables from "../../hooks/useTables"; -import useUndoRedo from "../../hooks/useUndoRedo"; +import { useTables, useUndoRedo } from "../../hooks"; import Empty from "./Empty"; export default function RelationshipsOverview() { diff --git a/src/components/EditorSidePanel/SidePanel.jsx b/src/components/EditorSidePanel/SidePanel.jsx index 46a1694..3166efe 100644 --- a/src/components/EditorSidePanel/SidePanel.jsx +++ b/src/components/EditorSidePanel/SidePanel.jsx @@ -6,8 +6,7 @@ import AreasOverview from "./AreasOverview"; import NotesOverview from "./NotesOverview"; import TypesOverview from "./TypesOverview"; import Issues from "./Issues"; -import useLayout from "../../hooks/useLayout"; -import useSelect from "../../hooks/useSelect"; +import { useLayout, useSelect } from "../../hooks"; export default function SidePanel({ width, resize, setResize }) { const { layout } = useLayout(); diff --git a/src/components/EditorSidePanel/TablesOverview.jsx b/src/components/EditorSidePanel/TablesOverview.jsx index 14f2382..ca22d06 100644 --- a/src/components/EditorSidePanel/TablesOverview.jsx +++ b/src/components/EditorSidePanel/TablesOverview.jsx @@ -31,10 +31,7 @@ import { IconSearch, } from "@douyinfe/semi-icons"; import { getSize, hasCheck, hasPrecision, isSized } from "../../utils/toSQL"; -import useTables from "../../hooks/useTables"; -import useUndoRedo from "../../hooks/useUndoRedo"; -import useSelect from "../../hooks/useSelect"; -import useTypes from "../../hooks/useTypes"; +import { useTables, useUndoRedo, useSelect, useTypes } from "../../hooks"; import NoElements from "./Empty"; export default function TablesOverview() { diff --git a/src/components/EditorSidePanel/TypesOverview.jsx b/src/components/EditorSidePanel/TypesOverview.jsx index a1c4a36..1babbb6 100644 --- a/src/components/EditorSidePanel/TypesOverview.jsx +++ b/src/components/EditorSidePanel/TypesOverview.jsx @@ -23,8 +23,7 @@ import { IconMore, } from "@douyinfe/semi-icons"; import { isSized, hasPrecision, getSize } from "../../utils/toSQL"; -import useUndoRedo from "../../hooks/useUndoRedo"; -import useTypes from "../../hooks/useTypes"; +import { useUndoRedo, useTypes } from "../../hooks"; import NoElements from "./Empty"; export default function TypesOverview() { diff --git a/src/components/FloatingControls.jsx b/src/components/FloatingControls.jsx index f423270..f10e6d7 100644 --- a/src/components/FloatingControls.jsx +++ b/src/components/FloatingControls.jsx @@ -1,6 +1,5 @@ import { Divider, Tooltip } from "@douyinfe/semi-ui"; -import useTransform from "../hooks/useTransform"; -import useLayout from "../hooks/useLayout"; +import { useTransform, useLayout } from "../hooks"; import { exitFullscreen } from "../utils/fullscreen"; export default function FloatingControls() { diff --git a/src/components/Workspace.jsx b/src/components/Workspace.jsx index e5b86a5..c3819c9 100644 --- a/src/components/Workspace.jsx +++ b/src/components/Workspace.jsx @@ -4,17 +4,19 @@ import Canvas from "./EditorCanvas/Canvas"; import SidePanel from "./EditorSidePanel/SidePanel"; import { State } from "../data/constants"; import { db } from "../data/db"; -import useLayout from "../hooks/useLayout"; -import useSettings from "../hooks/useSettings"; -import useTransform from "../hooks/useTransform"; -import useTables from "../hooks/useTables"; -import useUndoRedo from "../hooks/useUndoRedo"; +import { + useLayout, + useSettings, + useTransform, + useTables, + useUndoRedo, + useAreas, + useNotes, + useTypes, + useTasks, + useSaveState, +} from "../hooks/useLayout"; import FloatingControls from "./FloatingControls"; -import useAreas from "../hooks/useAreas"; -import useNotes from "../hooks/useNotes"; -import useTypes from "../hooks/useTypes"; -import useTasks from "../hooks/useTasks"; -import useSaveState from "../hooks/useSaveState"; export default function WorkSpace() { const [id, setId] = useState(0); diff --git a/src/hooks/index.js b/src/hooks/index.js index 7302e88..db4384a 100644 --- a/src/hooks/index.js +++ b/src/hooks/index.js @@ -1,25 +1,11 @@ -import useAreas from "./useAreas"; -import useLayout from "./useLayout"; -import useNotes from "./useNotes"; -import useSaveState from "./useSaveState"; -import useSelect from "./useSelect"; -import useSettings from "./useSettings"; -import useTables from "./useTables"; -import useTasks from "./useTasks"; -import useTransform from "./useTransform"; -import useTypes from "./useTypes"; -import useUndoRedo from "./useUndoRedo"; - -export { - useAreas, - useLayout, - useNotes, - useSaveState, - useSelect, - useSettings, - useTables, - useTasks, - useTransform, - useTypes, - useUndoRedo, -}; +export { default as useAreas } from "./useAreas"; +export { default as useLayout } from "./useLayout"; +export { default as useNotes } from "./useNotes"; +export { default as useSaveState } from "./useSaveState"; +export { default as useSelect } from "./useSelect"; +export { default as useSettings } from "./useSettings"; +export { default as useTables } from "./useTables"; +export { default as useTasks } from "./useTasks"; +export { default as useTransform } from "./useTransform"; +export { default as useTypes } from "./useTypes"; +export { default as useUndoRedo } from "./useUndoRedo"; diff --git a/src/pages/Survey.jsx b/src/pages/Survey.jsx index f9201e4..63a68cb 100644 --- a/src/pages/Survey.jsx +++ b/src/pages/Survey.jsx @@ -13,14 +13,14 @@ import { TextArea, } from "@douyinfe/semi-ui"; import { IconSun, IconMoon } from "@douyinfe/semi-icons"; -import RichEditor from "../components/LexicalEditor/RichEditor"; import { LexicalComposer } from "@lexical/react/LexicalComposer"; import { editorConfig } from "../data/editorConfig"; import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext"; import { $generateHtmlFromNodes } from "@lexical/html"; import { CLEAR_EDITOR_COMMAND } from "lexical"; -import axios from "axios"; import { Link } from "react-router-dom"; +import RichEditor from "../components/LexicalEditor/RichEditor"; +import axios from "axios"; function SurveyForm({ theme }) { const [editor] = useLexicalComposerContext(); diff --git a/src/pages/Templates.jsx b/src/pages/Templates.jsx index 8d615d8..208b436 100644 --- a/src/pages/Templates.jsx +++ b/src/pages/Templates.jsx @@ -1,12 +1,12 @@ import { useEffect } from "react"; -import logo_light from "../assets/logo_light_160.png"; -import template_screenshot from "../assets/template_screenshot.png"; import { Link } from "react-router-dom"; import { Tabs, TabPane, Banner, Steps } from "@douyinfe/semi-ui"; import { IconDeleteStroked } from "@douyinfe/semi-icons"; import { db } from "../data/db"; import { useLiveQuery } from "dexie-react-hooks"; import Thumbnail from "../components/Thumbnail"; +import logo_light from "../assets/logo_light_160.png"; +import template_screenshot from "../assets/template_screenshot.png"; export default function Templates() { const defaultTemplates = useLiveQuery(() =>