From 4623e391b92ae33a7b228ad7a9fac47f70534a76 Mon Sep 17 00:00:00 2001 From: 1ilit Date: Thu, 19 Oct 2023 11:36:46 +0300 Subject: [PATCH] Rename files and reorganize directories --- src/App.js | 14 +++++++------- .../{area_overview.jsx => AreaOverview.jsx} | 2 +- .../{control_panel.jsx => ControlPanel.jsx} | 6 +++--- .../{custom_icons.jsx => CustomIcons.jsx} | 0 .../{notes_overview.jsx => NotesOverview.jsx} | 2 +- ...ence_overview.jsx => ReferenceOverview.jsx} | 2 +- .../{rich_editor.jsx => RichEditor.jsx} | 0 .../{editor_panel.jsx => SidePanel.jsx} | 18 +++++++++--------- .../{table_overview.jsx => TableOverview.jsx} | 2 +- .../{types_overview.jsx => TypesOverview.jsx} | 2 +- src/components/area.jsx | 2 +- src/components/canvas.jsx | 10 +++++----- src/components/chat.jsx | 2 +- src/components/issues.jsx | 2 +- src/components/note.jsx | 2 +- src/components/sidebar.jsx | 6 +++--- src/components/table.jsx | 2 +- src/components/todo.jsx | 2 +- src/{schemas/index.js => data/schemas.js} | 0 src/pages/{bug_report.jsx => BugReport.jsx} | 2 +- .../{landing_page.jsx => LandingPage.jsx} | 0 src/pages/editor.jsx | 10 +++++----- src/pages/survey.jsx | 2 +- src/utils/index.js | 2 +- 24 files changed, 46 insertions(+), 46 deletions(-) rename src/components/{area_overview.jsx => AreaOverview.jsx} (99%) rename src/components/{control_panel.jsx => ControlPanel.jsx} (99%) rename src/components/{custom_icons.jsx => CustomIcons.jsx} (100%) rename src/components/{notes_overview.jsx => NotesOverview.jsx} (99%) rename src/components/{reference_overview.jsx => ReferenceOverview.jsx} (99%) rename src/components/{rich_editor.jsx => RichEditor.jsx} (100%) rename src/components/{editor_panel.jsx => SidePanel.jsx} (81%) rename src/components/{table_overview.jsx => TableOverview.jsx} (99%) rename src/components/{types_overview.jsx => TypesOverview.jsx} (99%) rename src/{schemas/index.js => data/schemas.js} (100%) rename src/pages/{bug_report.jsx => BugReport.jsx} (99%) rename src/pages/{landing_page.jsx => LandingPage.jsx} (100%) diff --git a/src/App.js b/src/App.js index 02f3026..a0c7924 100644 --- a/src/App.js +++ b/src/App.js @@ -1,11 +1,11 @@ import { BrowserRouter as Router, Routes, Route } from "react-router-dom"; -import Editor from "./pages/editor"; -import LandingPage from "./pages/landing_page"; -import Survey from "./pages/survey"; -import Shortcuts from "./pages/shortcuts"; -import BugReport from "./pages/bug_report"; -import SignUp from "./pages/signup"; -import Login from "./pages/login"; +import Editor from "./pages/Editor"; +import LandingPage from "./pages/LandingPage"; +import Survey from "./pages/Survey"; +import BugReport from "./pages/BugReport"; +import SignUp from "./pages/Signup"; +import Shortcuts from "./pages/Shortcuts" +import Login from "./pages/Login"; function App() { return ( diff --git a/src/components/area_overview.jsx b/src/components/AreaOverview.jsx similarity index 99% rename from src/components/area_overview.jsx rename to src/components/AreaOverview.jsx index ba309a6..3879ac6 100644 --- a/src/components/area_overview.jsx +++ b/src/components/AreaOverview.jsx @@ -25,7 +25,7 @@ import { Action, ObjectType, } from "../data/data"; -import { AreaContext, UndoRedoContext } from "../pages/editor"; +import { AreaContext, UndoRedoContext } from "../pages/Editor"; export default function AreaOverview(props) { const { areas, addArea, deleteArea, updateArea } = useContext(AreaContext); diff --git a/src/components/control_panel.jsx b/src/components/ControlPanel.jsx similarity index 99% rename from src/components/control_panel.jsx rename to src/components/ControlPanel.jsx index aa386f4..9f5185a 100644 --- a/src/components/control_panel.jsx +++ b/src/components/ControlPanel.jsx @@ -50,13 +50,13 @@ import { TableContext, TypeContext, UndoRedoContext, -} from "../pages/editor"; -import { IconAddTable, IconAddArea, IconAddNote } from "./custom_icons"; +} from "../pages/Editor"; +import { IconAddTable, IconAddArea, IconAddNote } from "./CustomIcons"; import { ObjectType, Action, Tab } from "../data/data"; import jsPDF from "jspdf"; import { useHotkeys } from "react-hotkeys-hook"; import { Validator } from "jsonschema"; -import { areaSchema, noteSchema, tableSchema } from "../schemas"; +import { areaSchema, noteSchema, tableSchema } from "../data/schemas"; import { Editor } from "@monaco-editor/react"; export default function ControlPanel(props) { diff --git a/src/components/custom_icons.jsx b/src/components/CustomIcons.jsx similarity index 100% rename from src/components/custom_icons.jsx rename to src/components/CustomIcons.jsx diff --git a/src/components/notes_overview.jsx b/src/components/NotesOverview.jsx similarity index 99% rename from src/components/notes_overview.jsx rename to src/components/NotesOverview.jsx index d8a5002..d860e0c 100644 --- a/src/components/notes_overview.jsx +++ b/src/components/NotesOverview.jsx @@ -21,7 +21,7 @@ import { IconSearch, IconCheckboxTick, } from "@douyinfe/semi-icons"; -import { NoteContext, UndoRedoContext } from "../pages/editor"; +import { NoteContext, UndoRedoContext } from "../pages/Editor"; import { noteThemes, Action, ObjectType } from "../data/data"; export default function NotesOverview(props) { diff --git a/src/components/reference_overview.jsx b/src/components/ReferenceOverview.jsx similarity index 99% rename from src/components/reference_overview.jsx rename to src/components/ReferenceOverview.jsx index f9f5411..17ac6f6 100644 --- a/src/components/reference_overview.jsx +++ b/src/components/ReferenceOverview.jsx @@ -22,7 +22,7 @@ import { IllustrationNoContentDark, } from "@douyinfe/semi-illustrations"; import { Cardinality, Constraint, Action, ObjectType } from "../data/data"; -import { TableContext, UndoRedoContext } from "../pages/editor"; +import { TableContext, UndoRedoContext } from "../pages/Editor"; export default function ReferenceOverview(props) { const columns = [ diff --git a/src/components/rich_editor.jsx b/src/components/RichEditor.jsx similarity index 100% rename from src/components/rich_editor.jsx rename to src/components/RichEditor.jsx diff --git a/src/components/editor_panel.jsx b/src/components/SidePanel.jsx similarity index 81% rename from src/components/editor_panel.jsx rename to src/components/SidePanel.jsx index 603ccff..6416b45 100644 --- a/src/components/editor_panel.jsx +++ b/src/components/SidePanel.jsx @@ -1,15 +1,15 @@ import { React, useContext } from "react"; import { Tabs } from "@douyinfe/semi-ui"; -import TableOverview from "./table_overview"; -import ReferenceOverview from "./reference_overview"; -import AreaOverview from "./area_overview"; +import TableOverview from "./TableOverview"; +import ReferenceOverview from "./ReferenceOverview"; +import AreaOverview from "./AreaOverview"; import { Tab } from "../data/data"; -import { LayoutContext, TabContext } from "../pages/editor"; -import NotesOverview from "./notes_overview"; -import Issues from "./issues"; -import TypesOverview from "./types_overview"; +import { LayoutContext, TabContext } from "../pages/Editor"; +import NotesOverview from "./NotesOverview"; +import Issues from "./Issues"; +import TypesOverview from "./TypesOverview"; -const EditorPanel = (props) => { +const SidePanel = (props) => { const { tab, setTab } = useContext(TabContext); const { layout } = useContext(LayoutContext); @@ -65,4 +65,4 @@ const EditorPanel = (props) => { ); }; -export default EditorPanel; +export default SidePanel; diff --git a/src/components/table_overview.jsx b/src/components/TableOverview.jsx similarity index 99% rename from src/components/table_overview.jsx rename to src/components/TableOverview.jsx index 226f082..feae082 100644 --- a/src/components/table_overview.jsx +++ b/src/components/TableOverview.jsx @@ -40,7 +40,7 @@ import { TableContext, TypeContext, UndoRedoContext, -} from "../pages/editor"; +} from "../pages/Editor"; import { getSize, hasCheck, hasPrecision, isSized } from "../utils"; export default function TableOverview(props) { diff --git a/src/components/types_overview.jsx b/src/components/TypesOverview.jsx similarity index 99% rename from src/components/types_overview.jsx rename to src/components/TypesOverview.jsx index ebdae6e..f2ffe65 100644 --- a/src/components/types_overview.jsx +++ b/src/components/TypesOverview.jsx @@ -27,7 +27,7 @@ import { IllustrationNoContent, IllustrationNoContentDark, } from "@douyinfe/semi-illustrations"; -import { TypeContext, UndoRedoContext } from "../pages/editor"; +import { TypeContext, UndoRedoContext } from "../pages/Editor"; import { isSized, hasPrecision, getSize } from "../utils"; export default function TableOverview(props) { diff --git a/src/components/area.jsx b/src/components/area.jsx index 8fce049..808a2ed 100644 --- a/src/components/area.jsx +++ b/src/components/area.jsx @@ -19,7 +19,7 @@ import { SettingsContext, TabContext, UndoRedoContext, -} from "../pages/editor"; +} from "../pages/Editor"; export default function Area(props) { const [hovered, setHovered] = useState(false); diff --git a/src/components/canvas.jsx b/src/components/canvas.jsx index 6bdcdd0..bdcbab2 100644 --- a/src/components/canvas.jsx +++ b/src/components/canvas.jsx @@ -1,8 +1,8 @@ import React, { useContext, useRef, useState, useEffect } from "react"; -import Table from "./table"; +import Table from "./Table"; import { Action, Cardinality, Constraint, ObjectType } from "../data/data"; -import Area from "./area"; -import Relationship from "./relationship"; +import Area from "./Area"; +import Relationship from "./Relationship"; import { AreaContext, NoteContext, @@ -10,8 +10,8 @@ import { TableContext, UndoRedoContext, SelectContext, -} from "../pages/editor"; -import Note from "./note"; +} from "../pages/Editor"; +import Note from "./Note"; import { Toast } from "@douyinfe/semi-ui"; export default function Canvas(props) { diff --git a/src/components/chat.jsx b/src/components/chat.jsx index 57cafc1..940e120 100644 --- a/src/components/chat.jsx +++ b/src/components/chat.jsx @@ -2,7 +2,7 @@ import React, { useContext, useState } from "react"; import { Button, Input, Tag, Avatar } from "@douyinfe/semi-ui"; import { IconSend } from "@douyinfe/semi-icons"; import { socket } from "../data/socket"; -import { MessageContext } from "../pages/editor"; +import { MessageContext } from "../pages/Editor"; export default function Chat() { const [message, setMessage] = useState(""); diff --git a/src/components/issues.jsx b/src/components/issues.jsx index 300bb11..2c30d3d 100644 --- a/src/components/issues.jsx +++ b/src/components/issues.jsx @@ -1,6 +1,6 @@ import React, { useContext, useState, useEffect } from "react"; import { Collapse, Badge } from "@douyinfe/semi-ui"; -import { SettingsContext, TableContext, TypeContext } from "../pages/editor"; +import { SettingsContext, TableContext, TypeContext } from "../pages/Editor"; import { validateDiagram, arrayIsEqual } from "../utils"; export default function Issues() { diff --git a/src/components/note.jsx b/src/components/note.jsx index fe9dfe6..6b75f94 100644 --- a/src/components/note.jsx +++ b/src/components/note.jsx @@ -5,7 +5,7 @@ import { UndoRedoContext, TabContext, SelectContext, -} from "../pages/editor"; +} from "../pages/Editor"; import { Action, ObjectType, noteThemes, Tab } from "../data/data"; import { Input, Button, Popover, Toast } from "@douyinfe/semi-ui"; import { diff --git a/src/components/sidebar.jsx b/src/components/sidebar.jsx index f4b481c..9b6a040 100644 --- a/src/components/sidebar.jsx +++ b/src/components/sidebar.jsx @@ -10,9 +10,9 @@ import { MessageContext, SettingsContext, UndoRedoContext, -} from "../pages/editor"; -import Todo from "./todo"; -import Chat from "./chat"; +} from "../pages/Editor"; +import Todo from "./Todo"; +import Chat from "./Chat"; export default function Sidebar() { const SidesheetType = { diff --git a/src/components/table.jsx b/src/components/table.jsx index 8cdc101..bb34a6a 100644 --- a/src/components/table.jsx +++ b/src/components/table.jsx @@ -41,7 +41,7 @@ import { TableContext, TypeContext, UndoRedoContext, -} from "../pages/editor"; +} from "../pages/Editor"; import { getSize, hasCheck, hasPrecision, isSized } from "../utils"; export default function Table(props) { diff --git a/src/components/todo.jsx b/src/components/todo.jsx index 77be231..3e3a2c9 100644 --- a/src/components/todo.jsx +++ b/src/components/todo.jsx @@ -19,7 +19,7 @@ import { IconDeleteStroked, IconCaretdown, } from "@douyinfe/semi-icons"; -import { TaskContext } from "../pages/editor"; +import { TaskContext } from "../pages/Editor"; export default function Todo() { const Priority = { NONE: 0, diff --git a/src/schemas/index.js b/src/data/schemas.js similarity index 100% rename from src/schemas/index.js rename to src/data/schemas.js diff --git a/src/pages/bug_report.jsx b/src/pages/BugReport.jsx similarity index 99% rename from src/pages/bug_report.jsx rename to src/pages/BugReport.jsx index 2cdf763..8c9a099 100644 --- a/src/pages/bug_report.jsx +++ b/src/pages/BugReport.jsx @@ -8,7 +8,7 @@ import { IconGithubLogo, IconPaperclip, } from "@douyinfe/semi-icons"; -import RichEditor from "../components/rich_editor"; +import RichEditor from "../components/RichEditor"; import { LexicalComposer } from "@lexical/react/LexicalComposer"; import { editorConfig } from "../data/editor_config"; import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext"; diff --git a/src/pages/landing_page.jsx b/src/pages/LandingPage.jsx similarity index 100% rename from src/pages/landing_page.jsx rename to src/pages/LandingPage.jsx diff --git a/src/pages/editor.jsx b/src/pages/editor.jsx index c90bf78..0429967 100644 --- a/src/pages/editor.jsx +++ b/src/pages/editor.jsx @@ -1,8 +1,8 @@ import React, { useState, createContext, useEffect } from "react"; -import Sidebar from "../components/sidebar"; -import ControlPanel from "../components/control_panel"; -import Canvas from "../components/canvas"; -import EditorPanel from "../components/editor_panel"; +import Sidebar from "../components/Sidebar"; +import ControlPanel from "../components/ControlPanel"; +import Canvas from "../components/Canvas"; +import SidePanel from "../components/SidePanel"; import { Tab, defaultTableTheme, @@ -568,7 +568,7 @@ export default function Editor(props) { onMouseMove={dragHandler} > {layout.sidebar && ( -