diff --git a/editors/editoria/src/Editoria.js b/editors/demo/src/Editoria/Editoria.js similarity index 86% rename from editors/editoria/src/Editoria.js rename to editors/demo/src/Editoria/Editoria.js index 148a228be3e67aed50e932eb86873dca18c20280..42a6908606b13ce6fcb91d68ce0900f3443c2ff1 100644 --- a/editors/editoria/src/Editoria.js +++ b/editors/demo/src/Editoria/Editoria.js @@ -1,5 +1,4 @@ import React, { useLayoutEffect, useState, useMemo } from 'react'; -import { createGlobalStyle } from 'styled-components'; import { Wax } from 'wax-prosemirror-core'; @@ -7,19 +6,6 @@ import { EditoriaLayout, EditoriaMobileLayout } from './layout'; import { config, configMobile } from './config'; import { demo } from './demo'; -const GlobalStyle = createGlobalStyle` - body { - margin: 0; - overflow-y: hidden; - padding: 0; - } - - #root { - height:100vh; - width:100vw; - } -`; - const renderImage = file => { const reader = new FileReader(); return new Promise((accept, fail) => { @@ -55,15 +41,13 @@ const Editoria = () => { const EditoriaComponent = useMemo( () => ( <> - <GlobalStyle /> <Wax key={key} config={finalConfig} autoFocus placeholder="Type Something..." fileUpload={file => renderImage(file)} - value="" - targetFormat="JSON" + value={demo} // readonly layout={layout} // onChange={source => console.log(source)} diff --git a/editors/editoria/src/config/config.js b/editors/demo/src/Editoria/config/config.js similarity index 93% rename from editors/editoria/src/config/config.js rename to editors/demo/src/Editoria/config/config.js index 1a45eea91ddfbf53e3178fd8d520eaa72fa651bd..b428865c8255d5b9220b7fce7ffdb073fa759ebc 100644 --- a/editors/editoria/src/config/config.js +++ b/editors/demo/src/Editoria/config/config.js @@ -49,11 +49,6 @@ import { DefaultSchema } from 'wax-prosemirror-utilities'; import { WaxSelectionPlugin } from 'wax-prosemirror-plugins'; -/* Test Question Service*/ - -import MultipleChoiceQuestionService from '../MultipleChoiceQuestionService/MultipleChoiceQuestionService'; -import QuestionsToolGroupService from '../QuestionsToolGroupService/QuestionsToolGroupService'; - import invisibles, { space, hardBreak, @@ -101,7 +96,6 @@ export default { 'SpecialCharacters', 'CodeBlock', 'Tables', - 'Questions', 'TrackingAndEditing', 'FullScreen', ], @@ -158,8 +152,6 @@ export default { }, services: [ - new MultipleChoiceQuestionService(), - new QuestionsToolGroupService(), new CustomTagService(), new DisplayBlockLevelService(), new DisplayToolGroupService(), diff --git a/editors/editoria/src/config/configMobile.js b/editors/demo/src/Editoria/config/configMobile.js similarity index 100% rename from editors/editoria/src/config/configMobile.js rename to editors/demo/src/Editoria/config/configMobile.js diff --git a/editors/editoria/src/config/defaultSchema.js b/editors/demo/src/Editoria/config/defaultSchema.js similarity index 100% rename from editors/editoria/src/config/defaultSchema.js rename to editors/demo/src/Editoria/config/defaultSchema.js diff --git a/editors/editoria/src/config/index.js b/editors/demo/src/Editoria/config/index.js similarity index 100% rename from editors/editoria/src/config/index.js rename to editors/demo/src/Editoria/config/index.js diff --git a/editors/editoria/src/demo.js b/editors/demo/src/Editoria/demo.js similarity index 100% rename from editors/editoria/src/demo.js rename to editors/demo/src/Editoria/demo.js diff --git a/editors/editoria/src/layout/EditorElements.js b/editors/demo/src/Editoria/layout/EditorElements.js similarity index 100% rename from editors/editoria/src/layout/EditorElements.js rename to editors/demo/src/Editoria/layout/EditorElements.js diff --git a/editors/editoria/src/layout/EditoriaLayout.js b/editors/demo/src/Editoria/layout/EditoriaLayout.js similarity index 100% rename from editors/editoria/src/layout/EditoriaLayout.js rename to editors/demo/src/Editoria/layout/EditoriaLayout.js diff --git a/editors/editoria/src/layout/EditoriaMobileLayout.js b/editors/demo/src/Editoria/layout/EditoriaMobileLayout.js similarity index 100% rename from editors/editoria/src/layout/EditoriaMobileLayout.js rename to editors/demo/src/Editoria/layout/EditoriaMobileLayout.js diff --git a/editors/editoria/src/layout/index.js b/editors/demo/src/Editoria/layout/index.js similarity index 100% rename from editors/editoria/src/layout/index.js rename to editors/demo/src/Editoria/layout/index.js diff --git a/editors/editoria/src/theme/elements/ButtonStyles.js b/editors/demo/src/Editoria/theme/elements/ButtonStyles.js similarity index 100% rename from editors/editoria/src/theme/elements/ButtonStyles.js rename to editors/demo/src/Editoria/theme/elements/ButtonStyles.js diff --git a/editors/editoria/src/theme/elements/index.js b/editors/demo/src/Editoria/theme/elements/index.js similarity index 100% rename from editors/editoria/src/theme/elements/index.js rename to editors/demo/src/Editoria/theme/elements/index.js diff --git a/editors/editoria/src/theme/index.js b/editors/demo/src/Editoria/theme/index.js similarity index 100% rename from editors/editoria/src/theme/index.js rename to editors/demo/src/Editoria/theme/index.js diff --git a/editors/editoria/src/theme/theme.js b/editors/demo/src/Editoria/theme/theme.js similarity index 100% rename from editors/editoria/src/theme/theme.js rename to editors/demo/src/Editoria/theme/theme.js diff --git a/editors/demo/src/Editors.js b/editors/demo/src/Editors.js new file mode 100644 index 0000000000000000000000000000000000000000..016521f7f1e18519c8ba7e23ec361c880e85891e --- /dev/null +++ b/editors/demo/src/Editors.js @@ -0,0 +1,27 @@ +import React from 'react'; +import { createGlobalStyle } from 'styled-components'; + +import Editoria from './Editoria/Editoria'; +const GlobalStyle = createGlobalStyle` + body { + margin: 0; + overflow-y: hidden; + padding: 0; + } + + #root { + height:100vh; + width:100vw; + } +`; + +const Editors = () => { + return ( + <> + <GlobalStyle /> + <Editoria /> + </> + ); +}; + +export default Editors; diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js new file mode 100644 index 0000000000000000000000000000000000000000..78deedb8a7997ae9fd84a6befe1df3ad8a1c6f59 --- /dev/null +++ b/editors/demo/src/HHMI/HHMI.js @@ -0,0 +1,52 @@ +import React from 'react'; +import { createGlobalStyle } from 'styled-components'; + +import { Wax } from 'wax-prosemirror-core'; + +import { EditoriaLayout } from '../Editoria/layout'; +import { config } from '../Editoria/config'; + +const GlobalStyle = createGlobalStyle` + body { + margin: 0; + overflow-y: hidden; + padding: 0; + } + + #root { + height:100vh; + width:100vw; + } +`; + +const renderImage = file => { + const reader = new FileReader(); + return new Promise((accept, fail) => { + reader.onload = () => accept(reader.result); + reader.onerror = () => fail(reader.error); + // Some extra delay to make the asynchronicity visible + setTimeout(() => reader.readAsDataURL(file), 150); + }); +}; + +const Hhmi = () => { + return ( + <> + <GlobalStyle /> + <Wax + config={config} + autoFocus + placeholder="Type Something..." + fileUpload={file => renderImage(file)} + value="" + targetFormat="JSON" + // readonly + layout={EditoriaLayout} + // onChange={source => console.log(source)} + // user={user} + /> + </> + ); +}; + +export default Hhmi; diff --git a/editors/editoria/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js similarity index 100% rename from editors/editoria/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js rename to editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js diff --git a/editors/editoria/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js similarity index 100% rename from editors/editoria/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js rename to editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js diff --git a/editors/editoria/src/QuestionsToolGroupService/Questions.js b/editors/demo/src/HHMI/QuestionsToolGroupService/Questions.js similarity index 100% rename from editors/editoria/src/QuestionsToolGroupService/Questions.js rename to editors/demo/src/HHMI/QuestionsToolGroupService/Questions.js diff --git a/editors/editoria/src/QuestionsToolGroupService/QuestionsToolGroupService.js b/editors/demo/src/HHMI/QuestionsToolGroupService/QuestionsToolGroupService.js similarity index 100% rename from editors/editoria/src/QuestionsToolGroupService/QuestionsToolGroupService.js rename to editors/demo/src/HHMI/QuestionsToolGroupService/QuestionsToolGroupService.js diff --git a/editors/editoria/src/index.js b/editors/demo/src/index.js similarity index 77% rename from editors/editoria/src/index.js rename to editors/demo/src/index.js index a83a18aeef2ca1ea8b7c0306645b260073bd3ef1..5ec635a03a022eb35d60c756eb916e6810f4e784 100644 --- a/editors/editoria/src/index.js +++ b/editors/demo/src/index.js @@ -1,8 +1,8 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import Editoria from './Editoria'; +import Editors from './Editors'; import * as serviceWorker from './serviceWorker'; -ReactDOM.render(<Editoria />, document.getElementById('root')); +ReactDOM.render(<Editors />, document.getElementById('root')); // If you want your app to work offline and load faster, you can change // unregister() to register() below. Note this comes with some pitfalls. diff --git a/editors/editoria/src/serviceWorker.js b/editors/demo/src/serviceWorker.js similarity index 100% rename from editors/editoria/src/serviceWorker.js rename to editors/demo/src/serviceWorker.js diff --git a/editors/editoria/.gitignore b/editors/editoria/.gitignore deleted file mode 100644 index 4d29575de80483b005c29bfcac5061cd2f45313e..0000000000000000000000000000000000000000 --- a/editors/editoria/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - -# dependencies -/node_modules -/.pnp -.pnp.js - -# testing -/coverage - -# production -/build - -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local - -npm-debug.log* -yarn-debug.log* -yarn-error.log* diff --git a/editors/editoria/README.md b/editors/editoria/README.md deleted file mode 100644 index 9d9614c4fd32e65dcbefff34b758d7824b397181..0000000000000000000000000000000000000000 --- a/editors/editoria/README.md +++ /dev/null @@ -1,68 +0,0 @@ -This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). - -## Available Scripts - -In the project directory, you can run: - -### `npm start` - -Runs the app in the development mode.<br> -Open [http://localhost:3000](http://localhost:3000) to view it in the browser. - -The page will reload if you make edits.<br> -You will also see any lint errors in the console. - -### `npm test` - -Launches the test runner in the interactive watch mode.<br> -See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. - -### `npm run build` - -Builds the app for production to the `build` folder.<br> -It correctly bundles React in production mode and optimizes the build for the best performance. - -The build is minified and the filenames include the hashes.<br> -Your app is ready to be deployed! - -See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. - -### `npm run eject` - -**Note: this is a one-way operation. Once you `eject`, you can’t go back!** - -If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. - -Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. - -You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. - -## Learn More - -You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). - -To learn React, check out the [React documentation](https://reactjs.org/). - -### Code Splitting - -This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting - -### Analyzing the Bundle Size - -This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size - -### Making a Progressive Web App - -This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app - -### Advanced Configuration - -This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration - -### Deployment - -This section has moved here: https://facebook.github.io/create-react-app/docs/deployment - -### `npm run build` fails to minify - -This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify diff --git a/editors/editoria/config-overrides.js b/editors/editoria/config-overrides.js deleted file mode 100644 index e2cf94482e8e7bc53cdb65bef9c758bbf04a1a3e..0000000000000000000000000000000000000000 --- a/editors/editoria/config-overrides.js +++ /dev/null @@ -1,47 +0,0 @@ -module.exports = function override(config, env) { - config.module = { - rules: [ - { - oneOf: [ - { - test: /\.js$/, - loader: "babel-loader", - exclude: /node_modules/, - options: { - presets: [ - [require("@babel/preset-env"), { modules: false }], - require("@babel/preset-react") - ], - plugins: [ - ["@babel/plugin-proposal-decorators", { legacy: true }], - "babel-plugin-parameter-decorator", - ["@babel/plugin-proposal-class-properties", { loose: true }] - ] - } - }, - { - test: /\.css$/, - use: ["style-loader", "css-loader"] - }, - { - test: /\.svg$/, - use: "svg-inline-loader" - }, - { - test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, - use: [ - { - loader: "file-loader", - options: { - name: "[name].[ext]", - outputPath: "fonts/" - } - } - ] - } - ] - } - ] - }; - return config; -}; diff --git a/editors/editoria/jsconfig.json b/editors/editoria/jsconfig.json deleted file mode 100644 index 504cd646e14906b4db8e943f9bfb10ab80162cee..0000000000000000000000000000000000000000 --- a/editors/editoria/jsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "compilerOptions": { - "experimentalDecorators": true - } -} diff --git a/editors/editoria/package-lock.json b/editors/editoria/package-lock.json deleted file mode 100644 index c2e31ac9a868fab7db1328c0a99225e27ca2cf76..0000000000000000000000000000000000000000 --- a/editors/editoria/package-lock.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "name": "editoria", - "version": "0.0.47", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "dotenv": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz", - "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "react-app-rewired": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/react-app-rewired/-/react-app-rewired-2.1.3.tgz", - "integrity": "sha512-NXC2EsQrnEMV7xD70rHcBq0B4PSEzjY/K2m/e+GRgit2jZO/uZApnpCZSKvIX2leLRN69Sqf2id0VXZ1F62CDw==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.5", - "dotenv": "^6.2.0", - "semver": "^5.6.0" - } - }, - "semver": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", - "dev": true - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } -} diff --git a/editors/editoria/package.json b/editors/editoria/package.json deleted file mode 100644 index dc3ddb2d45eeacaeab1a067e886ede0b3240fbf9..0000000000000000000000000000000000000000 --- a/editors/editoria/package.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "editoria", - "version": "0.0.47", - "private": true, - "dependencies": { - "@guardian/prosemirror-invisibles": "^1.2.0", - "@pubsweet/ui-toolkit": "^2.3.1", - "fontsource-merriweather": "^3.0.9", - "prosemirror-tables": "^1.1.1", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "react-panelgroup": "^1.0.10", - "styled-components": "^4.2.0", - "typeface-fira-sans-condensed": "^0.0.54", - "typeface-inter": "^1.1.13", - "typeface-vollkorn": "^0.0.54", - "wax-prosemirror-components": "^0.0.47", - "wax-prosemirror-core": "^0.0.47", - "wax-prosemirror-plugins": "^0.0.47", - "wax-prosemirror-services": "^0.0.47" - }, - "scripts": { - "start": "react-app-rewired start", - "test": "react-app-rewired test --env=jsdom", - "eject": "react-scripts eject" - }, - "eslintConfig": { - "extends": "react-app" - }, - "browserslist": [ - ">0.2%", - "not dead", - "not ie <= 11", - "not op_mini all" - ], - "devDependencies": { - "babel-eslint": "10.0.3", - "react-app-rewired": "^2.1.1", - "react-scripts": "3.4" - } -} diff --git a/editors/editoria/public/favicon.ico b/editors/editoria/public/favicon.ico deleted file mode 100644 index a11777cc471a4344702741ab1c8a588998b1311a..0000000000000000000000000000000000000000 Binary files a/editors/editoria/public/favicon.ico and /dev/null differ diff --git a/editors/editoria/public/index.html b/editors/editoria/public/index.html deleted file mode 100644 index dd1ccfd4cd30a29aaa08b295d99be29cdeb29cf9..0000000000000000000000000000000000000000 --- a/editors/editoria/public/index.html +++ /dev/null @@ -1,38 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="utf-8" /> - <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" /> - <meta name="viewport" content="width=device-width, initial-scale=1" /> - <meta name="theme-color" content="#000000" /> - <!-- - manifest.json provides metadata used when your web app is installed on a - user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ - --> - <link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> - <!-- - Notice the use of %PUBLIC_URL% in the tags above. - It will be replaced with the URL of the `public` folder during the build. - Only files inside the `public` folder can be referenced from the HTML. - - Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will - work correctly both with client-side routing and a non-root public URL. - Learn how to configure a non-root public URL by running `npm run build`. - --> - <title>React App</title> - </head> - <body> - <noscript>You need to enable JavaScript to run this app.</noscript> - <div id="root"></div> - <!-- - This HTML file is a template. - If you open it directly in the browser, you will see an empty page. - - You can add webfonts, meta tags, or analytics to this file. - The build step will place the bundled scripts into the <body> tag. - - To begin the development, run `npm start` or `yarn start`. - To create a production bundle, use `npm run build` or `yarn build`. - --> - </body> -</html> diff --git a/editors/editoria/public/manifest.json b/editors/editoria/public/manifest.json deleted file mode 100644 index 1f2f141fafdeb1d31d85b008ec5132840c5e6362..0000000000000000000000000000000000000000 --- a/editors/editoria/public/manifest.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "short_name": "React App", - "name": "Create React App Sample", - "icons": [ - { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - } - ], - "start_url": ".", - "display": "standalone", - "theme_color": "#000000", - "background_color": "#ffffff" -} diff --git a/package.json b/package.json index c694ee5fef2bbb668f7ba79beed07035286a3825..251f841cce51f4625bbde9aada2eec95337432fd 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "clean:packages": "lerna clean --yes", "clean:root": "rm -rf node_modules", "cz": "git-cz", - "editoria": "cd editors/editoria && yarn start", + "editoria": "cd editors/demo && yarn start", "reset": "yarn clean && yarn", "storybook": "coko-storybook" },