diff --git a/package.json b/package.json index 1858275..66e531b 100644 --- a/package.json +++ b/package.json @@ -47,11 +47,11 @@ }, "husky": { "hooks": { - "pre-commit": "yarn type-check && pretty-quick --staged --pattern 'frontend/**/*.*'" + "pre-commit": "yarn type-check && pretty-quick --staged --pattern 'src/**/*.*'" } }, "lint-staged": { - "*.{js,jsx,ts,tsx,html,md}": [ + "*.{js,jsx,ts,tsx,html,md,css,scss}": [ "prettier --write", "git add" ] diff --git a/src/App.tsx b/src/App.tsx index d176c95..1ca62bd 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,10 +1,12 @@ +import "./editor.scss"; + import React from "react"; import { DndProvider } from "react-dnd"; import HTML5Backend from "react-dnd-html5-backend"; import { useNavigation } from "react-navi"; + import Card from "./components/cards/Card"; import Hanger from "./components/Hanger"; -import "./editor.scss"; import { api, useStore } from "./lib/store"; const Current = ({ id }) => { diff --git a/src/components/Hanger.tsx b/src/components/Hanger.tsx index 514bbde..8393524 100644 --- a/src/components/Hanger.tsx +++ b/src/components/Hanger.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import React from "react"; import { useDrop } from "react-dnd"; import { useNavigation } from "react-navi"; -import { api, TYPES } from "../lib/store"; + +import { TYPES, api } from "../lib/store"; const Hanger = ({ before = null, parent = null, hidden = false }) => { const navigate = useNavigation(); diff --git a/src/components/cards/Breadcrumb.tsx b/src/components/cards/Breadcrumb.tsx index 89aff11..55fb405 100644 --- a/src/components/cards/Breadcrumb.tsx +++ b/src/components/cards/Breadcrumb.tsx @@ -1,6 +1,7 @@ import * as React from "react"; import { useDrop } from "react-dnd"; import { useNavigation } from "react-navi"; + // import { moveNode, useStore } from "../../../../../lib/store"; import { TYPES, useStore } from "../../lib/store"; diff --git a/src/components/cards/Card.tsx b/src/components/cards/Card.tsx index 5f0bcb1..73a5efe 100644 --- a/src/components/cards/Card.tsx +++ b/src/components/cards/Card.tsx @@ -1,4 +1,5 @@ import React from "react"; + import { TYPES, useStore } from "../../lib/store"; import Portal from "./Portal"; import Statement from "./Statement"; diff --git a/src/components/cards/Portal.tsx b/src/components/cards/Portal.tsx index 2e7a8cd..a32db3c 100644 --- a/src/components/cards/Portal.tsx +++ b/src/components/cards/Portal.tsx @@ -3,7 +3,8 @@ import React from "react"; import { useDrag, useDrop } from "react-dnd"; import { LogIn as Share } from "react-feather"; import { useNavigation } from "react-navi"; -import { api, TYPES } from "../../lib/store"; + +import { TYPES, api } from "../../lib/store"; import Hanger from "../Hanger"; const Portal = ({ id, node, parent = null }) => { diff --git a/src/components/cards/Statement.tsx b/src/components/cards/Statement.tsx index 360a043..ea7cd85 100644 --- a/src/components/cards/Statement.tsx +++ b/src/components/cards/Statement.tsx @@ -2,7 +2,8 @@ import classNames from "classnames"; import React from "react"; import { useDrag } from "react-dnd"; import { useNavigation } from "react-navi"; -import { api, TYPES, useStore } from "../../lib/store"; + +import { TYPES, api, useStore } from "../../lib/store"; import Hanger from "../Hanger"; import Card from "./Card"; diff --git a/src/components/forms/PortalForm.tsx b/src/components/forms/PortalForm.tsx index a135784..cb599d9 100644 --- a/src/components/forms/PortalForm.tsx +++ b/src/components/forms/PortalForm.tsx @@ -7,7 +7,8 @@ import React from "react"; import { AlignLeft as MenuIcon } from "react-feather"; import { Link } from "react-navi"; import { v4 as guid } from "uuid"; -import { api, TYPES, useStore } from "../../lib/store"; + +import { TYPES, api, useStore } from "../../lib/store"; import useForm from "../../lib/useForm"; import FormSection from "./components/FormSection"; import InputField from "./components/InputField"; diff --git a/src/components/forms/StatementForm.tsx b/src/components/forms/StatementForm.tsx index 4bd2807..e529f8b 100644 --- a/src/components/forms/StatementForm.tsx +++ b/src/components/forms/StatementForm.tsx @@ -7,20 +7,22 @@ import Modal from "@material-ui/core/Modal"; import difference from "lodash/difference"; import React from "react"; import { - AlignLeft as MenuIcon, - Edit3 as NotesIcon, + X as CloseIcon, Info as InfoIcon, + AlignLeft as MenuIcon, MessageSquare as MessageIcon, - X as CloseIcon + Edit3 as NotesIcon } from "react-feather"; import { Link } from "react-navi"; -import { api, TYPES, useStore } from "../../lib/store"; + +import { TYPES, api, useStore } from "../../lib/store"; import useForm from "../../lib/useForm"; import FormSection from "./components/FormSection"; import InputField from "./components/InputField"; import SelectField from "./components/SelectField"; import flags from "./flags"; import { useStyles } from "./form"; + // import removeFor from "../../../lib/removeFor"; type IEditStatement = { diff --git a/src/components/forms/components/FormSection.tsx b/src/components/forms/components/FormSection.tsx index cab2502..f926315 100644 --- a/src/components/forms/components/FormSection.tsx +++ b/src/components/forms/components/FormSection.tsx @@ -1,5 +1,6 @@ import Box from "@material-ui/core/Box"; import React from "react"; + import { useStyles } from "../form"; export default ({ children, label, icon, ...props }) => { diff --git a/src/components/forms/components/InputField.tsx b/src/components/forms/components/InputField.tsx index 9671fe7..c744971 100644 --- a/src/components/forms/components/InputField.tsx +++ b/src/components/forms/components/InputField.tsx @@ -1,5 +1,6 @@ import InputBase from "@material-ui/core/InputBase"; import React from "react"; + import { useStyles } from "../form"; export default ({ ...props }) => { diff --git a/src/components/forms/components/SelectField.tsx b/src/components/forms/components/SelectField.tsx index b248932..5911eb3 100644 --- a/src/components/forms/components/SelectField.tsx +++ b/src/components/forms/components/SelectField.tsx @@ -1,6 +1,7 @@ import Select from "@material-ui/core/Select"; import React from "react"; import { ChevronDown } from "react-feather"; + import { useStyles } from "../form"; export default ({ children, ...props }) => { diff --git a/src/index.tsx b/src/index.tsx index 0be4399..dda1586 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -3,6 +3,7 @@ import React, { Suspense } from "react"; import ReactDOM from "react-dom"; import { Router, View } from "react-navi"; import HelmetProvider from "react-navi-helmet-async"; + import routes from "./routes"; import * as serviceWorker from "./serviceWorker"; diff --git a/src/lib/store.ts b/src/lib/store.ts index 99cf2fa..ff81be1 100644 --- a/src/lib/store.ts +++ b/src/lib/store.ts @@ -1,4 +1,4 @@ -import { alg, Graph } from "graphlib"; +import { Graph, alg } from "graphlib"; import * as jsondiffpatch from "jsondiffpatch"; import difference from "lodash/difference"; import create from "zustand"; diff --git a/src/routes/flow.tsx b/src/routes/flow.tsx index 50e72a1..2c1829d 100644 --- a/src/routes/flow.tsx +++ b/src/routes/flow.tsx @@ -1,6 +1,7 @@ import { compose, mount, route, withView } from "navi"; import * as React from "react"; import { View } from "react-navi"; + import App from "../App"; import portalForm from "./portalForm"; import statementForm from "./statementForm"; diff --git a/src/routes/portalForm.tsx b/src/routes/portalForm.tsx index ea155af..6e40af2 100644 --- a/src/routes/portalForm.tsx +++ b/src/routes/portalForm.tsx @@ -1,9 +1,10 @@ // import { loader } from "graphql.macro"; import { map, mount, route } from "navi"; import * as React from "react"; -import { IContext } from "."; + import { EditPortal, NewPortal } from "../components/forms/PortalForm"; -import { api, TYPES } from "../lib/store"; +import { TYPES, api } from "../lib/store"; +import { IContext } from "."; export default map(async (req, context: any) => { // const { data } = await context.client.query({ diff --git a/src/routes/statementForm.tsx b/src/routes/statementForm.tsx index 454ca67..89b5cf7 100644 --- a/src/routes/statementForm.tsx +++ b/src/routes/statementForm.tsx @@ -1,8 +1,9 @@ import { map, mount, route } from "navi"; import * as React from "react"; -import { IContext } from "."; + import { EditStatement, NewStatement } from "../components/forms/StatementForm"; import { api } from "../lib/store"; +import { IContext } from "."; export default map(async (req, context) => { const handleClose = () => { diff --git a/tslint.json b/tslint.json index 3993bb5..3bf4e1e 100644 --- a/tslint.json +++ b/tslint.json @@ -7,7 +7,6 @@ "import-name": false, "jsx-boolean-value": false, "jsx-no-lambda": false, - "ordered-imports": true, "variable-name": false }, "rulesDirectory": []