diff --git a/.all-contributorsrc b/.all-contributorsrc index b92c12a..20c5de7 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -230,7 +230,17 @@ "contributions": [ "code" ] + }, + { + "login": "jamesgeorge007", + "name": "James George", + "avatar_url": "https://avatars2.githubusercontent.com/u/25279263?v=4", + "profile": "https://ghuser.io/jamesgeorge007", + "contributions": [ + "code" + ] } ], - "contributorsPerLine": 7 + "contributorsPerLine": 7, + "skipCi": true } diff --git a/README.md b/README.md index f38ceb6..40e392d 100644 --- a/README.md +++ b/README.md @@ -13,42 +13,47 @@ MIT @ Ritesh Kumar Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)): - + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - + + + +
Ritesh Kumar
Ritesh Kumar

📖 💻 🤔 👀
Florian Gilcher
Florian Gilcher

💻
Pascal Hertleif
Pascal Hertleif

💻
Lado Lomidze
Lado Lomidze

💻
Mattia Manzati
Mattia Manzati

💻
Mohammad Rajabifard
Mohammad Rajabifard

🤔 💻
Raathigeshan Kugarajan
Raathigeshan Kugarajan

💻

Ritesh Kumar

📖 💻 🤔 👀

Florian Gilcher

💻

Pascal Hertleif

💻

Lado Lomidze

💻

Mattia Manzati

💻

Mohammad Rajabifard

🤔 💻

Raathigeshan Kugarajan

💻
Gyandeep Singh
Gyandeep Singh

💻
Matt Holt
Matt Holt

💻
sreenivas alapati
sreenivas alapati

💻
Boris Cherny
Boris Cherny

💻
Mark Lussier
Mark Lussier

💻
Brice BERNARD
Brice BERNARD

💻
Satyajit Sahoo
Satyajit Sahoo

💻

Gyandeep Singh

💻

Matt Holt

💻

sreenivas alapati

💻

Boris Cherny

💻

Mark Lussier

💻

Brice BERNARD

💻

Satyajit Sahoo

💻
Shane Osbourne
Shane Osbourne

💻
Rongjian Zhang
Rongjian Zhang

💻
Keshan Nageswaran
Keshan Nageswaran

💻
codegent
codegent

💻
Sebastian Maliszczak
Sebastian Maliszczak

💻
Haroen Viaene
Haroen Viaene

💻
Tim Neutkens
Tim Neutkens

🔌 💻

Shane Osbourne

💻

Rongjian Zhang

💻

Keshan Nageswaran

💻

codegent

💻

Sebastian Maliszczak

💻

Haroen Viaene

💻

Tim Neutkens

🔌 💻
Ramin Rezaie
Ramin Rezaie

💻
Guilherme Esteves
Guilherme Esteves

💻
Prasham Ashesh
Prasham Ashesh

💻

Ramin Rezaie

💻

Guilherme Esteves

💻

Prasham Ashesh

💻

James George

