Free, simple, and intuitive online database diagram editor and SQL generator.
JavaScript databasedatabase-designdatabase-diagramdatabase-schemadbmldiagram-editoreditorer-diagramerderdiagramindexeddbmariadbmcporacle-databaseoracle-dbpostgresqlschema-designsqlsql-serversqlite
Add code editor
1ilitfb969323793e
diff --git a/package-lock.json b/package-lock.jsonindex 37e94bd4..44d98192 100644--- a/package-lock.json+++ b/package-lock.json@@ -8,9 +8,14 @@"name": "frontend","version": "0.1.0","dependencies": {+ "@codemirror/lang-sql": "^6.5.0",+ "@lezer/highlight": "^1.1.5","@testing-library/jest-dom": "^5.16.5","@testing-library/react": "^13.4.0","@testing-library/user-event": "^13.5.0",+ "@uiw/codemirror-themes": "^4.20.2",+ "@uiw/react-codemirror": "^4.20.2",+ "codemirror": "^5.65.13","jointjs": "^3.7.2","react": "^18.2.0","react-dom": "^18.2.0",@@ -1872,6 +1877,105 @@"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz","integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="},+ "node_modules/@codemirror/autocomplete": {+ "version": "6.7.1",+ "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.7.1.tgz",+ "integrity": "sha512-hSxf9S0uB+GV+gBsjY1FZNo53e1FFdzPceRfCfD1gWOnV6o21GfB5J5Wg9G/4h76XZMPrF0A6OCK/Rz5+V1egg==",+ "dependencies": {+ "@codemirror/language": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.6.0",+ "@lezer/common": "^1.0.0"+ },+ "peerDependencies": {+ "@codemirror/language": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "@lezer/common": "^1.0.0"+ }+ },+ "node_modules/@codemirror/commands": {+ "version": "6.2.4",+ "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.4.tgz",+ "integrity": "sha512-42lmDqVH0ttfilLShReLXsDfASKLXzfyC36bzwcqzox9PlHulMcsUOfHXNo2X2aFMVNUoQ7j+d4q5bnfseYoOA==",+ "dependencies": {+ "@codemirror/language": "^6.0.0",+ "@codemirror/state": "^6.2.0",+ "@codemirror/view": "^6.0.0",+ "@lezer/common": "^1.0.0"+ }+ },+ "node_modules/@codemirror/lang-sql": {+ "version": "6.5.0",+ "resolved": "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.5.0.tgz",+ "integrity": "sha512-ztJ+5lk0yWf4E7sQQqsidPYJa0a/511Ln/IaI3A+fGv6z0SrGDG0Lu6SAehczcehrhgNwMhPlerJMeXw7vZs2g==",+ "dependencies": {+ "@codemirror/autocomplete": "^6.0.0",+ "@codemirror/language": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@lezer/highlight": "^1.0.0",+ "@lezer/lr": "^1.0.0"+ }+ },+ "node_modules/@codemirror/language": {+ "version": "6.7.0",+ "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.7.0.tgz",+ "integrity": "sha512-4SMwe6Fwn57klCUsVN0y4/h/iWT+XIXFEmop2lIHHuWO0ubjCrF3suqSZLyOQlznxkNnNbOOfKe5HQbQGCAmTg==",+ "dependencies": {+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "@lezer/common": "^1.0.0",+ "@lezer/highlight": "^1.0.0",+ "@lezer/lr": "^1.0.0",+ "style-mod": "^4.0.0"+ }+ },+ "node_modules/@codemirror/lint": {+ "version": "6.2.1",+ "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.2.1.tgz",+ "integrity": "sha512-y1muai5U/uUPAGRyHMx9mHuHLypPcHWxzlZGknp/U5Mdb5Ol8Q5ZLp67UqyTbNFJJ3unVxZ8iX3g1fMN79S1JQ==",+ "dependencies": {+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "crelt": "^1.0.5"+ }+ },+ "node_modules/@codemirror/search": {+ "version": "6.4.0",+ "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.4.0.tgz",+ "integrity": "sha512-zMDgaBXah+nMLK2dHz9GdCnGbQu+oaGRXS1qviqNZkvOCv/whp5XZFyoikLp/23PM9RBcbuKUUISUmQHM1eRHw==",+ "dependencies": {+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "crelt": "^1.0.5"+ }+ },+ "node_modules/@codemirror/state": {+ "version": "6.2.1",+ "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.1.tgz",+ "integrity": "sha512-RupHSZ8+OjNT38zU9fKH2sv+Dnlr8Eb8sl4NOnnqz95mCFTZUaiRP8Xv5MeeaG0px2b8Bnfe7YGwCV3nsBhbuw=="+ },+ "node_modules/@codemirror/theme-one-dark": {+ "version": "6.1.2",+ "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.2.tgz",+ "integrity": "sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==",+ "dependencies": {+ "@codemirror/language": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0",+ "@lezer/highlight": "^1.0.0"+ }+ },+ "node_modules/@codemirror/view": {+ "version": "6.12.0",+ "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.12.0.tgz",+ "integrity": "sha512-xNHvbJBc2v8JuEcIGOck6EUGShpP+TYGCEMVEVQMYxbFXfMhYnoF3znxB/2GgeKR0nrxBs+nhBupiTYQqCp2kw==",+ "dependencies": {+ "@codemirror/state": "^6.1.4",+ "style-mod": "^4.0.0",+ "w3c-keyname": "^2.2.4"+ }+ },"node_modules/@csstools/normalize.css": {"version": "12.0.0","resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz",@@ -3009,6 +3113,27 @@"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz","integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="},+ "node_modules/@lezer/common": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.2.tgz",+ "integrity": "sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng=="+ },+ "node_modules/@lezer/highlight": {+ "version": "1.1.5",+ "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.5.tgz",+ "integrity": "sha512-EsbRBpr1+g+VVX6ZbColI4YQ4bx+6uCpSt5ld/bRV3yRsPZoSItN5J3p5UX0FTkOLh8rduYOtEe93vFaAVUEvA==",+ "dependencies": {+ "@lezer/common": "^1.0.0"+ }+ },+ "node_modules/@lezer/lr": {+ "version": "1.3.5",+ "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.5.tgz",+ "integrity": "sha512-Kye0rxYBi+OdToLUN2tQfeH5VIrpESC6XznuvxmIxbO1lz6M1C90vkjMNYoX1SfbUcuvoPXvLYsBquZ//77zVQ==",+ "dependencies": {+ "@lezer/common": "^1.0.0"+ }+ },"node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {"version": "5.1.1-v1","resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",@@ -3436,95 +3561,6 @@"url": "https://github.com/sponsors/gregberge"}},- "node_modules/@testing-library/dom": {- "version": "9.3.0",- "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.0.tgz",- "integrity": "sha512-Dffe68pGwI6WlLRYR2I0piIkyole9cSBH5jGQKCGMRpHW5RHCqAUaqc2Kv0tUyd4dU4DLPKhJIjyKOnjv4tuUw==",- "peer": true,- "dependencies": {- "@babel/code-frame": "^7.10.4",- "@babel/runtime": "^7.12.5",- "@types/aria-query": "^5.0.1",- "aria-query": "^5.0.0",- "chalk": "^4.1.0",- "dom-accessibility-api": "^0.5.9",- "lz-string": "^1.5.0",- "pretty-format": "^27.0.2"- },- "engines": {- "node": ">=14"- }- },- "node_modules/@testing-library/dom/node_modules/ansi-styles": {- "version": "4.3.0",- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",- "peer": true,- "dependencies": {- "color-convert": "^2.0.1"- },- "engines": {- "node": ">=8"- },- "funding": {- "url": "https://github.com/chalk/ansi-styles?sponsor=1"- }- },- "node_modules/@testing-library/dom/node_modules/chalk": {- "version": "4.1.2",- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",- "peer": true,- "dependencies": {- "ansi-styles": "^4.1.0",- "supports-color": "^7.1.0"- },- "engines": {- "node": ">=10"- },- "funding": {- "url": "https://github.com/chalk/chalk?sponsor=1"- }- },- "node_modules/@testing-library/dom/node_modules/color-convert": {- "version": "2.0.1",- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",- "peer": true,- "dependencies": {- "color-name": "~1.1.4"- },- "engines": {- "node": ">=7.0.0"- }- },- "node_modules/@testing-library/dom/node_modules/color-name": {- "version": "1.1.4",- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",- "peer": true- },- "node_modules/@testing-library/dom/node_modules/has-flag": {- "version": "4.0.0",- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",- "peer": true,- "engines": {- "node": ">=8"- }- },- "node_modules/@testing-library/dom/node_modules/supports-color": {- "version": "7.2.0",- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",- "peer": true,- "dependencies": {- "has-flag": "^4.0.0"- },- "engines": {- "node": ">=8"- }- },"node_modules/@testing-library/jest-dom": {"version": "5.16.5","resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz",@@ -4518,6 +4554,80 @@"url": "https://opencollective.com/typescript-eslint"}},+ "node_modules/@uiw/codemirror-extensions-basic-setup": {+ "version": "4.20.2",+ "resolved": "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.20.2.tgz",+ "integrity": "sha512-8oF7ICSEoJVjn9MNKLsY5BaxGsFS/Qh8AMHa/0hZP1fExeI+LKhaaSfHbdRk8RpYE5Ffjtx+tBQfh22YBiv5dQ==",+ "dependencies": {+ "@codemirror/autocomplete": "^6.0.0",+ "@codemirror/commands": "^6.0.0",+ "@codemirror/language": "^6.0.0",+ "@codemirror/lint": "^6.0.0",+ "@codemirror/search": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0"+ },+ "peerDependencies": {+ "@codemirror/autocomplete": ">=6.0.0",+ "@codemirror/commands": ">=6.0.0",+ "@codemirror/language": ">=6.0.0",+ "@codemirror/lint": ">=6.0.0",+ "@codemirror/search": ">=6.0.0",+ "@codemirror/state": ">=6.0.0",+ "@codemirror/view": ">=6.0.0"+ }+ },+ "node_modules/@uiw/codemirror-themes": {+ "version": "4.20.2",+ "resolved": "https://registry.npmjs.org/@uiw/codemirror-themes/-/codemirror-themes-4.20.2.tgz",+ "integrity": "sha512-ymETGtpeC7Uq5lH844DQ9pjSHKytFLODWmYUP7CQNZJipHkQ3h0NciQvAXN759Beg9BKyuq7v6wptOrA1GEhAQ==",+ "dependencies": {+ "@codemirror/language": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0"+ },+ "peerDependencies": {+ "@codemirror/language": ">=6.0.0",+ "@codemirror/state": ">=6.0.0",+ "@codemirror/view": ">=6.0.0"+ }+ },+ "node_modules/@uiw/react-codemirror": {+ "version": "4.20.2",+ "resolved": "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.20.2.tgz",+ "integrity": "sha512-Rf6i9HgtNnYAVRBb1gfWlhiiOBrEPuIfHLn87cV9XPpjP+YtqZoP6VMMlMq4XFTbZ/E1GIxnSUgJMQToTth0iw==",+ "dependencies": {+ "@babel/runtime": "^7.18.6",+ "@codemirror/commands": "^6.1.0",+ "@codemirror/state": "^6.1.1",+ "@codemirror/theme-one-dark": "^6.0.0",+ "@uiw/codemirror-extensions-basic-setup": "4.20.2",+ "codemirror": "^6.0.0"+ },+ "peerDependencies": {+ "@babel/runtime": ">=7.11.0",+ "@codemirror/state": ">=6.0.0",+ "@codemirror/theme-one-dark": ">=6.0.0",+ "@codemirror/view": ">=6.0.0",+ "codemirror": ">=6.0.0",+ "react": ">=16.8.0",+ "react-dom": ">=16.8.0"+ }+ },+ "node_modules/@uiw/react-codemirror/node_modules/codemirror": {+ "version": "6.0.1",+ "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",+ "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",+ "dependencies": {+ "@codemirror/autocomplete": "^6.0.0",+ "@codemirror/commands": "^6.0.0",+ "@codemirror/language": "^6.0.0",+ "@codemirror/lint": "^6.0.0",+ "@codemirror/search": "^6.0.0",+ "@codemirror/state": "^6.0.0",+ "@codemirror/view": "^6.0.0"+ }+ },"node_modules/@webassemblyjs/ast": {"version": "1.11.6","resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",@@ -5820,6 +5930,11 @@"node": ">= 4.0"}},+ "node_modules/codemirror": {+ "version": "5.65.13",+ "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.13.tgz",+ "integrity": "sha512-SVWEzKXmbHmTQQWaz03Shrh4nybG0wXx2MEu3FO4ezbPW8IbnZEd5iGHGEffSUaitKYa3i+pHpBsSvw8sPHtzg=="+ },"node_modules/collect-v8-coverage": {"version": "1.0.1","resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",@@ -6038,6 +6153,11 @@"node": ">=10"}},+ "node_modules/crelt": {+ "version": "1.0.6",+ "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",+ "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="+ },"node_modules/cross-spawn": {"version": "7.0.3","resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",@@ -15637,6 +15757,11 @@"webpack": "^5.0.0"}},+ "node_modules/style-mod": {+ "version": "4.0.3",+ "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.3.tgz",+ "integrity": "sha512-78Jv8kYJdjbvRwwijtCevYADfsI0lGzYJe4mMFdceO8l75DFFDoqBhR1jVDicDRRaX4//g1u9wKeo+ztc2h1Rw=="+ },"node_modules/stylehacks": {"version": "5.1.1","resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",@@ -16233,19 +16358,6 @@"is-typedarray": "^1.0.0"}},- "node_modules/typescript": {- "version": "4.9.5",- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",- "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",- "peer": true,- "bin": {- "tsc": "bin/tsc",- "tsserver": "bin/tsserver"- },- "engines": {- "node": ">=4.2.0"- }- },"node_modules/unbox-primitive": {"version": "1.0.2","resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",@@ -16458,6 +16570,11 @@"browser-process-hrtime": "^1.0.0"}},+ "node_modules/w3c-keyname": {+ "version": "2.2.7",+ "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.7.tgz",+ "integrity": "sha512-XB8aa62d4rrVfoZYQaYNy3fy+z4nrfy2ooea3/0BnBzXW0tSdZ+lRgjzBZhk0La0H6h8fVyYCxx/qkQcAIuvfg=="+ },"node_modules/w3c-xmlserializer": {"version": "2.0.0","resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",diff --git a/package.json b/package.jsonindex 463dd79d..e7d3aedd 100644--- a/package.json+++ b/package.json@@ -3,9 +3,14 @@"version": "0.1.0","private": true,"dependencies": {+ "@codemirror/lang-sql": "^6.5.0",+ "@lezer/highlight": "^1.1.5","@testing-library/jest-dom": "^5.16.5","@testing-library/react": "^13.4.0","@testing-library/user-event": "^13.5.0",+ "@uiw/codemirror-themes": "^4.20.2",+ "@uiw/react-codemirror": "^4.20.2",+ "codemirror": "^5.65.13","jointjs": "^3.7.2","react": "^18.2.0","react-dom": "^18.2.0",diff --git a/src/App.js b/src/App.jsindex 9aee9799..873a469a 100644--- a/src/App.js+++ b/src/App.js@@ -1,9 +1,9 @@-import Editor from "./editor";+import EditorWindow from "./editor";function App() {return (<>- <Editor name="Untitled"/>+ <EditorWindow name="Untitled"/></>);}diff --git a/src/editor/index.jsx b/src/editor/index.jsxindex 5972e323..2cdd104b 100644--- a/src/editor/index.jsx+++ b/src/editor/index.jsx@@ -1,16 +1,34 @@-import React from "react";+import { React } from "react";import Diagram from "../components/diagram";import Header from "../components/header";import Sidebar from "../components/sidebar";import { ResizableBox } from "react-resizable";import "react-resizable/css/styles.css";import ControlPanel from "../components/control_panel";+import CodeMirror from "@uiw/react-codemirror";+import { createTheme } from "@uiw/codemirror-themes";+import { sql } from "@codemirror/lang-sql";+import { tags as t } from "@lezer/highlight";++const myTheme = createTheme({+ dark: "light",+ settings: {},+ styles: [+ { tag: t.comment, color: "#8ab0ed" },+ { tag: t.string, color: "#e68e29" },+ { tag: t.number, color: "#e68e29" },+ { tag: t.keyword, color: "#295be6" },+ { tag: t.variableName, color: "#1a00db" },+ { tag: t.typeName, color: "#295be6" },+ { tag: t.tagName, color: "#008a02" },+ ],+});export default function Editor(props) {return (<><Header name={props.name} />- <ControlPanel/>+ <ControlPanel /><div className="flex h-full"><ResizableBoxwidth={window.innerWidth * 0.2}@@ -20,12 +38,21 @@ export default function Editor(props) {maxConstraints={[Infinity, Infinity]}axis="x">- <span className="text">window 1</span>+ <div className="overflow-auto h-full">+ <CodeMirror+ height="100%"+ theme={myTheme}+ extensions={[sql()]}+ onChange={(value, viewUpdate) => {+ console.log("value:", value);+ }}+ />+ </div></ResizableBox><div className="flex-grow"><Diagram /></div>- <Sidebar/>+ <Sidebar /></div></>);diff --git a/src/index.css b/src/index.cssindex 1bd979fb..63f73e4f 100644--- a/src/index.css+++ b/src/index.css@@ -2,6 +2,6 @@@tailwind components;@tailwind utilities;-body {- overflow: hidden;+.cm-focused {+ outline: none !important;}