diff --git a/.gitignore b/.gitignore index 48a2108..e1637dc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,5 @@ node_modules .idea - +out yarn-error.log \ No newline at end of file diff --git a/components/ConversionPanel.js b/components/ConversionPanel.js index f28aeb3..4f86227 100644 --- a/components/ConversionPanel.js +++ b/components/ConversionPanel.js @@ -13,11 +13,11 @@ if (isBrowser) { require("codemirror-graphql/mode"); require("codemirror/mode/javascript/javascript"); require("codemirror/mode/xml/xml"); - require("codemirror/mode/jsx/jsx") - require("codemirror/mode/css/css") - require("codemirror/mode/rust/rust") - require("codemirror/mode/sql/sql") - require("codemirror/mode/clike/clike") + require("codemirror/mode/jsx/jsx"); + require("codemirror/mode/css/css"); + require("codemirror/mode/rust/rust"); + require("codemirror/mode/sql/sql"); + require("codemirror/mode/clike/clike"); } const prettifyMap = { @@ -29,23 +29,23 @@ const prettifyMap = { const modeMapping = { javascript: { - name: 'javascript' + name: "javascript" }, json: { - name: 'javascript', + name: "javascript", json: true }, typescript: { - name: 'javascript', + name: "javascript", typescript: true }, html: { - name: 'xml', + name: "xml", htmlMode: true }, - mysql: 'text/x-mysql', - scala: 'text/x-scala' -} + mysql: "text/x-mysql", + scala: "text/x-scala" +}; type Props = { leftMode: ?string, @@ -262,7 +262,7 @@ export default class ConversionPanel extends PureComponent { } .btn:hover { - background-color: #2380ca; + background-color: #0490ff; } .header { @@ -281,6 +281,7 @@ export default class ConversionPanel extends PureComponent { .title { padding-left: 4px; color: #666; + font-weight: normal; } `} @@ -295,7 +296,8 @@ export default class ConversionPanel extends PureComponent { overflow: hidden; } - .react-codemirror2, .CodeMirror { + .react-codemirror2, + .CodeMirror { display: flex; flex: 1; width: 100%; @@ -303,7 +305,7 @@ export default class ConversionPanel extends PureComponent { } .CodeMirror { - height: calc(100%) + height: calc(100%); } .right .CodeMirror-scroll { @@ -351,15 +353,14 @@ export default class ConversionPanel extends PureComponent {
-
{leftTitle}
+

{leftTitle}

{isBrowser && ( - this.onChange(value)} + onChange={(editor, metadata, value) => this.onChange(value)} value={value} options={{ mode: modeMapping[leftMode] || leftMode, @@ -372,10 +373,10 @@ export default class ConversionPanel extends PureComponent { isBrowser && (
-
{splitTitle}
+

{splitTitle}

+ onChange={(editor, metadata, value) => this.onChange(this.state.value, value)} value={splitValue} options={{ @@ -388,7 +389,7 @@ export default class ConversionPanel extends PureComponent {
-
{rightTitle}
+

{rightTitle}

{onCheckboxChange && (
diff --git a/components/Layout.js b/components/Layout.js index 19908e7..468c940 100644 --- a/components/Layout.js +++ b/components/Layout.js @@ -9,6 +9,7 @@ import FuzzyPicker, { FuzzyWrapper } from "react-fuzzy-picker"; import Collapse, { Panel } from "rc-collapse"; import flatten from "lodash/flatten"; import findIndex from "lodash/findIndex"; +import { categorizedRoutes, routes, activeRouteData } from "../utils/routes"; NProgress.configure({ showSpinner: false }); @@ -20,137 +21,6 @@ Router.onRouteChangeStart = url => { Router.onRouteChangeComplete = () => NProgress.done(); Router.onRouteChangeError = () => NProgress.done(); -const x = [ - { - category: "React", - iconName: "icon-reactjs", - content: [ - { - label: "JSON to React PropTypes", - path: "/" - }, - { - label: "HTML to JSX", - path: "/html-to-jsx" - }, - { - label: "CSS to JS Objects", - path: "/css-to-js" - } - ] - }, - { - category: "JavaScript", - iconName: "icon-javascript", - content: [ - { - label: "JSON to Flow Types", - path: "/json-to-flow-types" - }, - { - label: "JSON to Typescript Interface", - path: "/json-to-ts-interface" - }, - { - label: "JSON to MobX-State-Tree Model", - path: "/json-to-mobx-state-tree" - } - ] - }, - { - category: "Rust", - iconName: "icon-rust", - content: [ - { - label: "JSON to Rust Serde", - path: "/json-to-rust-serde" - } - ] - }, - { - category: "Databases", - iconName: "icon-database", - content: [ - { - label: "JSON to Mongoose Schema", - path: "/json-to-mongoose" - }, - { - label: "JSON to Big Query Schema", - path: "/json-to-big-query" - }, - { - label: "JSON to MySQL", - path: "/json-to-mysql" - } - ] - }, - { - category: "Scala", - iconName: "icon-scala", - content: [ - { - label: "JSON to Scala Case Class", - path: "/json-to-scala-case-class" - } - ] - }, - { - category: "GraphQL", - icon: ( - - - - - - - - - - ), - content: [ - { - label: "GraphQL to TypeScript", - path: "/graphql-to-typescript" - }, - { - label: "GraphQL to Flow", - path: "/graphql-to-flow" - } - ] - }, - { - category: "XML", - iconName: "icon-html", - content: [ - { - label: "XML to JSON", - path: "/xml-to-json" - } - ] - } -]; - -const routes = flatten(x.map(a => a.content)); - function Logo() { return ( { this.setState({ activeKey: `${findIndex( - x, + categorizedRoutes, o => o.content.filter(a => a.path === pathname).length ) + 1}` }); @@ -243,21 +109,25 @@ export default class Layout extends PureComponent { }; render() { + const { label, desc } = activeRouteData(this.props.pathname); + return (
- Transform | All important transforms at one place. - + {label} + + - + - +