💻
+ + + This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome! diff --git a/assets/vendor/json-to-jsdoc.js b/assets/vendor/json-to-jsdoc.js index 453dc50..9e41dd5 100644 --- a/assets/vendor/json-to-jsdoc.js +++ b/assets/vendor/json-to-jsdoc.js @@ -5,7 +5,7 @@ function checkIfNeededToAddUndefinedType(obj, objectKey) { Object.keys(obj).forEach(currentKey => { // check if it's our Object, // like awards.editions in awards.editions.outcome - if (~currentKey.indexOf(objectKey) && currentKey !== objectKey) { + if (currentKey.includes(objectKey) && currentKey !== objectKey) { temporaryObject[currentKey] = obj[currentKey]; } }); @@ -35,7 +35,7 @@ function keepUniqueTypes(obj, jsonObjects) { const numberOfJSONDefinitions = jsonObjects.length; Object.keys(obj).forEach(objectKey => { - if (!~objectKey.indexOf(".")) { + if (!objectKey.includes(".")) { if (obj[objectKey].length < numberOfJSONDefinitions) { temporaryObject[objectKey].push("undefined"); } diff --git a/components/EditorPanel.tsx b/components/EditorPanel.tsx index f798ad9..66201e5 100644 --- a/components/EditorPanel.tsx +++ b/components/EditorPanel.tsx @@ -19,6 +19,7 @@ import copy from "clipboard-copy"; import { getWorker, Wrapper } from "@utils/workerWrapper"; import Npm from "@assets/svgs/Npm"; import { supportedLanguages } from "@utils/prettier"; +import { useDropzone } from "react-dropzone"; export interface EditorPanelProps { editable?: boolean; @@ -132,7 +133,8 @@ export default function({ [showSettingsDialogue] ); - const onFilePicked = useCallback((files, close) => { + const onFilePicked = useCallback((files, close = () => {}) => { + if (!(files && files.length)) return; const file = files[0]; const reader = new FileReader(); reader.readAsText(file, "utf-8"); @@ -143,6 +145,16 @@ export default function({ }; }, []); + const { getRootProps } = useDropzone({ + onDrop: files => onFilePicked(files), + disabled: !editable, + accept: acceptFiles, + onDropRejected: () => + toaster.danger("This file type is not supported.", { + id + }) + }); + const copyValue = useCallback(() => { copy(value); toaster.success("Copied to clipboard.", { @@ -310,7 +322,15 @@ export default function({ )} - +
{topNotifications && topNotifications({ isSettingsOpen: showSettingsDialogue, @@ -327,7 +347,7 @@ export default function({ }} innerRef={editorRef} /> - +
{IN_BROWSER && showPreview && previewElement && ( diff --git a/package.json b/package.json index f2b2d39..3e7a374 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,7 @@ "qrcode.react": "^0.9.3", "react": "^16.11.0", "react-dom": "^16.11.0", + "react-dropzone": "^10.2.1", "react-ga": "^2.6.0", "rust-keywords": "^1.1.0", "sha1": "^1.1.1", diff --git a/pages/_app.tsx b/pages/_app.tsx index 3bbe3c6..7a1bb70 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,5 +1,5 @@ import React from "react"; -import App, { Container } from "next/app"; +import App from "next/app"; import { Button, Pane } from "evergreen-ui"; import Navigator from "@components/Navigator"; import "@styles/main.css"; @@ -96,7 +96,7 @@ export default class extends App { : undefined; return ( - + <> {activeRoute && (activeRoute.title || activeRoute.searchTerm)} @@ -148,7 +148,7 @@ export default class extends App { - + ); } } diff --git a/typings/npm/evergreen-ui.d.ts b/typings/npm/evergreen-ui.d.ts index 3f023c6..92b1028 100644 --- a/typings/npm/evergreen-ui.d.ts +++ b/typings/npm/evergreen-ui.d.ts @@ -56,6 +56,14 @@ declare module "evergreen-ui" { description?: string; } ) => void; + danger: ( + text: string, + options?: { + id?: string | number; + duration?: number; + description?: string; + } + ) => void; closeAll: () => void; }; diff --git a/yarn.lock b/yarn.lock index e13941e..373139d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1688,6 +1688,10 @@ atob@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" +attr-accept@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.0.0.tgz#8422fef5ee4a511c207796c888227ab5de03306f" + auto-bind@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-2.0.0.tgz#9a55a461b521f58daf955169203bed1a07a970a9" @@ -3764,6 +3768,12 @@ file-loader@4.2.0: loader-utils "^1.2.3" schema-utils "^2.0.0" +file-selector@^0.1.12: + version "0.1.12" + resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.1.12.tgz#fe726547be219a787a9dcc640575a04a032b1fd0" + dependencies: + tslib "^1.9.0" + file-type@5.2.0, file-type@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6" @@ -7605,6 +7615,14 @@ react-dom@~15.4.1: loose-envify "^1.1.0" object-assign "^4.1.0" +react-dropzone@^10.2.1: + version "10.2.1" + resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-10.2.1.tgz#b7520124c4a3b66f96d49f7879027c7a475eaa20" + dependencies: + attr-accept "^2.0.0" + file-selector "^0.1.12" + prop-types "^15.7.2" + react-error-overlay@5.1.6: version "5.1.6" resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.1.6.tgz#0cd73407c5d141f9638ae1e0c63e7b2bf7e9929d"