Skip to content

Free, simple, and intuitive online database diagram editor and SQL generator.

Remove todos (#863)

1ilit361a47831dea
diff --git a/src/components/EditorHeader/ControlPanel.jsx b/src/components/EditorHeader/ControlPanel.jsx
index 30f53d3a..f7d44dcb 100644
--- a/src/components/EditorHeader/ControlPanel.jsx
+++ b/src/components/EditorHeader/ControlPanel.jsx
@@ -63,7 +63,6 @@ import {
useAreas,
useEnums,
useFullscreen,
- useTasks,
} from "../../hooks";
import { enterFullscreen, exitFullscreen } from "../../utils/fullscreen";
import { dataURItoBlob } from "../../utils/utils";
@@ -755,7 +754,6 @@ export default function ControlPanel({
const open = () => setModal(MODAL.OPEN);
const saveDiagramAs = () => setModal(MODAL.SAVEAS);
const fullscreen = useFullscreen();
- const { setTasks } = useTasks();
const loadDiagram = async (id) => {
await db.diagrams
.get(id)
@@ -773,7 +771,6 @@ export default function ControlPanel({
setAreas(diagram.areas);
setGistId(diagram.gistId ?? "");
setNotes(diagram.notes);
- setTasks(diagram.todos ?? []);
setTransform({
pan: diagram.pan,
zoom: diagram.zoom,
@@ -1812,15 +1809,6 @@ export default function ControlPanel({
<IconSaveStroked size="extra-large" />
</button>
</Tooltip>
-
- <Tooltip content={t("to_do")} position="bottom">
- <button
- className="py-1 px-2 hover-2 rounded-sm text-xl -mt-0.5"
- onClick={() => setSidesheet(SIDESHEET.TODO)}
- >
- <i className="fa-regular fa-calendar-check" />
- </button>
- </Tooltip>
<Divider layout="vertical" margin="8px" />
<Tooltip content={t("versions")} position="bottom">
<button
diff --git a/src/components/EditorHeader/Modal/Modal.jsx b/src/components/EditorHeader/Modal/Modal.jsx
index 04940bef..fd6e6b76 100644
--- a/src/components/EditorHeader/Modal/Modal.jsx
+++ b/src/components/EditorHeader/Modal/Modal.jsx
@@ -19,7 +19,6 @@ import {
useEnums,
useNotes,
useSaveState,
- useTasks,
useTransform,
useTypes,
useUndoRedo,
@@ -68,7 +67,6 @@ export default function Modal({
const { setAreas } = useAreas();
const { setTypes } = useTypes();
const { setEnums } = useEnums();
- const { setTasks } = useTasks();
const { setTransform } = useTransform();
const { setUndoStack, setRedoStack } = useUndoRedo();
const { setSaveState } = useSaveState();
@@ -121,7 +119,6 @@ export default function Modal({
setRelationships(diagram.references);
setAreas(diagram.areas);
setNotes(diagram.notes);
- setTasks(diagram.todos ?? []);
setGistId(diagram.gistId ?? "");
setTransform({
pan: diagram.pan,
diff --git a/src/components/EditorHeader/SideSheet/Sidesheet.jsx b/src/components/EditorHeader/SideSheet/Sidesheet.jsx
index c0221e7e..68880c47 100644
--- a/src/components/EditorHeader/SideSheet/Sidesheet.jsx
+++ b/src/components/EditorHeader/SideSheet/Sidesheet.jsx
@@ -1,7 +1,6 @@
import { SideSheet as SemiUISideSheet } from "@douyinfe/semi-ui";
import { SIDESHEET } from "../../../data/constants";
import Timeline from "./Timeline";
-import Todo from "./Todo";
import Versions from "./Versions";
import { useTranslation } from "react-i18next";
@@ -12,8 +11,6 @@ export default function Sidesheet({ type, title, setTitle, onClose }) {
switch (type) {
case SIDESHEET.TIMELINE:
return t("timeline");
- case SIDESHEET.TODO:
- return t("to_do");
case SIDESHEET.VERSIONS:
return t("versions");
default:
@@ -25,8 +22,6 @@ export default function Sidesheet({ type, title, setTitle, onClose }) {
switch (type) {
case SIDESHEET.TIMELINE:
return <Timeline />;
- case SIDESHEET.TODO:
- return <Todo />;
case SIDESHEET.VERSIONS:
return (
<Versions
diff --git a/src/components/EditorHeader/SideSheet/Todo.jsx b/src/components/EditorHeader/SideSheet/Todo.jsx
deleted file mode 100644
index 03f20a57..00000000
--- a/src/components/EditorHeader/SideSheet/Todo.jsx
+++ /dev/null
@@ -1,274 +0,0 @@
-import { useState } from "react";
-import {
- Checkbox,
- Input,
- TextArea,
- Row,
- Col,
- Dropdown,
- Button,
- Popover,
- Tag,
- List,
- RadioGroup,
- Radio,
-} from "@douyinfe/semi-ui";
-import {
- IconPlus,
- IconMore,
- IconDeleteStroked,
- IconCaretdown,
-} from "@douyinfe/semi-icons";
-import { State } from "../../../data/constants";
-import { useTasks, useSaveState } from "../../../hooks";
-import { useTranslation } from "react-i18next";
-
-const Priority = {
- NONE: 0,
- LOW: 1,
- MEDIUM: 2,
- HIGH: 3,
-};
-
-const SortOrder = {
- ORIGINAL: "my_order",
- PRIORITY: "priority",
- COMPLETED: "completed",
- ALPHABETICALLY: "alphabetically",
-};
-
-export default function Todo() {
- const [activeTask, setActiveTask] = useState(-1);
- const [, setSortOrder] = useState(SortOrder.ORIGINAL);
- const { tasks, setTasks, updateTask } = useTasks();
- const { setSaveState } = useSaveState();
- const { t } = useTranslation();
-
- const priorityLabel = (p) => {
- switch (p) {
- case Priority.NONE:
- return t("none");
- case Priority.LOW:
- return t("low");
- case Priority.MEDIUM:
- return t("medium");
- case Priority.HIGH:
- return t("high");
- default:
- return "";
- }
- };
-
- const priorityColor = (p) => {
- switch (p) {
- case Priority.NONE:
- return "blue";
- case Priority.LOW:
- return "green";
- case Priority.MEDIUM:
- return "yellow";
- case Priority.HIGH:
- return "red";
- default:
- return "";
- }
- };
-
- const sort = (s) => {
- setActiveTask(-1);
- switch (s) {
- case SortOrder.ORIGINAL:
- setTasks((prev) => prev.sort((a, b) => a.order - b.order));
- return;
- case SortOrder.PRIORITY:
- setTasks((prev) => prev.sort((a, b) => b.priority - a.priority));
- return;
- case SortOrder.COMPLETED:
- setTasks((prev) =>
- prev.sort((a, b) => {
- if (a.complete && !b.complete) {
- return 1;
- } else if (!a.complete && b.complete) {
- return -1;
- } else {
- return 0;
- }
- }),
- );
- break;
- case SortOrder.ALPHABETICALLY:
- setTasks((prev) => prev.sort((a, b) => a.title.localeCompare(b.title)));
- break;
- default:
- break;
- }
- };
-
- return (
- <>
- <div className="flex justify-between items-center mx-5 mb-2">
- <Dropdown
- render={
- <Dropdown.Menu>
- {Object.values(SortOrder).map((order) => (
- <Dropdown.Item
- key={order}
- onClick={() => {
- setSortOrder(order);
- sort(order);
- }}
- >
- {t(order)}
- </Dropdown.Item>
- ))}
- </Dropdown.Menu>
- }
- trigger="click"
- >
- <Button
- style={{ marginRight: "10px" }}
- theme="borderless"
- type="tertiary"
- >
- {t("sort_by")} <IconCaretdown />
- </Button>
- </Dropdown>
- <Button
- icon={<IconPlus />}
- block
- onClick={() => {
- setTasks((prev) => [
- {
- complete: false,
- details: "",
- title: "",
- priority: Priority.NONE,
- order: prev.length,
- },
- ...prev,
- ]);
- }}
- >
- {t("add_task")}
- </Button>
- </div>
- {tasks.length > 0 ? (
- <List>
- {tasks.map((task, i) => (
- <List.Item
- key={i}
- style={{ paddingLeft: "18px", paddingRight: "18px" }}
- className="hover-1"
- onClick={() => setActiveTask(i)}
- >
- <div className="w-full">
- <Row gutter={6} align="middle" type="flex" className="mb-2">
- <Col span={2}>
- <Checkbox
- checked={task.complete}
- onChange={(e) => {
- updateTask(i, { complete: e.target.checked });
- setSaveState(State.SAVING);
- }}
- ></Checkbox>
- </Col>
- <Col span={19}>
- <Input
- placeholder={t("title")}
- onChange={(v) => updateTask(i, { title: v })}
- value={task.title}
- onBlur={() => setSaveState(State.SAVING)}
- />
- </Col>
- <Col span={3}>
- <Popover
- content={
- <div className="p-2 popover-theme">
- <div className="mb-2 font-semibold">
- {t("priority")}:
- </div>
- <RadioGroup
- onChange={(e) => {
- updateTask(i, { priority: e.target.value });
- setSaveState(State.SAVING);
- }}
- value={task.priority}
- direction="vertical"
- >
- <Radio value={Priority.NONE}>
- <Tag color={priorityColor(Priority.NONE)}>
- {priorityLabel(Priority.NONE)}
- </Tag>
- </Radio>
- <Radio value={Priority.LOW}>
- <Tag color={priorityColor(Priority.LOW)}>
- {priorityLabel(Priority.LOW)}
- </Tag>
- </Radio>
- <Radio value={Priority.MEDIUM}>
- <Tag color={priorityColor(Priority.MEDIUM)}>
- {priorityLabel(Priority.MEDIUM)}
- </Tag>
- </Radio>
- <Radio value={Priority.HIGH}>
- <Tag color={priorityColor(Priority.HIGH)}>
- {priorityLabel(Priority.HIGH)}
- </Tag>
- </Radio>
- </RadioGroup>
- <Button
- icon={<IconDeleteStroked />}
- type="danger"
- block
- style={{ marginTop: "12px" }}
- onClick={() => {
- setTasks((prev) =>
- prev.filter((_, j) => i !== j),
- );
- setSaveState(State.SAVING);
- }}
- >
- {t("delete")}
- </Button>
- </div>
- }
- trigger="click"
- showArrow
- className="w-[180px]"
- >
- <Button icon={<IconMore />} type="tertiary" />
- </Popover>
- </Col>
- </Row>
- {activeTask === i && (
- <Row className="mb-2">
- <Col span={2}></Col>
- <Col span={22}>
- <TextArea
- placeholder={t("details")}
- onChange={(v) => updateTask(i, { details: v })}
- value={task.details}
- onBlur={() => setSaveState(State.SAVING)}
- ></TextArea>
- </Col>
- </Row>
- )}
- <Row>
- <Col span={2}></Col>
- <Col span={22}>
- {t("priority")}:{" "}
- <Tag color={priorityColor(task.priority)}>
- {priorityLabel(task.priority)}
- </Tag>
- </Col>
- </Row>
- </div>
- </List.Item>
- ))}
- </List>
- ) : (
- <div className="m-5">{t("no_tasks")}</div>
- )}
- </>
- );
-}
diff --git a/src/components/Workspace.jsx b/src/components/Workspace.jsx
index 38f53d54..793c2c6c 100644
--- a/src/components/Workspace.jsx
+++ b/src/components/Workspace.jsx
@@ -14,7 +14,6 @@ import {
useAreas,
useNotes,
useTypes,
- useTasks,
useSaveState,
useEnums,
} from "../hooks";
@@ -53,7 +52,6 @@ export default function WorkSpace() {
const { settings } = useSettings();
const { types, setTypes } = useTypes();
const { areas, setAreas } = useAreas();
- const { tasks, setTasks } = useTasks();
const { notes, setNotes } = useNotes();
const { saveState, setSaveState } = useSaveState();
const { transform, setTransform } = useTransform();
@@ -96,7 +94,6 @@ export default function WorkSpace() {
references: relationships,
notes: notes,
areas: areas,
- todos: tasks,
pan: transform.pan,
zoom: transform.zoom,
loadedFromGistId: loadedFromGistId,
@@ -119,7 +116,6 @@ export default function WorkSpace() {
references: relationships,
notes: notes,
areas: areas,
- todos: tasks,
gistId: gistId ?? "",
pan: transform.pan,
zoom: transform.zoom,
@@ -141,7 +137,6 @@ export default function WorkSpace() {
relationships: relationships,
notes: notes,
subjectAreas: areas,
- todos: tasks,
pan: transform.pan,
zoom: transform.zoom,
...(databases[database].hasEnums && { enums: enums }),
@@ -165,7 +160,6 @@ export default function WorkSpace() {
types,
title,
id,
- tasks,
transform,
setSaveState,
database,
@@ -194,7 +188,6 @@ export default function WorkSpace() {
setRelationships(d.references);
setNotes(d.notes);
setAreas(d.areas);
- setTasks(d.todos ?? []);
setTransform({ pan: d.pan, zoom: d.zoom });
if (databases[database].hasTypes) {
if (d.types) {
@@ -249,7 +242,6 @@ export default function WorkSpace() {
setRelationships(diagram.references);
setAreas(diagram.areas);
setNotes(diagram.notes);
- setTasks(diagram.todos ?? []);
setTransform({
pan: diagram.pan,
zoom: diagram.zoom,
@@ -307,7 +299,6 @@ export default function WorkSpace() {
setTables(diagram.tables);
setRelationships(diagram.relationships);
setAreas(diagram.subjectAreas);
- setTasks(diagram.todos ?? []);
setNotes(diagram.notes);
setTransform({
zoom: 1,
@@ -444,7 +435,6 @@ export default function WorkSpace() {
setAreas,
setNotes,
setTypes,
- setTasks,
setDatabase,
database,
setEnums,
@@ -464,8 +454,7 @@ export default function WorkSpace() {
tables?.length === 0 &&
areas?.length === 0 &&
notes?.length === 0 &&
- types?.length === 0 &&
- tasks?.length === 0
+ types?.length === 0
)
return;
@@ -481,7 +470,6 @@ export default function WorkSpace() {
notes?.length,
types?.length,
relationships?.length,
- tasks?.length,
transform.zoom,
title,
gistId,
diff --git a/src/context/TasksContext.jsx b/src/context/TasksContext.jsx
deleted file mode 100644
index 89858f3a..00000000
--- a/src/context/TasksContext.jsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { createContext, useState } from "react";
-
-export const TasksContext = createContext(null);
-
-export default function TasksContextProvider({ children }) {
- const [tasks, setTasks] = useState([]);
-
- const updateTask = (id, values) =>
- setTasks((prev) =>
- prev.map((task, i) => (id === i ? { ...task, ...values } : task))
- );
-
- return (
- <TasksContext.Provider value={{ tasks, setTasks, updateTask }}>
- {children}
- </TasksContext.Provider>
- );
-}
diff --git a/src/data/constants.js b/src/data/constants.js
index 66eadaba..35b5976b 100644
--- a/src/data/constants.js
+++ b/src/data/constants.js
@@ -98,9 +98,8 @@ export const STATUS = {
export const SIDESHEET = {
NONE: 0,
- TODO: 1,
- TIMELINE: 2,
- VERSIONS: 3,
+ TIMELINE: 1,
+ VERSIONS: 2,
};
export const DB = {
diff --git a/src/hooks/index.js b/src/hooks/index.js
index d24b45c7..bc279d88 100644
--- a/src/hooks/index.js
+++ b/src/hooks/index.js
@@ -7,7 +7,6 @@ export { default as useSaveState } from "./useSaveState";
export { default as useSelect } from "./useSelect";
export { default as useSettings } from "./useSettings";
export { default as useDiagram } from "./useDiagram";
-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/hooks/useTasks.js b/src/hooks/useTasks.js
deleted file mode 100644
index f64cc29d..00000000
--- a/src/hooks/useTasks.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { useContext } from "react";
-import { TasksContext } from "../context/TasksContext";
-
-export default function useTasks() {
- return useContext(TasksContext);
-}
diff --git a/src/i18n/locales/en.js b/src/i18n/locales/en.js
index d78124ee..81d5679b 100644
--- a/src/i18n/locales/en.js
+++ b/src/i18n/locales/en.js
@@ -95,7 +95,6 @@ const en = {
add_area: "Add area",
add_note: "Add note",
add_type: "Add type",
- to_do: "To-do",
tables: "Tables",
relationships: "Relationships",
subject_areas: "Subject areas",
@@ -201,18 +200,7 @@ const en = {
duplicate_reference: "Duplicate reference by the name '{{refName}}'",
circular_dependency: "Circular dependency involving table '{{refName}}'",
timeline: "Timeline",
- priority: "Priority",
- none: "None",
- low: "Low",
- medium: "Medium",
- high: "High",
- sort_by: "Sort by",
- my_order: "My order",
- completed: "Completed",
- alphabetically: "Alphabetically",
- add_task: "Add task",
details: "Details",
- no_tasks: "You have no tasks yet.",
no_activity: "You have no activity yet.",
move_element: "Move {{name}} to {{coords}}",
edit_area: "{{extra}} Edit area {{areaName}}",
diff --git a/src/pages/Editor.jsx b/src/pages/Editor.jsx
index 24b5afef..7da3f0de 100644
--- a/src/pages/Editor.jsx
+++ b/src/pages/Editor.jsx
@@ -6,7 +6,6 @@ import SelectContextProvider from "../context/SelectContext";
import AreasContextProvider from "../context/AreasContext";
import NotesContextProvider from "../context/NotesContext";
import TypesContextProvider from "../context/TypesContext";
-import TasksContextProvider from "../context/TasksContext";
import SaveStateContextProvider from "../context/SaveStateContext";
import EnumsContextProvider from "../context/EnumsContext";
import WorkSpace from "../components/Workspace";
@@ -20,21 +19,19 @@ export default function Editor() {
<TransformContextProvider>
<UndoRedoContextProvider>
<SelectContextProvider>
- <TasksContextProvider>
- <AreasContextProvider>
- <NotesContextProvider>
- <TypesContextProvider>
- <EnumsContextProvider>
- <TablesContextProvider>
- <SaveStateContextProvider>
- <WorkSpace />
- </SaveStateContextProvider>
- </TablesContextProvider>
- </EnumsContextProvider>
- </TypesContextProvider>
- </NotesContextProvider>
- </AreasContextProvider>
- </TasksContextProvider>
+ <AreasContextProvider>
+ <NotesContextProvider>
+ <TypesContextProvider>
+ <EnumsContextProvider>
+ <TablesContextProvider>
+ <SaveStateContextProvider>
+ <WorkSpace />
+ </SaveStateContextProvider>
+ </TablesContextProvider>
+ </EnumsContextProvider>
+ </TypesContextProvider>
+ </NotesContextProvider>
+ </AreasContextProvider>
</SelectContextProvider>
</UndoRedoContextProvider>
</TransformContextProvider>
diff --git a/src/pages/LandingPage.jsx b/src/pages/LandingPage.jsx
index 4fe62f07..eccb9731 100644
--- a/src/pages/LandingPage.jsx
+++ b/src/pages/LandingPage.jsx
@@ -301,7 +301,8 @@ export default function LandingPage() {
</div>
<hr className="border-zinc-300" />
<div className="text-center text-sm py-3">
- &copy; {new Date().getFullYear()} <strong>drawDB</strong> - All rights reserved.
+ &copy; {new Date().getFullYear()} <strong>drawDB</strong> - All rights
+ reserved.
</div>
</div>
);
@@ -336,6 +337,16 @@ const features = [
),
footer: "",
},
+ {
+ title: "Generate migrations",
+ content: (
+ <div>
+ Version your diagram and generate migration scripts to update your
+ database
+ </div>
+ ),
+ footer: "",
+ },
{
title: "Customizable workspace",
content: (
@@ -433,9 +444,4 @@ const features = [
),
footer: "",
},
- {
- title: "Track todos",
- content: <div>Keep track of tasks and mark them done when finished.</div>,
- footer: "",
- },
];